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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
index 410e0c1..70df0eb 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
@@ -24,7 +24,9 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWordDetector;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -41,7 +43,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 
 	/**
 	 * Rule to detect java operators.
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	protected class OperatorRule implements IRule {
@@ -62,7 +64,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 
 		/**
 		 * Creates a new operator rule.
-		 * 
+		 *
 		 * @param token
 		 *            Token to use for this rule
 		 * @param tokenHeredoc
@@ -77,7 +79,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 
 		/**
 		 * Is this character an operator character?
-		 * 
+		 *
 		 * @param character
 		 *            Character to determine whether it is an operator character
 		 * @return <code>true</code> iff the character is an operator,
@@ -190,7 +192,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 		/**
 		 * Check if lastCharacter/character are a PHP start or end token ( &lt;?
 		 * ... ?&gt; )
-		 * 
+		 *
 		 * @param scanner
 		 * @param lastCharacter
 		 * @param character
@@ -263,7 +265,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 
 		/**
 		 * Adds a word and the token to be returned if it is detected.
-		 * 
+		 *
 		 * @param word
 		 *            the word this rule will search for, may not be
 		 *            <code>null</code>
@@ -378,12 +380,14 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 	private static String[] fgTokenProperties = {
 			IPreferenceConstants.PHP_MULTILINE_COMMENT,
 			IPreferenceConstants.PHP_SINGLELINE_COMMENT,
-			IPreferenceConstants.PHP_TAG, IPreferenceConstants.PHP_KEYWORD,
+			IPreferenceConstants.PHP_TAG,
+			IPreferenceConstants.PHP_KEYWORD,
 			IPreferenceConstants.PHP_FUNCTIONNAME,
 			IPreferenceConstants.PHP_VARIABLE,
 			IPreferenceConstants.PHP_VARIABLE_DOLLAR,
 			IPreferenceConstants.PHP_STRING_DQ,
-			IPreferenceConstants.PHP_STRING_SQ, IPreferenceConstants.PHP_TYPE,
+			IPreferenceConstants.PHP_STRING_SQ,
+			IPreferenceConstants.PHP_TYPE,
 			IPreferenceConstants.PHP_CONSTANT,
 			IPreferenceConstants.PHP_DEFAULT,
 			IPreferenceConstants.PHP_OPERATOR,
@@ -474,4 +478,4 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 		setDefaultReturnToken(getToken(IPreferenceConstants.PHP_DEFAULT));
 		return rules;
 	}
-}
\ No newline at end of file
+}