some bugfixes

[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 fbef0f3..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
@@ -58,53 +58,53 @@ public class PHPParserAction extends TextEditorAction {
    */
   public void run() {
     boolean phpFlag = false;
-               
-  //  try {
-      fileToParse = getPHPFile();
-                       parseFile(fileToParse);
+
+    //  try {
+    fileToParse = getPHPFile();
+    parseFile(fileToParse);
   }
 
-       public static void parseFile(IFile fileToParse) {
-                       boolean phpFlag = false;
-                       try {
-                               
-                               if (fileToParse == null) {
-                                       // should never happen
-                                       System.err.println("Error : no file in the editor");
-                                       // should throw an exception
-                                       return;
-                               }
-                               String name = fileToParse.getName().toLowerCase();
-                               for (int i = 0; i<EXTENSIONS.length; i++) {
-                                       if (name.endsWith(EXTENSIONS[i])) {
-                                               phpFlag = true;  // php file extension
-                                               break;
-                                       }
-                               }
-                               if (phpFlag) {
-                                       IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-                                       if (store.getString(PHPeclipsePlugin.PHP_PARSER_DEFAULT).equals(PHPeclipsePlugin.PHP_INTERNAL_PARSER)) {
-                                               // 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(fileToParse,iStream);
-                                                       iStream.close();
-                                               } catch (IOException e) {
-                                               }
-                                       } else {
-                                               PHPParserSuperclass.phpExternalParse(fileToParse);
-                                       }
-                               }
-                       } catch (CoreException e) {
-                       }
-
-               }
+  public static void parseFile(IFile fileToParse) {
+    boolean phpFlag = false;
+    try {
+
+      if (fileToParse == null) {
+        // should never happen
+        System.err.println("Error : no file in the editor");
+        // should throw an exception
+        return;
+      }
+      String name = fileToParse.getName().toLowerCase();
+      for (int i = 0; i < EXTENSIONS.length; i++) {
+        if (name.endsWith(EXTENSIONS[i])) {
+          phpFlag = true; // php file extension
+          break;
+        }
+      }
+      if (phpFlag) {
+        IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+        if (store.getString(PHPeclipsePlugin.PHP_PARSER_DEFAULT).equals(PHPeclipsePlugin.PHP_INTERNAL_PARSER)) {
+          // 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(fileToParse, iStream);
+            iStream.close();
+          } catch (IOException e) {
+          }
+        } else {
+          PHPParserSuperclass.phpExternalParse(fileToParse);
+        }
+      }
+    } catch (CoreException e) {
+    }
+
+  }
   /**
    * Finds the file that's currently opened in the PHP Text Editor
    */