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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaParameterListValidator.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaParameterListValidator.java
index 82a09e9..71bf6ff 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaParameterListValidator.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaParameterListValidator.java
@@ -10,10 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.java;
 
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -23,37 +19,42 @@ import org.eclipse.jface.text.TextPresentation;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
 import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
 
-
-
-public class JavaParameterListValidator implements IContextInformationValidator, IContextInformationPresenter {
+public class JavaParameterListValidator implements
+		IContextInformationValidator, IContextInformationPresenter {
 
 	private int fPosition;
+
 	private ITextViewer fViewer;
+
 	private IContextInformation fInformation;
 
 	private int fCurrentParameter;
 
-
-
 	public JavaParameterListValidator() {
 	}
 
 	/**
-	 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
-	 * @see IContextInformationPresenter#install(IContextInformation, ITextViewer, int)
+	 * @see IContextInformationValidator#install(IContextInformation,
+	 *      ITextViewer, int)
+	 * @see IContextInformationPresenter#install(IContextInformation,
+	 *      ITextViewer, int)
 	 */
-	public void install(IContextInformation info, ITextViewer viewer, int documentPosition) {
-		fPosition= documentPosition;
-		fViewer= viewer;
-		fInformation= info;
+	public void install(IContextInformation info, ITextViewer viewer,
+			int documentPosition) {
+		fPosition = documentPosition;
+		fViewer = viewer;
+		fInformation = info;
 
-		fCurrentParameter= -1;
+		fCurrentParameter = -1;
 	}
 
-	private int getCommentEnd(IDocument d, int pos, int end) throws BadLocationException {
+	private int getCommentEnd(IDocument d, int pos, int end)
+			throws BadLocationException {
 		while (pos < end) {
-			char curr= d.getChar(pos);
+			char curr = d.getChar(pos);
 			pos++;
 			if (curr == '*') {
 				if (pos < end && d.getChar(pos) == '/') {
@@ -64,9 +65,10 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 		return end;
 	}
 
-	private int getStringEnd(IDocument d, int pos, int end, char ch) throws BadLocationException {
+	private int getStringEnd(IDocument d, int pos, int end, char ch)
+			throws BadLocationException {
 		while (pos < end) {
-			char curr= d.getChar(pos);
+			char curr = d.getChar(pos);
 			pos++;
 			if (curr == '\\') {
 				// ignore escaped characters
@@ -78,61 +80,64 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 		return end;
 	}
 
-	private int getCharCount(IDocument document, int start, int end, String increments, String decrements, boolean considerNesting) throws BadLocationException {
+	private int getCharCount(IDocument document, int start, int end,
+			String increments, String decrements, boolean considerNesting)
+			throws BadLocationException {
 
-		Assert.isTrue((increments.length() != 0 || decrements.length() != 0) && !increments.equals(decrements));
+		Assert.isTrue((increments.length() != 0 || decrements.length() != 0)
+				&& !increments.equals(decrements));
 
-		int nestingLevel= 0;
-		int charCount= 0;
+		int nestingLevel = 0;
+		int charCount = 0;
 		while (start < end) {
-			char curr= document.getChar(start++);
+			char curr = document.getChar(start++);
 			switch (curr) {
-				case '/':
-					if (start < end) {
-						char next= document.getChar(start);
-						if (next == '*') {
-							// a comment starts, advance to the comment end
-							start= getCommentEnd(document, start + 1, end);
-						} else if (next == '/') {
-							// '//'-comment: nothing to do anymore on this line
-							start= end;
-						}
-					}
-					break;
-				case '*':
-					if (start < end) {
-						char next= document.getChar(start);
-						if (next == '/') {
-							// we have been in a comment: forget what we read before
-							charCount= 0;
-							++ start;
-						}
+			case '/':
+				if (start < end) {
+					char next = document.getChar(start);
+					if (next == '*') {
+						// a comment starts, advance to the comment end
+						start = getCommentEnd(document, start + 1, end);
+					} else if (next == '/') {
+						// '//'-comment: nothing to do anymore on this line
+						start = end;
 					}
-					break;
-				case '"':
-				case '\'':
-					start= getStringEnd(document, start, end, curr);
-					break;
-				default:
-
-					if (considerNesting) {
-
-						if ('(' == curr)
-							++ nestingLevel;
-						else if (')' == curr)
-							-- nestingLevel;
-
-						if (nestingLevel != 0)
-							break;
+				}
+				break;
+			case '*':
+				if (start < end) {
+					char next = document.getChar(start);
+					if (next == '/') {
+						// we have been in a comment: forget what we read before
+						charCount = 0;
+						++start;
 					}
+				}
+				break;
+			case '"':
+			case '\'':
+				start = getStringEnd(document, start, end, curr);
+				break;
+			default:
 
-					if (increments.indexOf(curr) >= 0) {
-						++ charCount;
-					}
+				if (considerNesting) {
 
-					if (decrements.indexOf(curr) >= 0) {
-						-- charCount;
-					}
+					if ('(' == curr)
+						++nestingLevel;
+					else if (')' == curr)
+						--nestingLevel;
+
+					if (nestingLevel != 0)
+						break;
+				}
+
+				if (increments.indexOf(curr) >= 0) {
+					++charCount;
+				}
+
+				if (decrements.indexOf(curr) >= 0) {
+					--charCount;
+				}
 			}
 		}
 
@@ -148,13 +153,14 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 			if (position < fPosition)
 				return false;
 
-			IDocument document= fViewer.getDocument();
-			IRegion line= document.getLineInformationOfOffset(fPosition);
+			IDocument document = fViewer.getDocument();
+			IRegion line = document.getLineInformationOfOffset(fPosition);
 
 			if (position < line.getOffset() || position >= document.getLength())
 				return false;
 
-			return getCharCount(document, fPosition, position, "(<", ")>", false) >= 0;  //$NON-NLS-1$//$NON-NLS-2$
+			return getCharCount(document, fPosition, position,
+					"(<", ")>", false) >= 0; //$NON-NLS-1$//$NON-NLS-2$
 
 		} catch (BadLocationException x) {
 			return false;
@@ -162,14 +168,17 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 	}
 
 	/**
-	 * @see IContextInformationPresenter#updatePresentation(int, TextPresentation)
+	 * @see IContextInformationPresenter#updatePresentation(int,
+	 *      TextPresentation)
 	 */
-	public boolean updatePresentation(int position, TextPresentation presentation) {
+	public boolean updatePresentation(int position,
+			TextPresentation presentation) {
 
-		int currentParameter= -1;
+		int currentParameter = -1;
 
 		try {
-			currentParameter= getCharCount(fViewer.getDocument(), fPosition, position, ",", "", true);  //$NON-NLS-1$//$NON-NLS-2$
+			currentParameter = getCharCount(fViewer.getDocument(), fPosition,
+					position, ",", "", true); //$NON-NLS-1$//$NON-NLS-2$
 		} catch (BadLocationException x) {
 			return false;
 		}
@@ -180,41 +189,44 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 		}
 
 		presentation.clear();
-		fCurrentParameter= currentParameter;
+		fCurrentParameter = currentParameter;
 
-		String s= fInformation.getInformationDisplayString();
-		int start= 0;
-		int occurrences= 0;
+		String s = fInformation.getInformationDisplayString();
+		int start = 0;
+		int occurrences = 0;
 		while (occurrences < fCurrentParameter) {
-			int found= s.indexOf(',', start);
+			int found = s.indexOf(',', start);
 			if (found == -1)
 				break;
-			start= found + 1;
-			++ occurrences;
+			start = found + 1;
+			++occurrences;
 		}
 
 		if (occurrences < fCurrentParameter) {
-			presentation.addStyleRange(new StyleRange(0, s.length(), null, null, SWT.NORMAL));
+			presentation.addStyleRange(new StyleRange(0, s.length(), null,
+					null, SWT.NORMAL));
 			return true;
 		}
 
 		if (start == -1)
-			start= 0;
+			start = 0;
 
-		int end= s.indexOf(',', start);
+		int end = s.indexOf(',', start);
 		if (end == -1)
-			end= s.length();
+			end = s.length();
 
 		if (start > 0)
-			presentation.addStyleRange(new StyleRange(0, start, null, null, SWT.NORMAL));
+			presentation.addStyleRange(new StyleRange(0, start, null, null,
+					SWT.NORMAL));
 
 		if (end > start)
-			presentation.addStyleRange(new StyleRange(start, end - start, null, null, SWT.BOLD));
+			presentation.addStyleRange(new StyleRange(start, end - start, null,
+					null, SWT.BOLD));
 
 		if (end < s.length())
-			presentation.addStyleRange(new StyleRange(end, s.length() - end, null, null, SWT.NORMAL));
+			presentation.addStyleRange(new StyleRange(end, s.length() - end,
+					null, null, SWT.NORMAL));
 
 		return true;
 	}
 }
-