*** empty log message ***

[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..f5cbca0 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 {
 
@@ -57,18 +58,26 @@ public class PHPParserAction extends TextEditorAction {
    */
   public void run() {
     boolean phpFlag = false;
+
+    //  try {
+    fileToParse = getPHPFile();
+    parseFile(fileToParse);
+  }
+
+  public static void parseFile(IFile fileToParse) {
+    boolean phpFlag = false;
     try {
-      fileToParse = getPHPFile();
+
       if (fileToParse == null) {
         // should never happen
         System.err.println("Error : no file in the editor");
         // should throw an exception
         return;
       }
-      String name = fileToParse.getName();
-      for (int i = 0; i<EXTENSIONS.length; i++) {
+      String name = fileToParse.getName().toLowerCase();
+      for (int i = 0; i < EXTENSIONS.length; i++) {
         if (name.endsWith(EXTENSIONS[i])) {
-          phpFlag = true;  // php file extension
+          phpFlag = true; // php file extension
           break;
         }
       }
@@ -78,22 +87,24 @@ 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();
-            parse(iStream);
+            parse(fileToParse, iStream);
             iStream.close();
           } catch (IOException e) {
           }
         } else {
-          PHPParser.phpExternalParse(fileToParse);
+          PHPParserSuperclass.phpExternalParse(fileToParse);
         }
       }
     } catch (CoreException e) {
     }
 
   }
-
   /**
    * Finds the file that's currently opened in the PHP Text Editor
    */
@@ -137,7 +148,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);
@@ -151,7 +162,7 @@ public class PHPParserAction extends TextEditorAction {
   //    return identifier.toString();
   //  }
 
-  protected void parse(InputStream iStream) {
+  protected static void parse(IFile fileToParse, InputStream iStream) {
 
     StringBuffer buf = new StringBuffer();
     int c0;
@@ -164,7 +175,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) {