updating SQL plugin with latest Quantum code

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPParserAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
index e9376f5..b40c10b 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.phpparser.PHPParser;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -28,9 +27,11 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextEditorAction;
+import test.PHPParserSuperclass;
+import test.PHPParserManager;
 
 /**
- * Class that defines the action for parsing the current PHP file
+ * ClassDeclaration that defines the action for parsing the current PHP file
  */
 public class PHPParserAction extends TextEditorAction {
 
@@ -65,7 +66,7 @@ public class PHPParserAction extends TextEditorAction {
         // should throw an exception
         return;
       }
-      String name = fileToParse.getName();
+      String name = fileToParse.getName().toLowerCase();
       for (int i = 0; i<EXTENSIONS.length; i++) {
         if (name.endsWith(EXTENSIONS[i])) {
           phpFlag = true;  // php file extension
@@ -78,6 +79,9 @@ public class PHPParserAction extends TextEditorAction {
           // first delete all the previous markers
           fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0);
 
+          //the tasks are removed here
+          fileToParse.deleteMarkers(IMarker.TASK, false, 0);
+
           try {
             InputStream iStream = fileToParse.getContents();
             //        int c = iStream.read();
@@ -86,7 +90,7 @@ public class PHPParserAction extends TextEditorAction {
           } catch (IOException e) {
           }
         } else {
-          PHPParser.phpExternalParse(fileToParse);
+          PHPParserSuperclass.phpExternalParse(fileToParse);
         }
       }
     } catch (CoreException e) {
@@ -137,7 +141,7 @@ public class PHPParserAction extends TextEditorAction {
   //    identifier.append((char) c);
   //    try {
   //      while ((c = iStream.read()) != (-1)) {
-  //        if (Character.isJavaIdentifierPart((char) c)) {
+  //        if (Scanner.isPHPIdentifierPart((char) c)) {
   //          identifier.append((char) c);
   //          //        } else if ((i == 0) && (c == '$')) {
   //          //          identifier.append((char)c);
@@ -164,7 +168,7 @@ public class PHPParserAction extends TextEditorAction {
     }
     String input = buf.toString();
 
-    PHPParser parser = new PHPParser(fileToParse);
+    PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
     try {
       parser.parse(input);
     } catch (CoreException e) {