Open PHP perspective automatically then a new PHP Project is created

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / actions / IncludesScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
index 839d1e7..a556aef 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
@@ -26,7 +26,7 @@ public class IncludesScanner implements ITerminalSymbols {
 //  private final PHPOpenAllIncludesEditorAction fOpenAllIncludesAction;
   private IProject fProject;
   private IFileEditorInput fEditorInput;
-  HashSet fSet;
+  private HashSet fSet;
   public IncludesScanner(IProject project, IFileEditorInput editorInput) {
     fProject = project;
 //    fOpenAllIncludesAction = action;
@@ -41,7 +41,7 @@ public class IncludesScanner implements ITerminalSymbols {
 
     try {
       if (fileToParse.exists()) {
-        addInputStream(new BufferedInputStream(fileToParse.getContents()), fileToParse.getFullPath().toString());
+        addInputStream(new BufferedInputStream(fileToParse.getContents()), fileToParse.getProjectRelativePath().toString());
       }
     } catch (CoreException e1) {
       e1.printStackTrace();
@@ -90,7 +90,7 @@ public class IncludesScanner implements ITerminalSymbols {
     String identifier;
     int counter = 0;
 
-    Scanner scanner = new Scanner(false, false, false, false, true, null, null);
+    Scanner scanner = new Scanner(false, false, false, false, true, null, null, true /*taskCaseSensitive*/);
     scanner.setSource(charArray);
     scanner.setPHPMode(false);
     int token = getNextToken(scanner);