PHPEditor changed to PHPUnitEditor

[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 f5cbca0..3d78be7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -12,11 +12,13 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
@@ -27,8 +29,9 @@ 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;
+import test.PHPParserSuperclass;
 
 /**
  * ClassDeclaration that defines the action for parsing the current PHP file
@@ -69,11 +72,12 @@ public class PHPParserAction extends TextEditorAction {
     try {
 
       if (fileToParse == null) {
-        // should never happen
+        // TODO should never happen => should throw an exception
         System.err.println("Error : no file in the editor");
-        // should throw an exception
+
         return;
       }
+      // TODO use isPHPFile()
       String name = fileToParse.getName().toLowerCase();
       for (int i = 0; i < EXTENSIONS.length; i++) {
         if (name.endsWith(EXTENSIONS[i])) {
@@ -90,13 +94,12 @@ public class PHPParserAction extends TextEditorAction {
           //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) {
-          }
+          //                    try {
+          //                      InputStream iStream = fileToParse.getContents();
+          parse(fileToParse); //, iStream);
+          //                      iStream.close();
+          //                    } catch (IOException e) {
+          //                    }
         } else {
           PHPParserSuperclass.phpExternalParse(fileToParse);
         }
@@ -162,23 +165,35 @@ public class PHPParserAction extends TextEditorAction {
   //    return identifier.toString();
   //  }
 
-  protected static void parse(IFile fileToParse, InputStream iStream) {
-
-    StringBuffer buf = new StringBuffer();
-    int c0;
-    try {
-      while ((c0 = iStream.read()) != (-1)) {
-        buf.append((char) c0);
-      }
-    } catch (IOException e) {
-      return;
-    }
-    String input = buf.toString();
-
-    PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
+  protected static void parse(IFile fileToParse) {
+
+    //    StringBuffer buf = new StringBuffer();
+    //    int c0;
+    //    try {
+    //      while ((c0 = iStream.read()) != (-1)) {
+    //        buf.append((char) c0);
+    //      }
+    //    } catch (IOException e) {
+    //      return;
+    //    }
+    //    String input = buf.toString();
+
+    InputStream stream = null;
+    char[] charArray;
     try {
-      parser.parse(input);
+      stream = new BufferedInputStream(fileToParse.getContents());
+      charArray = Util.getInputStreamAsCharArray(stream, -1, null);
+      PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
+      parser.parse(new String(charArray));
     } catch (CoreException e) {
+    } catch (IOException e) {
+    } finally {
+      try {
+       if (stream!=null) {
+          stream.close();
+       }
+      } catch (IOException e) {
+      }
     }
   }
 }
\ No newline at end of file