X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaWordIterator.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaWordIterator.java
index cca37ca..1c55ba9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaWordIterator.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaWordIterator.java
@@ -15,28 +15,28 @@ import java.text.CharacterIterator;
 
 import org.eclipse.jface.text.Assert;
 
-
 /**
- * Breaks java text into word starts, also stops at line start and end. No 
+ * Breaks java text into word starts, also stops at line start and end. No
  * direction dependency.
- *  
+ * 
  * @since 3.0
  */
 public class JavaWordIterator extends BreakIterator {
-	
-	/** 
+
+	/**
 	 * The underlying java break iterator. It returns all breaks, including
 	 * before and after every whitespace.
 	 */
 	private JavaBreakIterator fIterator;
+
 	/** The current index for the stateful operations. */
 	private int fIndex;
-	
+
 	/**
 	 * Creates a new word iterator.
 	 */
 	public JavaWordIterator() {
-		fIterator= new JavaBreakIterator();
+		fIterator = new JavaBreakIterator();
 		first();
 	}
 
@@ -44,7 +44,7 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#first()
 	 */
 	public int first() {
-		fIndex= fIterator.first();
+		fIndex = fIterator.first();
 		return fIndex;
 	}
 
@@ -52,7 +52,7 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#last()
 	 */
 	public int last() {
-		fIndex= fIterator.last();
+		fIndex = fIterator.last();
 		return fIndex;
 	}
 
@@ -60,9 +60,9 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#next(int)
 	 */
 	public int next(int n) {
-		int next= 0;
+		int next = 0;
 		while (--n > 0 && next != DONE) {
-			next= next();
+			next = next();
 		}
 		return next;
 	}
@@ -71,7 +71,7 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#next()
 	 */
 	public int next() {
-		fIndex= following(fIndex);
+		fIndex = following(fIndex);
 		return fIndex;
 	}
 
@@ -79,18 +79,17 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#previous()
 	 */
 	public int previous() {
-		fIndex= preceding(fIndex);
+		fIndex = preceding(fIndex);
 		return fIndex;
 	}
-	
-	
+
 	/*
 	 * @see java.text.BreakIterator#preceding(int)
 	 */
 	public int preceding(int offset) {
-		int first= fIterator.preceding(offset);
+		int first = fIterator.preceding(offset);
 		if (isWhitespace(first, offset)) {
-			int second= fIterator.preceding(first);
+			int second = fIterator.preceding(first);
 			if (second != DONE && !isDelimiter(second, first))
 				return second;
 		}
@@ -101,82 +100,87 @@ public class JavaWordIterator extends BreakIterator {
 	 * @see java.text.BreakIterator#following(int)
 	 */
 	public int following(int offset) {
-		int first= fIterator.following(offset);
+		int first = fIterator.following(offset);
 		if (eatFollowingWhitespace(offset, first)) {
-			int second= fIterator.following(first);
+			int second = fIterator.following(first);
 			if (isWhitespace(first, second))
 				return second;
 		}
 		return first;
 	}
-	
+
 	private boolean eatFollowingWhitespace(int offset, int exclusiveEnd) {
 		if (exclusiveEnd == DONE || offset == DONE)
 			return false;
-		
+
 		if (isWhitespace(offset, exclusiveEnd))
 			return false;
 		if (isDelimiter(offset, exclusiveEnd))
 			return false;
-		
+
 		return true;
 	}
-	
+
 	/**
-	 * Returns <code>true</code> if the given sequence into the underlying text
-	 * represents a delimiter, <code>false</code> otherwise.
+	 * Returns <code>true</code> if the given sequence into the underlying
+	 * text represents a delimiter, <code>false</code> otherwise.
 	 * 
-	 * @param offset the offset
-	 * @param exclusiveEnd the end offset
+	 * @param offset
+	 *            the offset
+	 * @param exclusiveEnd
+	 *            the end offset
 	 * @return <code>true</code> if the given range is a delimiter
 	 */
 	private boolean isDelimiter(int offset, int exclusiveEnd) {
 		if (exclusiveEnd == DONE || offset == DONE)
 			return false;
-		
+
 		Assert.isTrue(offset >= 0);
 		Assert.isTrue(exclusiveEnd <= getText().getEndIndex());
 		Assert.isTrue(exclusiveEnd > offset);
-		
-		CharSequence seq= fIterator.fText;
-		
+
+		CharSequence seq = fIterator.fText;
+
 		while (offset < exclusiveEnd) {
-			char ch= seq.charAt(offset);
+			char ch = seq.charAt(offset);
 			if (ch != '\n' && ch != '\r')
 				return false;
 			offset++;
 		}
-		
+
 		return true;
 	}
 
 	/**
-	 * Returns <code>true</code> if the given sequence into the underlying text
-	 * represents whitespace, but not a delimiter, <code>false</code> otherwise.
+	 * Returns <code>true</code> if the given sequence into the underlying
+	 * text represents whitespace, but not a delimiter, <code>false</code>
+	 * otherwise.
 	 * 
-	 * @param offset the offset
-	 * @param exclusiveEnd the end offset
+	 * @param offset
+	 *            the offset
+	 * @param exclusiveEnd
+	 *            the end offset
 	 * @return <code>true</code> if the given range is whitespace
 	 */
 	private boolean isWhitespace(int offset, int exclusiveEnd) {
 		if (exclusiveEnd == DONE || offset == DONE)
 			return false;
-		
+
 		Assert.isTrue(offset >= 0);
 		Assert.isTrue(exclusiveEnd <= getText().getEndIndex());
 		Assert.isTrue(exclusiveEnd > offset);
-		
-		CharSequence seq= fIterator.fText;
-		
+
+		CharSequence seq = fIterator.fText;
+
 		while (offset < exclusiveEnd) {
-			char ch= seq.charAt(offset);
+			char ch = seq.charAt(offset);
 			if (!Character.isWhitespace(ch))
 				return false;
 			if (ch == '\n' || ch == '\r')
 				return false;
 			offset++;
 		}
-		
+
 		return true;
 	}
 
@@ -193,10 +197,12 @@ public class JavaWordIterator extends BreakIterator {
 	public CharacterIterator getText() {
 		return fIterator.getText();
 	}
-	
+
 	/**
 	 * Sets the text as <code>CharSequence</code>.
-	 * @param newText the new text
+	 * 
+	 * @param newText
+	 *            the new text
 	 */
 	public void setText(CharSequence newText) {
 		fIterator.setText(newText);
@@ -210,7 +216,7 @@ public class JavaWordIterator extends BreakIterator {
 		fIterator.setText(newText);
 		first();
 	}
-	
+
 	/*
 	 * @see java.text.BreakIterator#setText(java.lang.String)
 	 */