Fixes and updates

src/org/fife/ui/rsyntaxtextarea/MarkOccurrencesSupport.java

@@ -19,15 +19,15 @@ import javax.swing.text.Caret;
 import org.fife.ui.rtextarea.SmartHighlightPainter;
 
 /**
- * Marks all occurrences of the token at the current caret position, if it is
- * an identifier.
+ * Marks all occurrences of the token at the current caret position, if it is an
+ * identifier.
  *
  * @author Robert Futrell
  * @version 1.0
  * @see OccurrenceMarker
  */
 class MarkOccurrencesSupport implements CaretListener, ActionListener {
-	
+
 	private RSyntaxTextArea textArea;
 	private Timer timer;
 	private SmartHighlightPainter p;
@@ -39,36 +39,33 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 	 * The default delay.
 	 */
 	static final int DEFAULT_DELAY_MS = 1000;
-	
+
 	/**
 	 * Constructor. Creates a listener with a 1 second delay.
 	 */
 	MarkOccurrencesSupport() {
 		this(DEFAULT_DELAY_MS);
 	}
-	
+
 	/**
 	 * Constructor.
 	 *
-	 * @param delay
-	 *            The delay between when the caret last moves and when the
-	 *            text should be scanned for matching occurrences. This should
-	 *            be in milliseconds.
+	 * @param delay The delay between when the caret last moves and when the text
+	 *              should be scanned for matching occurrences. This should be in
+	 *              milliseconds.
 	 */
 	MarkOccurrencesSupport(int delay) {
 		this(delay, DEFAULT_COLOR);
 	}
-	
+
 	/**
 	 * Constructor.
 	 *
-	 * @param delay
-	 *            The delay between when the caret last moves and when the
-	 *            text should be scanned for matching occurrences. This should
-	 *            be in milliseconds.
-	 * @param color
-	 *            The color to use to mark the occurrences. This cannot be
-	 *            <code>null</code>.
+	 * @param delay The delay between when the caret last moves and when the text
+	 *              should be scanned for matching occurrences. This should be in
+	 *              milliseconds.
+	 * @param color The color to use to mark the occurrences. This cannot be
+	 *              <code>null</code>.
 	 */
 	MarkOccurrencesSupport(int delay, Color color) {
 		timer = new Timer(delay, this);
@@ -76,18 +73,17 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 		p = new SmartHighlightPainter();
 		setColor(color);
 	}
-	
+
 	/**
-	 * Called after the caret has been moved and a fixed time delay has
-	 * elapsed. This locates and highlights all occurrences of the identifier
-	 * at the caret position, if any.
+	 * Called after the caret has been moved and a fixed time delay has elapsed.
+	 * This locates and highlights all occurrences of the identifier at the caret
+	 * position, if any.
 	 * <p>
 	 *
 	 * Callers should not call this method directly, but should rather prefer
 	 * {@link #doMarkOccurrences()} to mark occurrences.
 	 *
-	 * @param e
-	 *            The event.
+	 * @param e The event.
 	 * @see #doMarkOccurrences()
 	 */
 	@Override
@@ -124,18 +120,17 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 			textArea.fireMarkedOccurrencesChanged();
 		}
 	}
-	
+
 	/**
 	 * Called when the caret moves in the text area.
 	 *
-	 * @param e
-	 *            The event.
+	 * @param e The event.
 	 */
 	@Override
 	public void caretUpdate(CaretEvent e) {
 		timer.restart();
 	}
-	
+
 	/**
 	 * Removes all highlights added to the text area by this listener.
 	 */
@@ -145,16 +140,15 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 			h.clearMarkOccurrencesHighlights();
 		}
 	}
-	
+
 	/**
-	 * Immediately marks all occurrences of the token at the current caret
-	 * position.
+	 * Immediately marks all occurrences of the token at the current caret position.
 	 */
 	public void doMarkOccurrences() {
 		timer.stop();
 		actionPerformed(null);
 	}
-	
+
 	/**
 	 * Returns the color being used to mark occurrences.
 	 *
@@ -164,7 +158,7 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 	public Color getColor() {
 		return (Color) p.getPaint();
 	}
-	
+
 	/**
 	 * Returns the delay, in milliseconds.
 	 *
@@ -174,7 +168,7 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 	public int getDelay() {
 		return timer.getDelay();
 	}
-	
+
 	/**
 	 * Returns whether a border is painted around marked occurrences.
 	 *
@@ -185,13 +179,12 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 	public boolean getPaintBorder() {
 		return p.getPaintBorder();
 	}
-	
+
 	/**
-	 * Installs this listener on a text area. If it is already installed on
-	 * another text area, it is uninstalled first.
+	 * Installs this listener on a text area. If it is already installed on another
+	 * text area, it is uninstalled first.
 	 *
-	 * @param textArea
-	 *            The text area to install on.
+	 * @param textArea The text area to install on.
 	 */
 	public void install(RSyntaxTextArea textArea) {
 		if (this.textArea != null) {
@@ -203,12 +196,11 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 			setColor(textArea.getMarkOccurrencesColor());
 		}
 	}
-	
+
 	/**
 	 * Sets the color to use when marking occurrences.
 	 *
-	 * @param color
-	 *            The color to use.
+	 * @param color The color to use.
 	 * @see #getColor()
 	 * @see #setPaintBorder(boolean)
 	 */
@@ -219,25 +211,23 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 			caretUpdate(null); // Force a highlight repaint.
 		}
 	}
-	
+
 	/**
-	 * Sets the delay between the last caret position change and when the
-	 * text is scanned for matching identifiers. A delay is needed to prevent
-	 * repeated scanning while the user is typing.
+	 * Sets the delay between the last caret position change and when the text is
+	 * scanned for matching identifiers. A delay is needed to prevent repeated
+	 * scanning while the user is typing.
 	 *
-	 * @param delay
-	 *            The new delay.
+	 * @param delay The new delay.
 	 * @see #getDelay()
 	 */
 	public void setDelay(int delay) {
 		timer.setInitialDelay(delay);
 	}
-	
+
 	/**
 	 * Toggles whether a border is painted around marked highlights.
 	 *
-	 * @param paint
-	 *            Whether to paint a border.
+	 * @param paint Whether to paint a border.
 	 * @see #getPaintBorder()
 	 * @see #setColor(Color)
 	 */
@@ -249,10 +239,10 @@ class MarkOccurrencesSupport implements CaretListener, ActionListener {
 			}
 		}
 	}
-	
+
 	/**
-	 * Uninstalls this listener from the current text area. Does nothing if
-	 * it not currently installed on any text area.
+	 * Uninstalls this listener from the current text area. Does nothing if it not
+	 * currently installed on any text area.
 	 *
 	 * @see #install(RSyntaxTextArea)
 	 */