Refactory: core plugin.
authorincastrix <incastrix>
Fri, 2 Oct 2009 22:35:26 +0000 (22:35 +0000)
committerincastrix <incastrix>
Fri, 2 Oct 2009 22:35:26 +0000 (22:35 +0000)
20 files changed:
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/util/Util.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragment.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ParserVisitor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/PHPFileUtil.java [new file with mode: 0644]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JavaModelUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/PHPUIStatus.java [new file with mode: 0644]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameIdentifierDelegate.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/CustomBufferFactory.java [new file with mode: 0644]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPConsole.java [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/FileStorage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/PHPIdentifier.java [new file with mode: 0644]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/PHPIdentifierLocation.java

index e6c6133..02ef8d7 100644 (file)
@@ -48,9 +48,9 @@ import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
+//import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -4991,24 +4991,26 @@ public class Parser implements ITerminalSymbols, CompilerModifiers,
 
        protected void consumePackageDeclarationName(IFile file) {
                // create a package name similar to java package names
-               String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject())
-                               .toString();
+               // incastrix
+               //String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject())
+               //              .toString();
                 String filePath = file.getFullPath().toString();
                 
                 String ext = file.getFileExtension();
                 int fileExtensionLength = ext == null ? 0 : ext.length() + 1;
                 ImportReference impt;
                 char[][] tokens;
-               if (filePath.startsWith(projectPath)) {
+                
+               /*if (filePath.startsWith(projectPath)) {
                        tokens = CharOperation.splitOn('/', filePath.toCharArray(),
                                        projectPath.length() + 1, filePath.length()
                                                        - fileExtensionLength);
-               } else {
+               } else {*/
                        String name = file.getName();
                        tokens = new char[1][];
                        tokens[0] = name.substring(0, name.length() - fileExtensionLength)
                                        .toCharArray();
-               }
+               //}
 
                this.compilationUnit.currentPackage = impt = new ImportReference(
                                tokens, new char[0], 0, 0, true);
index 4629147..81f89d7 100644 (file)
@@ -24,7 +24,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 
 public class Util {
 
index eacba58..22615e9 100644 (file)
@@ -29,7 +29,7 @@ import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
index 721acdc..a131065 100644 (file)
@@ -47,7 +47,7 @@ import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
index d54d251..c78a9ee 100644 (file)
@@ -22,7 +22,7 @@ import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.internal.core.util.MementoTokenizer;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
index 62fb231..c3c2595 100644 (file)
@@ -29,7 +29,7 @@ import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.JavaProject;
 import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 
index b34f40a..db91c36 100644 (file)
@@ -1,6 +1,6 @@
 package net.sourceforge.phpdt.internal.core.builder;
 
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/PHPFileUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/PHPFileUtil.java
new file mode 100644 (file)
index 0000000..9942359
--- /dev/null
@@ -0,0 +1,214 @@
+/*
+ * Created on 09.08.2003
+ *
+ */
+package net.sourceforge.phpdt.internal.core.util;
+
+import java.io.File;
+import java.util.List;
+
+//import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+//import net.sourceforge.phpeclipse.ui.WebUI;
+//import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
+
+import org.eclipse.core.filebuffers.FileBuffers;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+public class PHPFileUtil {
+       // private static String[] PHP_EXTENSIONS = null;
+
+       public final static String[] SMARTY_EXTENSIONS = { "tpl" };
+
+       public static boolean isPHPFile(IFile file) {
+                return isPHPFileName(file.getFullPath().toString());
+        }
+
+       // public final static String getFileExtension(String name) {
+       // int index = name.lastIndexOf('.');
+       // if (index == -1)
+       // return null;
+       // if (index == (name.length() - 1))
+       // return null; //$NON-NLS-1$
+       // return name.substring(index + 1);
+       // }
+
+       /**
+        * Returns true iff str.toLowerCase().endsWith(".php") implementation is not
+        * creating extra strings.
+        */
+       public final static boolean isPHPFileName(String name) {
+
+               // avoid handling a file without base name, e.g. ".php", which is a
+               // valid
+               // Eclipse resource name
+               File file = new File(name);
+               if (file.getName().startsWith(".")) {
+                       return false;
+               }
+               IWorkbench workbench = PlatformUI.getWorkbench();
+               IEditorRegistry registry = workbench.getEditorRegistry();
+               IEditorDescriptor[] descriptors = registry.getEditors(name);
+
+               for (int i = 0; i < descriptors.length; i++) {
+                       if (descriptors[i].getId().equals(PHPeclipsePlugin.EDITOR_ID)) {
+                               return true;
+                       }
+               }
+               // String extension = getFileExtension(name);
+               // if (extension == null) {
+               // return false;
+               // }
+               // extension = extension.toLowerCase();
+               // PHP_EXTENSIONS = getExtensions();
+               // if (PHP_EXTENSIONS == null) {
+               // return false;
+               // }
+               // for (int i = 0; i < PHP_EXTENSIONS.length; i++) {
+               // if (extension.equals(PHP_EXTENSIONS[i])) {
+               // return true;
+               // }
+               // }
+               return false;
+       }
+
+       /**
+        * Returns true iff the file extension is a valid PHP Unit name
+        * implementation is not creating extra strings.
+        */
+       public final static boolean isValidPHPUnitName(String filename) {
+               return PHPFileUtil.isPHPFileName(filename);
+       }
+
+       /**
+        * @return Returns the PHP extensions.
+        */
+       // public static String[] getExtensions() {
+       // if (PHP_EXTENSIONS == null) {
+       // ArrayList list = new ArrayList();
+       // final IPreferenceStore store =
+       // PHPeclipsePlugin.getDefault().getPreferenceStore();
+       // String extensions =
+       // store.getString(PHPeclipsePlugin.PHP_EXTENSION_PREFS);
+       // extensions = extensions.trim();
+       // if (extensions.length() != 0) {
+       // StringTokenizer tokenizer = new StringTokenizer(extensions, " ,;:/-|");
+       // String token;
+       // while (tokenizer.hasMoreTokens()) {
+       // token = tokenizer.nextToken();
+       // if (token != null && token.length() >= 1) {
+       // list.add(token);
+       // }
+       // }
+       // if (list.size() != 0) {
+       // PHP_EXTENSIONS = new String[list.size()];
+       // for (int i = 0; i < list.size(); i++) {
+       // PHP_EXTENSIONS[i] = (String) list.get(i);
+       // }
+       // }
+       // }
+       // }
+       // return PHP_EXTENSIONS;
+       // }
+       /**
+        * @param php_extensions
+        *            The PHP extensions to set.
+        */
+       // public static void setExtensions(String[] php_extensions) {
+       // PHP_EXTENSIONS = php_extensions;
+       // }
+       /**
+        * Creata the file for the given absolute file path
+        * 
+        * @param absoluteFilePath
+        * @param project
+        * @return the file for the given absolute file path or <code>null</code>
+        *         if no existing file can be found
+        */
+       public static IFile createFile(IPath absoluteFilePath, IProject project) {
+               if (absoluteFilePath == null || project == null) {
+                       return null;
+               }
+
+               String projectPath = project.getFullPath().toString();
+               String filePath = absoluteFilePath.toString().substring(
+                               projectPath.length() + 1);
+               return project.getFile(filePath);
+
+       }
+
+       /**
+        * Determine the path of an include name string
+        * 
+        * @param includeNameString
+        * @param resource
+        * @param project
+        * @return the path for the given include filename or <code>null</code> if
+        *         no existing file can be found
+        */
+       public static IPath determineFilePath(String includeNameString,
+                       IResource resource, IProject project) {
+               //IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(project);
+               IPath resourcePath = resource.getProjectRelativePath();
+
+               IPath path = null;
+               
+               // script location based
+               path = project.getFullPath().append(resourcePath.removeLastSegments(1))
+                               .append(includeNameString);
+               //path = 
+               if (fileExists(path, false)) {
+                       return path;
+               }
+               // project root based
+               path = project.getFullPath().append(includeNameString);
+               if (fileExists(path, false)) {
+                       return path;
+               }
+               
+               // DocumentRoot (absolute path) based
+               /*path = documentRootPath.append(includeNameString);
+               if (fileExists(path, true)) {
+                       return path;
+               }*/
+
+               // IncludePaths settings (absolute path) based
+               // Incastrix
+               /*List includePaths = ProjectPrefUtil.getIncludePaths(project);
+               if (includePaths.size() > 0) {
+                       for (int i = 0; i < includePaths.size(); i++) {
+                               path = new Path(includePaths.get(i).toString())
+                                               .append(includeNameString);
+                               if (fileExists(path, true)) {
+                                       return path;
+                               }
+                       }
+               }*/
+               return null;
+       }
+
+       private static boolean fileExists(IPath path, boolean absolute) {
+               File file = path.toFile();
+               if (file.exists()) {
+                       return true;
+               }
+               if (!absolute) {
+                       IFile ifile = FileBuffers.getWorkspaceFileAtLocation(path);
+                       if (ifile != null) {
+                           IResource resource = ifile;
+                if (resource.exists()) {
+                    return true;
+                }
+                       }
+               }
+               return false;
+       }
+}
\ No newline at end of file
index 96a21b0..48fb3e2 100644 (file)
@@ -33,7 +33,7 @@ import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.core.Assert;
 import net.sourceforge.phpdt.internal.core.PackageFragmentRoot;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
index bfa0f51..b17b195 100644 (file)
@@ -24,7 +24,9 @@ import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpeclipse.phpeditor.EditorUtility;
+//import net.sourceforge.phpdt.ui.JavaUI;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+//import net.sourceforge.phpeclipse.phpeditor.EditorUtility;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -672,7 +674,7 @@ public class JavaModelUtil {
        public static IMember toWorkingCopy(IMember member) {
                ICompilationUnit cu = member.getCompilationUnit();
                if (cu != null && !cu.isWorkingCopy()) {
-                       ICompilationUnit workingCopy = EditorUtility.getWorkingCopy(cu);
+                       ICompilationUnit workingCopy = /*EditorUtility.*/getWorkingCopy(cu);
                        if (workingCopy != null) {
                                IJavaElement[] members = workingCopy.findElements(member);
                                if (members != null && members.length > 0) {
@@ -689,7 +691,7 @@ public class JavaModelUtil {
         */
        public static ICompilationUnit toWorkingCopy(ICompilationUnit cu) {
                if (!cu.isWorkingCopy()) {
-                       ICompilationUnit workingCopy = EditorUtility.getWorkingCopy(cu);
+                       ICompilationUnit workingCopy = /*EditorUtility.*/getWorkingCopy(cu);
                        if (workingCopy != null) {
                                return workingCopy;
                        }
@@ -820,4 +822,46 @@ public class JavaModelUtil {
                System.arraycopy(args, 0, args = new String[count], 0, count);
                return args;
        }
+
+       //incastrix
+       /**
+        * Gets the working copy of an compilation unit opened in an editor
+        * 
+        * @param part
+        *            the editor part
+        * @param cu
+        *            the original compilation unit (or another working copy)
+        * @return the working copy of the compilation unit, or null if not found
+        */
+       public static ICompilationUnit getWorkingCopy(ICompilationUnit cu) {
+               if (cu == null)
+                       return null;
+               if (cu.isWorkingCopy())
+                       return cu;
+
+               return (ICompilationUnit) cu.findSharedWorkingCopy(PHPeclipsePlugin.getDefault()
+                               .getBufferFactory());
+       }
+
+       // incastrix
+       /**
+        * Gets the working copy of an member opened in an editor
+        * 
+        * @param member
+        *            the original member or a member in a working copy
+        * @return the corresponding member in the shared working copy or
+        *         <code>null</code> if not found
+        */
+       public static IMember getWorkingCopy(IMember member)
+                       throws JavaModelException {
+               ICompilationUnit cu = member.getCompilationUnit();
+               if (cu != null) {
+                       ICompilationUnit workingCopy = getWorkingCopy(cu);
+                       if (workingCopy != null) {
+                               return JavaModelUtil.findMemberInCompilationUnit(workingCopy,
+                                               member);
+                       }
+               }
+               return null;
+       }
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/PHPUIStatus.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/PHPUIStatus.java
new file mode 100644 (file)
index 0000000..c4691d6
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved.
+ */
+package net.sourceforge.phpdt.internal.corext.util;
+
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+//import net.sourceforge.phpeclipse.ui.WebUI;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+//incastrix to be renamed
+/**
+ * Convenience class for error exceptions thrown inside PHPeclipse plugin.
+ */
+public class PHPUIStatus extends Status {
+
+       public PHPUIStatus(int code) {
+               this(code, ""); //$NON-NLS-1$
+       }
+
+       private PHPUIStatus(int severity, int code, String message,
+                       Throwable throwable) {
+               super(severity, PHPeclipsePlugin.getPluginId(), code, message,
+                               throwable);
+       }
+
+       public PHPUIStatus(int code, String message) {
+               this(code, message, null);
+       }
+
+       public PHPUIStatus(int code, String message, Throwable throwable) {
+               super(IStatus.ERROR, PHPeclipsePlugin.getPluginId(), code, message,
+                               throwable);
+       }
+
+       public static IStatus createError(int code, Throwable throwable) {
+               String message = throwable.getMessage();
+               if (message == null) {
+                       message = throwable.getClass().getName();
+               }
+               return new PHPUIStatus(IStatus.ERROR, code, message, throwable);
+       }
+
+       public static IStatus createError(int code, String message,
+                       Throwable throwable) {
+               return new PHPUIStatus(IStatus.ERROR, code, message, throwable);
+       }
+
+       public static IStatus createInfo(int code, String message,
+                       Throwable throwable) {
+               return new PHPUIStatus(IStatus.INFO, code, message, throwable);
+       }
+
+       public static IStatus createWarning(int code, String message,
+                       Throwable throwable) {
+               return new PHPUIStatus(IStatus.WARNING, code, message, throwable);
+       }
+}
index 2ec493e..286ee24 100644 (file)
@@ -15,7 +15,7 @@ import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IContainer;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/CustomBufferFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/CustomBufferFactory.java
new file mode 100644 (file)
index 0000000..81975f4
--- /dev/null
@@ -0,0 +1,44 @@
+/**********************************************************************
+ Copyright (c) 2000, 2003 IBM Corp. and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Common Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/cpl-v10.html
+
+ Contributors:
+ IBM Corporation - Initial implementation
+ **********************************************************************/
+
+package net.sourceforge.phpeclipse;
+
+import net.sourceforge.phpdt.core.IBuffer;
+import net.sourceforge.phpdt.core.IBufferFactory;
+import net.sourceforge.phpdt.core.ICompilationUnit;
+import net.sourceforge.phpdt.core.IOpenable;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
+/**
+ * Creates <code>IBuffer</code>s based on documents.
+ * 
+ * @deprecated since 3.0 no longer used
+ */
+public class CustomBufferFactory implements IBufferFactory {
+
+       /*
+        * @see net.sourceforge.phpdt.core.IBufferFactory#createBuffer(net.sourceforge.phpdt.core.IOpenable)
+        */
+       public IBuffer createBuffer(IOpenable owner) {
+               if (owner instanceof ICompilationUnit) {
+                       ICompilationUnit unit = (ICompilationUnit) owner;
+                       ICompilationUnit original = unit.getPrimary();
+                       IResource resource = original.getResource();
+                       if (resource instanceof IFile) {
+                               return new DocumentAdapter(unit, (IFile) resource);
+                       }
+
+               }
+               return DocumentAdapter.NULL;
+       }
+}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPConsole.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPConsole.java
deleted file mode 100644 (file)
index c7ddf42..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-package net.sourceforge.phpeclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-public class PHPConsole {
-       private MessageConsole myConsole;
-
-       private MessageConsoleStream stream;
-
-       private boolean hasMessages;
-
-       public PHPConsole() {
-               hasMessages = false;
-               myConsole = new MessageConsole("PHPeclipse Console", null);
-               ConsolePlugin.getDefault().getConsoleManager().addConsoles(
-                               new IConsole[] { myConsole });
-               ConsolePlugin.getDefault().getConsoleManager().showConsoleView(
-                               myConsole);
-               // layout.addView(IConsoleConstants.ID_CONSOLE_VIEW, IPageLayout.BOTTOM,
-               // .5f,IPageLayout.ID_EDITOR_AREA);
-               stream = myConsole.newMessageStream();
-       }
-
-       /**
-        * @return
-        */
-       public Color getColor() {
-               return stream.getColor();
-       }
-
-       /**
-        * @return
-        */
-       public MessageConsole getConsole() {
-               return stream.getConsole();
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see java.lang.Object#hashCode()
-        */
-       public int hashCode() {
-               return stream.hashCode();
-       }
-
-       /**
-        * @param message
-        */
-       public void print(String message) {
-               hasMessages = true;
-               stream.print(message);
-       }
-
-       /**
-        * 
-        */
-       public void println() {
-               hasMessages = true;
-               stream.println();
-       }
-
-       /**
-        * @param message
-        */
-       public void println(String message) {
-               hasMessages = true;
-               stream.println(message);
-       }
-
-       /**
-        * @param color
-        */
-       public void setColor(Color color) {
-               stream.setColor(color);
-       }
-
-       // public void reportError(String title, String message) {
-       // if (hasMessages) {
-       // WikiEditorPlugin.getDefault().reportError(title, message);
-       // }
-       // }
-
-       // public void reportError() {
-       // reportError("Problems listed", "Open console view for problems log!");
-       // }
-       /**
-        * Creates a string buffer from the given input stream
-        */
-       public static String getStringFromStream(InputStream stream)
-                       throws IOException {
-               StringBuffer buffer = new StringBuffer();
-               byte[] b = new byte[100];
-               int finished = 0;
-               while (finished != -1) {
-                       finished = stream.read(b);
-                       if (finished != -1) {
-                               String current = new String(b, 0, finished);
-                               buffer.append(current);
-                       }
-               }
-               return buffer.toString();
-       }
-}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
deleted file mode 100644 (file)
index 94f26a3..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-package net.sourceforge.phpeclipse;
-
-import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.console.IConsoleConstants;
-
-public class PHPPerspectiveFactory implements IPerspectiveFactory {
-       public static final String ID_PROGRESS_VIEW = "org.eclipse.ui.views.ProgressView"; //$NON-NLS-1$
-
-       // see bug 63563
-
-       public PHPPerspectiveFactory() {
-               super();
-       }
-
-       public void createInitialLayout(IPageLayout layout) {
-               String editorArea = layout.getEditorArea();
-               IFolderLayout folder = layout.createFolder("left", IPageLayout.LEFT,
-                               (float) 0.25, editorArea); //$NON-NLS-1$
-               folder.addView(IPageLayout.ID_RES_NAV);
-               IFolderLayout outputfolder = layout.createFolder("bottom",
-                               IPageLayout.BOTTOM, (float) 0.75, editorArea); //$NON-NLS-1$
-               outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);
-
-               outputfolder.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID);
-               outputfolder.addView(IConsoleConstants.ID_CONSOLE_VIEW);
-               outputfolder.addView(IPageLayout.ID_BOOKMARKS);
-               outputfolder.addView(BrowserView.ID_BROWSER);
-               outputfolder.addPlaceholder(ID_PROGRESS_VIEW);
-
-               layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.RIGHT, (float) 0.75,
-                               editorArea);
-               layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-               layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-               layout.addShowViewShortcut(BrowserView.ID_BROWSER);
-
-               // views - search
-               layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
-
-               // views - debugging
-               layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
-               // views - standard workbench
-               layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-               layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-               layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-               // new actions - PHP project creation wizards
-               layout
-                               .addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.PHPFileWizard"); //$NON-NLS-1$
-               layout
-                               .addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation"); //$NON-NLS-1$
-               layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
-               layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
-               // perspective shortcuts
-               layout.addPerspectiveShortcut(IDebugUIConstants.ID_DEBUG_PERSPECTIVE);
-               layout.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective");
-       }
-}
\ No newline at end of file
index d3a771d..d04f027 100644 (file)
@@ -30,11 +30,12 @@ import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.internal.core.BatchOperation;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.corext.template.php.CodeTemplateContextType;
+/*import net.sourceforge.phpdt.internal.corext.template.php.CodeTemplateContextType;
 import net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContextType;
-import net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType;
-import net.sourceforge.phpdt.internal.ui.IJavaStatusConstants;
+import net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType;*/
+import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+/*import net.sourceforge.phpdt.internal.ui.IJavaStatusConstants;
 import net.sourceforge.phpdt.internal.ui.JavaElementAdapterFactory;
 import net.sourceforge.phpdt.internal.ui.ResourceAdapterFactory;
 import net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferenceCache;
@@ -47,18 +48,18 @@ import net.sourceforge.phpdt.internal.ui.viewsupport.ProblemMarkerManager;
 import net.sourceforge.phpdt.ui.IContextMenuConstants;
 import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
-import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.builder.ExternalEditorInput;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;*/
+/*import net.sourceforge.phpeclipse.builder.ExternalEditorInput;
 import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider;
 import net.sourceforge.phpeclipse.builder.FileStorage;
-import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory;
+import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;*/
+/*import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory;
 import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter;
 import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
 import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
 import net.sourceforge.phpeclipse.phpeditor.WorkingCopyManager;
-import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
+import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;*/
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -77,16 +78,19 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.GroupMarker;
+import org.eclipse.jface.text.templates.ContextTypeRegistry;
+import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
+/*import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.resource.JFaceResources;*/
+/*import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.templates.ContextTypeRegistry;
 import org.eclipse.jface.text.templates.persistence.TemplateStore;
@@ -112,13 +116,13 @@ import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.ConfigurationElementSorter;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
+import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;*/
 import org.osgi.framework.BundleContext;
 
 /**
  * The main plugin class to be used in the desktop.
  */
-public class PHPeclipsePlugin extends AbstractUIPlugin implements
+public class PHPeclipsePlugin extends /*AbstractUIPlugin*/Plugin implements
                IPreferenceConstants {
        /**
         * The id of the PHP plugin (value <code>"net.sourceforge.phpeclipse"</code>).
@@ -128,7 +132,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
        public static final String EDITOR_ID = PHPeclipsePlugin.PLUGIN_ID
                        + ".PHPUnitEditor";
 
-       public static final String ID_PERSPECTIVE = "net.sourceforge.phpeclipse.PHPPerspective"; //$NON-NLS-1$
+       //public static final String ID_PERSPECTIVE = "net.sourceforge.phpeclipse.PHPPerspective"; //$NON-NLS-1$
 
        IWorkspace w;
 
@@ -182,7 +186,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       private ContextTypeRegistry fContextTypeRegistry;
+       /*private ContextTypeRegistry fContextTypeRegistry;*/
 
        /**
         * The code template context type registry for the java editor.
@@ -196,14 +200,14 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       private TemplateStore fTemplateStore;
+       /*private TemplateStore fTemplateStore;*/
 
        /**
         * The coded template store for the java editor.
         * 
         * @since 3.0
         */
-       private TemplateStore fCodeTemplateStore;
+       /*private TemplateStore fCodeTemplateStore;*/
 
        /** Windows 9x */
        private static final int WINDOWS_9x = 6;
@@ -211,34 +215,34 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
        /** Windows NT */
        private static final int WINDOWS_NT = 5;
 
-       private ImageDescriptorRegistry fImageDescriptorRegistry;
+       /*private ImageDescriptorRegistry fImageDescriptorRegistry;*/
 
        private HashMap fIndexManagerMap = new HashMap();
 
-       private IWorkingCopyManager fWorkingCopyManager;
+       /*private IWorkingCopyManager fWorkingCopyManager;*/
 
        private IBufferFactory fBufferFactory;
 
-       private ICompilationUnitDocumentProvider fCompilationUnitDocumentProvider;
+       /*private ICompilationUnitDocumentProvider fCompilationUnitDocumentProvider;*/
 
-       private JavaTextTools fJavaTextTools;
+       /*private JavaTextTools fJavaTextTools;*/
 
-       private ProblemMarkerManager fProblemMarkerManager;
+       /*private ProblemMarkerManager fProblemMarkerManager;*/
 
-       private MembersOrderPreferenceCache fMembersOrderPreferenceCache;
+       /*private MembersOrderPreferenceCache fMembersOrderPreferenceCache;*/
 
        private IFile fLastEditorFile = null;
 
-       private JavaEditorTextHoverDescriptor[] fJavaEditorTextHoverDescriptors;
+/*     private JavaEditorTextHoverDescriptor[] fJavaEditorTextHoverDescriptors;*/
 
-       private JavaElementAdapterFactory fJavaElementAdapterFactory;
+       /*private JavaElementAdapterFactory fJavaElementAdapterFactory;*/
 
        // private MarkerAdapterFactory fMarkerAdapterFactory;
        // private EditorInputAdapterFactory fEditorInputAdapterFactory;
-       private ResourceAdapterFactory fResourceAdapterFactory;
+       /*private ResourceAdapterFactory fResourceAdapterFactory;*/
 
        // private LogicalPackageAdapterFactory fLogicalPackageAdapterFactory;
-       private IPropertyChangeListener fFontPropertyChangeListener;
+       /*private IPropertyChangeListener fFontPropertyChangeListener;*/
 
        /**
         * Property change listener on this plugin's preference store.
@@ -251,7 +255,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       private IPreferenceStore fCombinedPreferenceStore;
+       /*private IPreferenceStore fCombinedPreferenceStore;*/
 
        /**
         * The extension point registry for the
@@ -260,7 +264,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       private JavaFoldingStructureProviderRegistry fFoldingStructureProviderRegistry;
+       /*private JavaFoldingStructureProviderRegistry fFoldingStructureProviderRegistry;*/
 
        /**
         * Mockup preference store for firing events and registering listeners on
@@ -268,7 +272,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       private MockupPreferenceStore fMockupPreferenceStore;
+       /*private MockupPreferenceStore fMockupPreferenceStore;*/
 
        /**
         * The constructor.
@@ -306,92 +310,92 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @return an array of JavaEditorTextHoverDescriptor
         * @since 2.1
         */
-       public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
-               if (fJavaEditorTextHoverDescriptors == null) {
-                       fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor
-                                       .getContributedHovers();
-                       ConfigurationElementSorter sorter = new ConfigurationElementSorter() {
-                               /*
-                                * @see org.eclipse.ui.texteditor.ConfigurationElementSorter#getConfigurationElement(java.lang.Object)
-                                */
-                               public IConfigurationElement getConfigurationElement(
-                                               Object object) {
-                                       return ((JavaEditorTextHoverDescriptor) object)
-                                                       .getConfigurationElement();
-                               }
-                       };
-                       sorter.sort(fJavaEditorTextHoverDescriptors);
-
-                       // The Problem hover has to be the first and the Annotation hover
-                       // has to
-                       // be the last one in the JDT UI's hover list
-                       int length = fJavaEditorTextHoverDescriptors.length;
-                       int first = -1;
-                       int last = length - 1;
-                       int problemHoverIndex = -1;
-                       int annotationHoverIndex = -1;
-                       for (int i = 0; i < length; i++) {
-                               if (!fJavaEditorTextHoverDescriptors[i].getId().startsWith(
-                                               PLUGIN_ID)) {
-                                       if (problemHoverIndex == -1 || annotationHoverIndex == -1)
-                                               continue;
-                                       else {
-                                               last = i - 1;
-                                               break;
-                                       }
-                               }
-                               if (first == -1)
-                                       first = i;
-
-                               if (fJavaEditorTextHoverDescriptors[i].getId().equals(
-                                               "net.sourceforge.phpdt.ui.AnnotationHover")) { //$NON-NLS-1$
-                                       annotationHoverIndex = i;
-                                       continue;
-                               }
-                               if (fJavaEditorTextHoverDescriptors[i].getId().equals(
-                                               "net.sourceforge.phpdt.ui.ProblemHover")) { //$NON-NLS-1$
-                                       problemHoverIndex = i;
-                                       continue;
-                               }
-                       }
-
-                       JavaEditorTextHoverDescriptor hoverDescriptor = null;
-
-                       if (first > -1 && problemHoverIndex > -1
-                                       && problemHoverIndex != first) {
-                               // move problem hover to beginning
-                               hoverDescriptor = fJavaEditorTextHoverDescriptors[first];
-                               fJavaEditorTextHoverDescriptors[first] = fJavaEditorTextHoverDescriptors[problemHoverIndex];
-                               fJavaEditorTextHoverDescriptors[problemHoverIndex] = hoverDescriptor;
-
-                               // update annotation hover index if needed
-                               if (annotationHoverIndex == first)
-                                       annotationHoverIndex = problemHoverIndex;
-                       }
-
-                       if (annotationHoverIndex > -1 && annotationHoverIndex != last) {
-                               // move annotation hover to end
-                               hoverDescriptor = fJavaEditorTextHoverDescriptors[last];
-                               fJavaEditorTextHoverDescriptors[last] = fJavaEditorTextHoverDescriptors[annotationHoverIndex];
-                               fJavaEditorTextHoverDescriptors[annotationHoverIndex] = hoverDescriptor;
-                       }
-
-                       // Move Best Match hover to front
-                       for (int i = 0; i < fJavaEditorTextHoverDescriptors.length - 1; i++) {
-                               if (PreferenceConstants.ID_BESTMATCH_HOVER
-                                               .equals(fJavaEditorTextHoverDescriptors[i].getId())) {
-                                       hoverDescriptor = fJavaEditorTextHoverDescriptors[i];
-                                       for (int j = i; j > 0; j--)
-                                               fJavaEditorTextHoverDescriptors[j] = fJavaEditorTextHoverDescriptors[j - 1];
-                                       fJavaEditorTextHoverDescriptors[0] = hoverDescriptor;
-                                       break;
-                               }
-
-                       }
-               }
-
-               return fJavaEditorTextHoverDescriptors;
-       }
+//     public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
+//             if (fJavaEditorTextHoverDescriptors == null) {
+//                     fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor
+//                                     .getContributedHovers();
+//                     ConfigurationElementSorter sorter = new ConfigurationElementSorter() {
+//                             /*
+//                              * @see org.eclipse.ui.texteditor.ConfigurationElementSorter#getConfigurationElement(java.lang.Object)
+//                              */
+//                             public IConfigurationElement getConfigurationElement(
+//                                             Object object) {
+//                                     return ((JavaEditorTextHoverDescriptor) object)
+//                                                     .getConfigurationElement();
+//                             }
+//                     };
+//                     sorter.sort(fJavaEditorTextHoverDescriptors);
+//
+//                     // The Problem hover has to be the first and the Annotation hover
+//                     // has to
+//                     // be the last one in the JDT UI's hover list
+//                     int length = fJavaEditorTextHoverDescriptors.length;
+//                     int first = -1;
+//                     int last = length - 1;
+//                     int problemHoverIndex = -1;
+//                     int annotationHoverIndex = -1;
+//                     for (int i = 0; i < length; i++) {
+//                             if (!fJavaEditorTextHoverDescriptors[i].getId().startsWith(
+//                                             PLUGIN_ID)) {
+//                                     if (problemHoverIndex == -1 || annotationHoverIndex == -1)
+//                                             continue;
+//                                     else {
+//                                             last = i - 1;
+//                                             break;
+//                                     }
+//                             }
+//                             if (first == -1)
+//                                     first = i;
+//
+//                             if (fJavaEditorTextHoverDescriptors[i].getId().equals(
+//                                             "net.sourceforge.phpdt.ui.AnnotationHover")) { //$NON-NLS-1$
+//                                     annotationHoverIndex = i;
+//                                     continue;
+//                             }
+//                             if (fJavaEditorTextHoverDescriptors[i].getId().equals(
+//                                             "net.sourceforge.phpdt.ui.ProblemHover")) { //$NON-NLS-1$
+//                                     problemHoverIndex = i;
+//                                     continue;
+//                             }
+//                     }
+//
+//                     JavaEditorTextHoverDescriptor hoverDescriptor = null;
+//
+//                     if (first > -1 && problemHoverIndex > -1
+//                                     && problemHoverIndex != first) {
+//                             // move problem hover to beginning
+//                             hoverDescriptor = fJavaEditorTextHoverDescriptors[first];
+//                             fJavaEditorTextHoverDescriptors[first] = fJavaEditorTextHoverDescriptors[problemHoverIndex];
+//                             fJavaEditorTextHoverDescriptors[problemHoverIndex] = hoverDescriptor;
+//
+//                             // update annotation hover index if needed
+//                             if (annotationHoverIndex == first)
+//                                     annotationHoverIndex = problemHoverIndex;
+//                     }
+//
+//                     if (annotationHoverIndex > -1 && annotationHoverIndex != last) {
+//                             // move annotation hover to end
+//                             hoverDescriptor = fJavaEditorTextHoverDescriptors[last];
+//                             fJavaEditorTextHoverDescriptors[last] = fJavaEditorTextHoverDescriptors[annotationHoverIndex];
+//                             fJavaEditorTextHoverDescriptors[annotationHoverIndex] = hoverDescriptor;
+//                     }
+//
+//                     // Move Best Match hover to front
+//                     for (int i = 0; i < fJavaEditorTextHoverDescriptors.length - 1; i++) {
+//                             if (PreferenceConstants.ID_BESTMATCH_HOVER
+//                                             .equals(fJavaEditorTextHoverDescriptors[i].getId())) {
+//                                     hoverDescriptor = fJavaEditorTextHoverDescriptors[i];
+//                                     for (int j = i; j > 0; j--)
+//                                             fJavaEditorTextHoverDescriptors[j] = fJavaEditorTextHoverDescriptors[j - 1];
+//                                     fJavaEditorTextHoverDescriptors[0] = hoverDescriptor;
+//                                     break;
+//                             }
+//
+//                     }
+//             }
+//
+//             return fJavaEditorTextHoverDescriptors;
+//     }
 
        /**
         * Resets the Java editor text hovers contributed to the workbench.
@@ -403,36 +407,36 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @return an array of JavaEditorTextHoverDescriptor
         * @since 2.1
         */
-       public void resetJavaEditorTextHoverDescriptors() {
-               fJavaEditorTextHoverDescriptors = null;
-       }
+//     public void resetJavaEditorTextHoverDescriptors() {
+//             fJavaEditorTextHoverDescriptors = null;
+//     }
 
        /**
         * Creates the PHP plugin standard groups in a context menu.
         */
-       public static void createStandardGroups(IMenuManager menu) {
-               if (!menu.isEmpty())
-                       return;
-               menu.add(new Separator(IContextMenuConstants.GROUP_NEW));
-               menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
-               menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
-               menu.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-               menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
-               menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
-               menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-               menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
-               menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
-               menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
-               menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
-       }
-
-       public static IWorkbenchPage getActivePage() {
-               return getDefault().internalGetActivePage();
-       }
-
-       public static Shell getActiveWorkbenchShell() {
-               return getActiveWorkbenchWindow().getShell();
-       }
+//     public static void createStandardGroups(IMenuManager menu) {
+//             if (!menu.isEmpty())
+//                     return;
+//             menu.add(new Separator(IContextMenuConstants.GROUP_NEW));
+//             menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
+//             menu.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
+//             menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
+//     }
+//
+//     public static IWorkbenchPage getActivePage() {
+//             return getDefault().internalGetActivePage();
+//     }
+//
+//     public static Shell getActiveWorkbenchShell() {
+//             return getActiveWorkbenchWindow().getShell();
+//     }
 
        /**
         * Returns an array of all editors that have an unsaved content. If the
@@ -441,31 +445,31 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @return an array of all dirty editor parts.
         */
-       public static IEditorPart[] getDirtyEditors() {
-               Set inputs = new HashSet();
-               List result = new ArrayList(0);
-               IWorkbench workbench = getDefault().getWorkbench();
-               IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-               for (int i = 0; i < windows.length; i++) {
-                       IWorkbenchPage[] pages = windows[i].getPages();
-                       for (int x = 0; x < pages.length; x++) {
-                               IEditorPart[] editors = pages[x].getDirtyEditors();
-                               for (int z = 0; z < editors.length; z++) {
-                                       IEditorPart ep = editors[z];
-                                       IEditorInput input = ep.getEditorInput();
-                                       if (!inputs.contains(input)) {
-                                               inputs.add(input);
-                                               result.add(ep);
-                                       }
-                               }
-                       }
-               }
-               return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
-       }
-
-       public static IWorkbenchWindow getActiveWorkbenchWindow() {
-               return getDefault().getWorkbench().getActiveWorkbenchWindow();
-       }
+//     public static IEditorPart[] getDirtyEditors() {
+//             Set inputs = new HashSet();
+//             List result = new ArrayList(0);
+//             IWorkbench workbench = getDefault().getWorkbench();
+//             IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+//             for (int i = 0; i < windows.length; i++) {
+//                     IWorkbenchPage[] pages = windows[i].getPages();
+//                     for (int x = 0; x < pages.length; x++) {
+//                             IEditorPart[] editors = pages[x].getDirtyEditors();
+//                             for (int z = 0; z < editors.length; z++) {
+//                                     IEditorPart ep = editors[z];
+//                                     IEditorInput input = ep.getEditorInput();
+//                                     if (!inputs.contains(input)) {
+//                                             inputs.add(input);
+//                                             result.add(ep);
+//                                     }
+//                             }
+//                     }
+//             }
+//             return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
+//     }
+//
+//     public static IWorkbenchWindow getActiveWorkbenchWindow() {
+//             return getDefault().getWorkbench().getActiveWorkbenchWindow();
+//     }
 
        /**
         * Returns the shared instance.
@@ -474,9 +478,9 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
                return plugin;
        }
 
-       public static ImageDescriptorRegistry getImageDescriptorRegistry() {
-               return getDefault().internalGetImageDescriptorRegistry();
-       }
+//     public static ImageDescriptorRegistry getImageDescriptorRegistry() {
+//             return getDefault().internalGetImageDescriptorRegistry();
+//     }
 
        static IPath getInstallLocation() {
                return new Path(getDefault().getBundle().getEntry("/").getFile());
@@ -495,13 +499,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * thread calling this method has an associated display. If so, this display
         * is returned. Otherwise the method returns the default display.
         */
-       public static Display getStandardDisplay() {
-               Display display = Display.getCurrent();
-               if (display == null) {
-                       display = Display.getDefault();
-               }
-               return display;
-       }
+//     public static Display getStandardDisplay() {
+//             Display display = Display.getCurrent();
+//             if (display == null) {
+//                     display = Display.getDefault();
+//             }
+//             return display;
+//     }
 
        // public static ExternalToolsPlugin getExternalTools() {
        // return externalTools;
@@ -556,10 +560,10 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
                log(error(message, t));
        }
 
-       public static void logErrorMessage(String message) {
-               log(new Status(IStatus.ERROR, getPluginId(),
-                               IJavaStatusConstants.INTERNAL_ERROR, message, null));
-       }
+//     public static void logErrorMessage(String message) {
+//             log(new Status(IStatus.ERROR, getPluginId(),
+//                             IJavaStatusConstants.INTERNAL_ERROR, message, null));
+//     }
 
        public static IStatus error(Throwable t) {
                return error("PHPeclipsePlugin.internalErrorOccurred", t); //$NON-NLS-1$
@@ -598,11 +602,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
        // }
 
        // TODO: refactor this into a better method name !
-       public synchronized ICompilationUnitDocumentProvider getCompilationUnitDocumentProvider() {
-               if (fCompilationUnitDocumentProvider == null)
-                       fCompilationUnitDocumentProvider = new PHPDocumentProvider();
-               return fCompilationUnitDocumentProvider;
-       }
+//     public synchronized ICompilationUnitDocumentProvider getCompilationUnitDocumentProvider() {
+//             if (fCompilationUnitDocumentProvider == null)
+//                     fCompilationUnitDocumentProvider = new PHPDocumentProvider();
+//             return fCompilationUnitDocumentProvider;
+//     }
 
        /**
         * Get the identifier index manager for the given project
@@ -630,49 +634,49 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
                }
                return indexManager;
        }
-
-       public synchronized IWorkingCopyManager getWorkingCopyManager() {
-               if (fWorkingCopyManager == null) {
-                       ICompilationUnitDocumentProvider provider = getCompilationUnitDocumentProvider();
-                       fWorkingCopyManager = new WorkingCopyManager(provider);
-               }
-               return fWorkingCopyManager;
-       }
-
-       public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() {
-               if (fMembersOrderPreferenceCache == null)
-                       fMembersOrderPreferenceCache = new MembersOrderPreferenceCache();
-               return fMembersOrderPreferenceCache;
-       }
-
-       /**
-        * Returns the mockup preference store for firing events and registering
-        * listeners on project setting changes. Temporary solution.
-        */
-       public MockupPreferenceStore getMockupPreferenceStore() {
-               if (fMockupPreferenceStore == null)
-                       fMockupPreferenceStore = new MockupPreferenceStore();
-
-               return fMockupPreferenceStore;
-       }
-
-       public synchronized ProblemMarkerManager getProblemMarkerManager() {
-               if (fProblemMarkerManager == null)
-                       fProblemMarkerManager = new ProblemMarkerManager();
-               return fProblemMarkerManager;
-       }
+//
+//     public synchronized IWorkingCopyManager getWorkingCopyManager() {
+//             if (fWorkingCopyManager == null) {
+//                     ICompilationUnitDocumentProvider provider = getCompilationUnitDocumentProvider();
+//                     fWorkingCopyManager = new WorkingCopyManager(provider);
+//             }
+//             return fWorkingCopyManager;
+//     }
+//
+//     public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() {
+//             if (fMembersOrderPreferenceCache == null)
+//                     fMembersOrderPreferenceCache = new MembersOrderPreferenceCache();
+//             return fMembersOrderPreferenceCache;
+//     }
+//
+//     /**
+//      * Returns the mockup preference store for firing events and registering
+//      * listeners on project setting changes. Temporary solution.
+//      */
+//     public MockupPreferenceStore getMockupPreferenceStore() {
+//             if (fMockupPreferenceStore == null)
+//                     fMockupPreferenceStore = new MockupPreferenceStore();
+//
+//             return fMockupPreferenceStore;
+//     }
+//
+//     public synchronized ProblemMarkerManager getProblemMarkerManager() {
+//             if (fProblemMarkerManager == null)
+//                     fProblemMarkerManager = new ProblemMarkerManager();
+//             return fProblemMarkerManager;
+//     }
 
        // public synchronized JavaTextTools getJavaTextTools() {
        // if (fJavaTextTools == null)
        // fJavaTextTools = new JavaTextTools(getPreferenceStore());
        // return fJavaTextTools;
        // }
-       public synchronized JavaTextTools getJavaTextTools() {
-               if (fJavaTextTools == null)
-                       fJavaTextTools = new JavaTextTools(getPreferenceStore(), JavaCore
-                                       .getPlugin().getPluginPreferences());
-               return fJavaTextTools;
-       }
+//     public synchronized JavaTextTools getJavaTextTools() {
+//             if (fJavaTextTools == null)
+//                     fJavaTextTools = new JavaTextTools(getPreferenceStore(), JavaCore
+//                                     .getPlugin().getPluginPreferences());
+//             return fJavaTextTools;
+//     }
 
        public IFile getLastEditorFile() {
                return fLastEditorFile;
@@ -697,118 +701,118 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
        // public ResourceBundle getResourceBundle() {
        // return resourceBundle;
        // }
-       protected void initializeDefaultPreferences(IPreferenceStore store) {
-               String operatingSystem = Platform.getOS();
-               // maxosx, linux, solaris, win32,...
-               try {
-                       InputStream is = getDefault()
-                                       .openStream(
-                                                       new Path("prefs/default_" + operatingSystem
-                                                                       + ".properties"));
-                       PropertyResourceBundle resourceBundle = new PropertyResourceBundle(
-                                       is);
-                       Enumeration e = resourceBundle.getKeys();
-                       String key;
-                       while (e.hasMoreElements()) {
-                               key = (String) e.nextElement();
-                               store.setDefault(key, resourceBundle.getString(key));
-                       }
-               } catch (Exception e) {
-                       // no default properties found
-                       if (operatingSystem.equals(Platform.OS_WIN32)) {
-                               // store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe");
-                               // store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php
-                               // -l -f {0}");
-                               // store.setDefault(MYSQL_RUN_PREF,
-                               // "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
-                               // store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
-                               // store.setDefault(XAMPP_START_PREF,
-                               // "c:\\xampp\\xampp_start.exe");
-                               // store.setDefault(XAMPP_STOP_PREF,
-                               // "c:\\xampp\\xampp_stop.exe");
-                               // store.setDefault(
-                               // ETC_HOSTS_PATH_PREF,
-                               // "c:\\windows\\system32\\drivers\\etc\\hosts");
-                       } else {
-                               // store.setDefault(PHP_RUN_PREF, "/apache/php/php");
-                               // store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f
-                               // {0}");
-                               // store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
-                               // store.setDefault(APACHE_RUN_PREF, "/apache/apache");
-                               // store.setDefault(XAMPP_START_PREF, "xamp/xampp_start");
-                               // store.setDefault(XAMPP_STOP_PREF, "xampp/xampp_stop");
-                       }
-                       // store.setDefault(MYSQL_PREF, "--standalone");
-                       // store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot
-                       // \"{0}\"\"");
-                       // store.setDefault(APACHE_STOP_PREF, "-k shutdown");
-                       // store.setDefault(APACHE_RESTART_PREF, "-k restart");
-                       // store.setDefault(MYSQL_START_BACKGROUND, "true");
-                       // store.setDefault(APACHE_START_BACKGROUND, "true");
-                       // store.setDefault(APACHE_STOP_BACKGROUND, "true");
-                       // store.setDefault(APACHE_RESTART_BACKGROUND, "true");
-               }
-
-               // php syntax highlighting
-               store.setDefault(PHP_USERDEF_XMLFILE, "");
-               PreferenceConverter.setDefault(store, PHP_TAG, PHPColorProvider.TAG);
-               PreferenceConverter.setDefault(store, PHP_KEYWORD,
-                               PHPColorProvider.KEYWORD);
-               PreferenceConverter.setDefault(store, PHP_VARIABLE,
-                               PHPColorProvider.VARIABLE);
-               PreferenceConverter.setDefault(store, PHP_VARIABLE_DOLLAR,
-                               PHPColorProvider.VARIABLE);
-               PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME,
-                               PHPColorProvider.FUNCTION_NAME);
-               PreferenceConverter.setDefault(store, PHP_CONSTANT,
-                               PHPColorProvider.CONSTANT);
-               PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
-               PreferenceConverter.setDefault(store, PHP_DEFAULT,
-                               PHPColorProvider.DEFAULT);
-               PreferenceConverter.setDefault(store, PHPDOC_KEYWORD,
-                               PHPColorProvider.PHPDOC_KEYWORD);
-               PreferenceConverter.setDefault(store, PHPDOC_TAG,
-                               PHPColorProvider.PHPDOC_TAG);
-               PreferenceConverter.setDefault(store, PHPDOC_LINK,
-                               PHPColorProvider.PHPDOC_LINK);
-               PreferenceConverter.setDefault(store, PHPDOC_DEFAULT,
-                               PHPColorProvider.PHPDOC_DEFAULT);
-
-               PreferenceConverter.setDefault(store, EDITOR_PHP_KEYWORD_RETURN_COLOR,
-                               new RGB(127, 0, 85));
-               store.setDefault(EDITOR_PHP_KEYWORD_RETURN_BOLD, true);
-               store.setDefault(EDITOR_PHP_KEYWORD_RETURN_ITALIC, false);
-
-               PreferenceConverter.setDefault(store, EDITOR_PHP_OPERATOR_COLOR,
-                               new RGB(0, 0, 0));
-               store.setDefault(EDITOR_PHP_OPERATOR_BOLD, false);
-               store.setDefault(EDITOR_PHP_OPERATOR_ITALIC, false);
-
-               PreferenceConverter.setDefault(store, EDITOR_PHP_BRACE_OPERATOR_COLOR,
-                               new RGB(0, 0, 0));
-               store.setDefault(EDITOR_PHP_BRACE_OPERATOR_BOLD, false);
-               store.setDefault(EDITOR_PHP_BRACE_OPERATOR_ITALIC, false);
-
-               // this will initialize the static fields in the syntaxrdr class
-               new PHPSyntaxRdr();
-               JavaCore.initializeDefaultPluginPreferences();
-               PreferenceConstants.initializeDefaultValues(store);
-               // externalTools.initializeDefaultPreferences(store);
-               // MarkerAnnotationPreferences.initializeDefaultValues(store);
-       }
-
-       private IWorkbenchPage internalGetActivePage() {
-               IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
-               if (window != null)
-                       return window.getActivePage();
-               return null;
-       }
-
-       private ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
-               if (fImageDescriptorRegistry == null)
-                       fImageDescriptorRegistry = new ImageDescriptorRegistry();
-               return fImageDescriptorRegistry;
-       }
+//     protected void initializeDefaultPreferences(IPreferenceStore store) {
+//             String operatingSystem = Platform.getOS();
+//             // maxosx, linux, solaris, win32,...
+//             try {
+//                     InputStream is = getDefault()
+//                                     .openStream(
+//                                                     new Path("prefs/default_" + operatingSystem
+//                                                                     + ".properties"));
+//                     PropertyResourceBundle resourceBundle = new PropertyResourceBundle(
+//                                     is);
+//                     Enumeration e = resourceBundle.getKeys();
+//                     String key;
+//                     while (e.hasMoreElements()) {
+//                             key = (String) e.nextElement();
+//                             store.setDefault(key, resourceBundle.getString(key));
+//                     }
+//             } catch (Exception e) {
+//                     // no default properties found
+//                     if (operatingSystem.equals(Platform.OS_WIN32)) {
+//                             // store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe");
+//                             // store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php
+//                             // -l -f {0}");
+//                             // store.setDefault(MYSQL_RUN_PREF,
+//                             // "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
+//                             // store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
+//                             // store.setDefault(XAMPP_START_PREF,
+//                             // "c:\\xampp\\xampp_start.exe");
+//                             // store.setDefault(XAMPP_STOP_PREF,
+//                             // "c:\\xampp\\xampp_stop.exe");
+//                             // store.setDefault(
+//                             // ETC_HOSTS_PATH_PREF,
+//                             // "c:\\windows\\system32\\drivers\\etc\\hosts");
+//                     } else {
+//                             // store.setDefault(PHP_RUN_PREF, "/apache/php/php");
+//                             // store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f
+//                             // {0}");
+//                             // store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
+//                             // store.setDefault(APACHE_RUN_PREF, "/apache/apache");
+//                             // store.setDefault(XAMPP_START_PREF, "xamp/xampp_start");
+//                             // store.setDefault(XAMPP_STOP_PREF, "xampp/xampp_stop");
+//                     }
+//                     // store.setDefault(MYSQL_PREF, "--standalone");
+//                     // store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot
+//                     // \"{0}\"\"");
+//                     // store.setDefault(APACHE_STOP_PREF, "-k shutdown");
+//                     // store.setDefault(APACHE_RESTART_PREF, "-k restart");
+//                     // store.setDefault(MYSQL_START_BACKGROUND, "true");
+//                     // store.setDefault(APACHE_START_BACKGROUND, "true");
+//                     // store.setDefault(APACHE_STOP_BACKGROUND, "true");
+//                     // store.setDefault(APACHE_RESTART_BACKGROUND, "true");
+//             }
+//
+//             // php syntax highlighting
+//             store.setDefault(PHP_USERDEF_XMLFILE, "");
+//             PreferenceConverter.setDefault(store, PHP_TAG, PHPColorProvider.TAG);
+//             PreferenceConverter.setDefault(store, PHP_KEYWORD,
+//                             PHPColorProvider.KEYWORD);
+//             PreferenceConverter.setDefault(store, PHP_VARIABLE,
+//                             PHPColorProvider.VARIABLE);
+//             PreferenceConverter.setDefault(store, PHP_VARIABLE_DOLLAR,
+//                             PHPColorProvider.VARIABLE);
+//             PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME,
+//                             PHPColorProvider.FUNCTION_NAME);
+//             PreferenceConverter.setDefault(store, PHP_CONSTANT,
+//                             PHPColorProvider.CONSTANT);
+//             PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
+//             PreferenceConverter.setDefault(store, PHP_DEFAULT,
+//                             PHPColorProvider.DEFAULT);
+//             PreferenceConverter.setDefault(store, PHPDOC_KEYWORD,
+//                             PHPColorProvider.PHPDOC_KEYWORD);
+//             PreferenceConverter.setDefault(store, PHPDOC_TAG,
+//                             PHPColorProvider.PHPDOC_TAG);
+//             PreferenceConverter.setDefault(store, PHPDOC_LINK,
+//                             PHPColorProvider.PHPDOC_LINK);
+//             PreferenceConverter.setDefault(store, PHPDOC_DEFAULT,
+//                             PHPColorProvider.PHPDOC_DEFAULT);
+//
+//             PreferenceConverter.setDefault(store, EDITOR_PHP_KEYWORD_RETURN_COLOR,
+//                             new RGB(127, 0, 85));
+//             store.setDefault(EDITOR_PHP_KEYWORD_RETURN_BOLD, true);
+//             store.setDefault(EDITOR_PHP_KEYWORD_RETURN_ITALIC, false);
+//
+//             PreferenceConverter.setDefault(store, EDITOR_PHP_OPERATOR_COLOR,
+//                             new RGB(0, 0, 0));
+//             store.setDefault(EDITOR_PHP_OPERATOR_BOLD, false);
+//             store.setDefault(EDITOR_PHP_OPERATOR_ITALIC, false);
+//
+//             PreferenceConverter.setDefault(store, EDITOR_PHP_BRACE_OPERATOR_COLOR,
+//                             new RGB(0, 0, 0));
+//             store.setDefault(EDITOR_PHP_BRACE_OPERATOR_BOLD, false);
+//             store.setDefault(EDITOR_PHP_BRACE_OPERATOR_ITALIC, false);
+//
+//             // this will initialize the static fields in the syntaxrdr class
+//             new PHPSyntaxRdr();
+//             JavaCore.initializeDefaultPluginPreferences();
+//             PreferenceConstants.initializeDefaultValues(store);
+//             // externalTools.initializeDefaultPreferences(store);
+//             // MarkerAnnotationPreferences.initializeDefaultValues(store);
+//     }
+//
+//     private IWorkbenchPage internalGetActivePage() {
+//             IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
+//             if (window != null)
+//                     return window.getActivePage();
+//             return null;
+//     }
+//
+//     private ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
+//             if (fImageDescriptorRegistry == null)
+//                     fImageDescriptorRegistry = new ImageDescriptorRegistry();
+//             return fImageDescriptorRegistry;
+//     }
 
        /**
         * Open a file in the Workbench that may or may not exist in the workspace.
@@ -817,49 +821,49 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @param filename
         * @throws CoreException
         */
-       public ITextEditor openFileInTextEditor(String filename)
-                       throws CoreException {
-               // reject directories
-               if (new File(filename).isDirectory())
-                       return null;
-               IWorkbench workbench = PlatformUI.getWorkbench();
-               IWorkbenchWindow window = workbench.getWorkbenchWindows()[0];
-               IWorkbenchPage page = window.getActivePage();
-               IPath path = new Path(filename);
-               // If the file exists in the workspace, open it
-               IFile file = getWorkspace().getRoot().getFile(path);
-               IEditorPart editor;
-               ITextEditor textEditor;
-               if (file != null && file.exists()) {
-                       editor = IDE.openEditor(page, file, true);
-                       textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-               } else {
-                       // Otherwise open the stream directly
-                       if (page == null)
-                               return null;
-                       FileStorage storage = new FileStorage(path);
-                       IEditorRegistry registry = getWorkbench().getEditorRegistry();
-                       IEditorDescriptor desc = registry.getDefaultEditor(filename);
-                       if (desc == null) {
-                               desc = registry
-                                               .findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
-                               // desc = registry.getDefaultEditor();
-                       }
-                       IEditorInput input = new ExternalEditorInput(storage);
-                       editor = page.openEditor(input, desc.getId());
-                       textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-                       // If the storage provider is not ours, we can't guarantee
-                       // read/write.
-                       if (textEditor != null) {
-                               IDocumentProvider documentProvider = textEditor
-                                               .getDocumentProvider();
-                               if (!(documentProvider instanceof ExternalStorageDocumentProvider)) {
-                                       storage.setReadOnly();
-                               }
-                       }
-               }
-               return textEditor;
-       }
+//     public ITextEditor openFileInTextEditor(String filename)
+//                     throws CoreException {
+//             // reject directories
+//             if (new File(filename).isDirectory())
+//                     return null;
+//             IWorkbench workbench = PlatformUI.getWorkbench();
+//             IWorkbenchWindow window = workbench.getWorkbenchWindows()[0];
+//             IWorkbenchPage page = window.getActivePage();
+//             IPath path = new Path(filename);
+//             // If the file exists in the workspace, open it
+//             IFile file = getWorkspace().getRoot().getFile(path);
+//             IEditorPart editor;
+//             ITextEditor textEditor;
+//             if (file != null && file.exists()) {
+//                     editor = IDE.openEditor(page, file, true);
+//                     textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
+//             } else {
+//                     // Otherwise open the stream directly
+//                     if (page == null)
+//                             return null;
+//                     FileStorage storage = new FileStorage(path);
+//                     IEditorRegistry registry = getWorkbench().getEditorRegistry();
+//                     IEditorDescriptor desc = registry.getDefaultEditor(filename);
+//                     if (desc == null) {
+//                             desc = registry
+//                                             .findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
+//                             // desc = registry.getDefaultEditor();
+//                     }
+//                     IEditorInput input = new ExternalEditorInput(storage);
+//                     editor = page.openEditor(input, desc.getId());
+//                     textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
+//                     // If the storage provider is not ours, we can't guarantee
+//                     // read/write.
+//                     if (textEditor != null) {
+//                             IDocumentProvider documentProvider = textEditor
+//                                             .getDocumentProvider();
+//                             if (!(documentProvider instanceof ExternalStorageDocumentProvider)) {
+//                                     storage.setReadOnly();
+//                             }
+//                     }
+//             }
+//             return textEditor;
+//     }
 
        /**
         * Open a file in the Workbench that may or may not exist in the workspace.
@@ -869,24 +873,24 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @param line
         * @throws CoreException
         */
-       public void openFileAndGotoLine(String filename, int line)
-                       throws CoreException {
-               ITextEditor textEditor = openFileInTextEditor(filename);
-               if (textEditor != null) {
-                       // If a line number was given, go to it
-                       if (line > 0) {
-                               try {
-                                       line--; // document is 0 based
-                                       IDocument document = textEditor.getDocumentProvider()
-                                                       .getDocument(textEditor.getEditorInput());
-                                       textEditor.selectAndReveal(document.getLineOffset(line),
-                                                       document.getLineLength(line));
-                               } catch (BadLocationException e) {
-                                       // invalid text position -> do nothing
-                               }
-                       }
-               }
-       }
+//     public void openFileAndGotoLine(String filename, int line)
+//                     throws CoreException {
+//             ITextEditor textEditor = openFileInTextEditor(filename);
+//             if (textEditor != null) {
+//                     // If a line number was given, go to it
+//                     if (line > 0) {
+//                             try {
+//                                     line--; // document is 0 based
+//                                     IDocument document = textEditor.getDocumentProvider()
+//                                                     .getDocument(textEditor.getEditorInput());
+//                                     textEditor.selectAndReveal(document.getLineOffset(line),
+//                                                     document.getLineLength(line));
+//                             } catch (BadLocationException e) {
+//                                     // invalid text position -> do nothing
+//                             }
+//                     }
+//             }
+//     }
 
        /**
         * Open a file in the Workbench that may or may not exist in the workspace.
@@ -896,37 +900,37 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @param offset
         * @throws CoreException
         */
-       public void openFileAndGotoOffset(String filename, int offset, int length)
-                       throws CoreException {
-               ITextEditor textEditor = openFileInTextEditor(filename);
-               if (textEditor != null) {
-                       // If a line number was given, go to it
-                       if (offset >= 0) {
-                               IDocument document = textEditor.getDocumentProvider()
-                                               .getDocument(textEditor.getEditorInput());
-                               textEditor.selectAndReveal(offset, length);
-                       }
-               }
-       }
-
-       public void openFileAndFindString(String filename, String findString)
-                       throws CoreException {
-               ITextEditor textEditor = openFileInTextEditor(filename);
-               if (textEditor != null) {
-                       // If a string was given, go to it
-                       if (findString != null) {
-                               try {
-                                       IDocument document = textEditor.getDocumentProvider()
-                                                       .getDocument(textEditor.getEditorInput());
-                                       int offset = document.search(0, findString, true, false,
-                                                       true);
-                                       textEditor.selectAndReveal(offset, findString.length());
-                               } catch (BadLocationException e) {
-                                       // invalid text position -> do nothing
-                               }
-                       }
-               }
-       }
+//     public void openFileAndGotoOffset(String filename, int offset, int length)
+//                     throws CoreException {
+//             ITextEditor textEditor = openFileInTextEditor(filename);
+//             if (textEditor != null) {
+//                     // If a line number was given, go to it
+//                     if (offset >= 0) {
+//                             IDocument document = textEditor.getDocumentProvider()
+//                                             .getDocument(textEditor.getEditorInput());
+//                             textEditor.selectAndReveal(offset, length);
+//                     }
+//             }
+//     }
+//
+//     public void openFileAndFindString(String filename, String findString)
+//                     throws CoreException {
+//             ITextEditor textEditor = openFileInTextEditor(filename);
+//             if (textEditor != null) {
+//                     // If a string was given, go to it
+//                     if (findString != null) {
+//                             try {
+//                                     IDocument document = textEditor.getDocumentProvider()
+//                                                     .getDocument(textEditor.getEditorInput());
+//                                     int offset = document.search(0, findString, true, false,
+//                                                     true);
+//                                     textEditor.selectAndReveal(offset, findString.length());
+//                             } catch (BadLocationException e) {
+//                                     // invalid text position -> do nothing
+//                             }
+//                     }
+//             }
+//     }
 
        public void setLastEditorFile(IFile textEditor) {
                this.fLastEditorFile = textEditor;
@@ -935,243 +939,243 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
        /*
         * @see org.eclipse.core.runtime.Plugin#stop
         */
-       public void stop(BundleContext context) throws Exception {
-               try {
-                       // JavaCore.stop(this, context);
-                       plugin.savePluginPreferences();
-                       IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                       workspace.removeResourceChangeListener(JavaModelManager
-                                       .getJavaModelManager().deltaState);
-                       workspace.removeSaveParticipant(plugin);
-
-                       JavaModelManager.getJavaModelManager().shutdown();
-
-                       // save the information from the php index files if necessary
-                       Collection collection = fIndexManagerMap.values();
-                       Iterator iterator = collection.iterator();
-                       IdentifierIndexManager indexManager = null;
-                       while (iterator.hasNext()) {
-                               indexManager = (IdentifierIndexManager) iterator.next();
-                               indexManager.writeFile();
-                       }
-                       if (fImageDescriptorRegistry != null)
-                               fImageDescriptorRegistry.dispose();
-
-                       // AllTypesCache.terminate();
-
-                       if (fImageDescriptorRegistry != null)
-                               fImageDescriptorRegistry.dispose();
-
-                       unregisterAdapters();
-
-                       // if (fASTProvider != null) {
-                       // fASTProvider.dispose();
-                       // fASTProvider= null;
-                       // }
-
-                       if (fWorkingCopyManager != null) {
-                               fWorkingCopyManager.shutdown();
-                               fWorkingCopyManager = null;
-                       }
-
-                       if (fCompilationUnitDocumentProvider != null) {
-                               fCompilationUnitDocumentProvider.shutdown();
-                               fCompilationUnitDocumentProvider = null;
-                       }
-
-                       if (fJavaTextTools != null) {
-                               fJavaTextTools.dispose();
-                               fJavaTextTools = null;
-                       }
-                       // JavaDocLocations.shutdownJavadocLocations();
-
-                       uninstallPreferenceStoreBackwardsCompatibility();
-
-                       // RefactoringCore.getUndoManager().shutdown();
-               } finally {
-                       super.stop(context);
-               }
-       }
+//     public void stop(BundleContext context) throws Exception {
+//             try {
+//                     // JavaCore.stop(this, context);
+//                     plugin.savePluginPreferences();
+//                     IWorkspace workspace = ResourcesPlugin.getWorkspace();
+//                     workspace.removeResourceChangeListener(JavaModelManager
+//                                     .getJavaModelManager().deltaState);
+//                     workspace.removeSaveParticipant(plugin);
+//
+//                     JavaModelManager.getJavaModelManager().shutdown();
+//
+//                     // save the information from the php index files if necessary
+//                     Collection collection = fIndexManagerMap.values();
+//                     Iterator iterator = collection.iterator();
+//                     IdentifierIndexManager indexManager = null;
+//                     while (iterator.hasNext()) {
+//                             indexManager = (IdentifierIndexManager) iterator.next();
+//                             indexManager.writeFile();
+//                     }
+//                     if (fImageDescriptorRegistry != null)
+//                             fImageDescriptorRegistry.dispose();
+//
+//                     // AllTypesCache.terminate();
+//
+//                     if (fImageDescriptorRegistry != null)
+//                             fImageDescriptorRegistry.dispose();
+//
+//                     unregisterAdapters();
+//
+//                     // if (fASTProvider != null) {
+//                     // fASTProvider.dispose();
+//                     // fASTProvider= null;
+//                     // }
+//
+//                     if (fWorkingCopyManager != null) {
+//                             fWorkingCopyManager.shutdown();
+//                             fWorkingCopyManager = null;
+//                     }
+//
+//                     if (fCompilationUnitDocumentProvider != null) {
+//                             fCompilationUnitDocumentProvider.shutdown();
+//                             fCompilationUnitDocumentProvider = null;
+//                     }
+//
+//                     if (fJavaTextTools != null) {
+//                             fJavaTextTools.dispose();
+//                             fJavaTextTools = null;
+//                     }
+//                     // JavaDocLocations.shutdownJavadocLocations();
+//
+//                     uninstallPreferenceStoreBackwardsCompatibility();
+//
+//                     // RefactoringCore.getUndoManager().shutdown();
+//             } finally {
+//                     super.stop(context);
+//             }
+//     }
 
        /**
         * Installs backwards compatibility for the preference store.
         */
-       private void installPreferenceStoreBackwardsCompatibility() {
-
-               /*
-                * Installs backwards compatibility: propagate the Java editor font from
-                * a pre-2.1 plug-in to the Platform UI's preference store to preserve
-                * the Java editor font from a pre-2.1 workspace. This is done only
-                * once.
-                */
-               String fontPropagatedKey = "fontPropagated"; //$NON-NLS-1$
-               if (getPreferenceStore().contains(JFaceResources.TEXT_FONT)
-                               && !getPreferenceStore().isDefault(JFaceResources.TEXT_FONT)) {
-                       if (!getPreferenceStore().getBoolean(fontPropagatedKey))
-                               PreferenceConverter
-                                               .setValue(PlatformUI.getWorkbench()
-                                                               .getPreferenceStore(),
-                                                               PreferenceConstants.EDITOR_TEXT_FONT,
-                                                               PreferenceConverter.getFontDataArray(
-                                                                               getPreferenceStore(),
-                                                                               JFaceResources.TEXT_FONT));
-               }
-               getPreferenceStore().setValue(fontPropagatedKey, true);
-
-               /*
-                * Backwards compatibility: set the Java editor font in this plug-in's
-                * preference store to let older versions access it. Since 2.1 the Java
-                * editor font is managed by the workbench font preference page.
-                */
-               PreferenceConverter.putValue(getPreferenceStore(),
-                               JFaceResources.TEXT_FONT, JFaceResources.getFontRegistry()
-                                               .getFontData(PreferenceConstants.EDITOR_TEXT_FONT));
-
-               fFontPropertyChangeListener = new IPropertyChangeListener() {
-                       public void propertyChange(PropertyChangeEvent event) {
-                               if (PreferenceConstants.EDITOR_TEXT_FONT.equals(event
-                                               .getProperty()))
-                                       PreferenceConverter.putValue(getPreferenceStore(),
-                                                       JFaceResources.TEXT_FONT,
-                                                       JFaceResources.getFontRegistry().getFontData(
-                                                                       PreferenceConstants.EDITOR_TEXT_FONT));
-                       }
-               };
-               JFaceResources.getFontRegistry().addListener(
-                               fFontPropertyChangeListener);
-       }
+//     private void installPreferenceStoreBackwardsCompatibility() {
+//
+//             /*
+//              * Installs backwards compatibility: propagate the Java editor font from
+//              * a pre-2.1 plug-in to the Platform UI's preference store to preserve
+//              * the Java editor font from a pre-2.1 workspace. This is done only
+//              * once.
+//              */
+//             String fontPropagatedKey = "fontPropagated"; //$NON-NLS-1$
+//             if (getPreferenceStore().contains(JFaceResources.TEXT_FONT)
+//                             && !getPreferenceStore().isDefault(JFaceResources.TEXT_FONT)) {
+//                     if (!getPreferenceStore().getBoolean(fontPropagatedKey))
+//                             PreferenceConverter
+//                                             .setValue(PlatformUI.getWorkbench()
+//                                                             .getPreferenceStore(),
+//                                                             PreferenceConstants.EDITOR_TEXT_FONT,
+//                                                             PreferenceConverter.getFontDataArray(
+//                                                                             getPreferenceStore(),
+//                                                                             JFaceResources.TEXT_FONT));
+//             }
+//             getPreferenceStore().setValue(fontPropagatedKey, true);
+//
+//             /*
+//              * Backwards compatibility: set the Java editor font in this plug-in's
+//              * preference store to let older versions access it. Since 2.1 the Java
+//              * editor font is managed by the workbench font preference page.
+//              */
+//             PreferenceConverter.putValue(getPreferenceStore(),
+//                             JFaceResources.TEXT_FONT, JFaceResources.getFontRegistry()
+//                                             .getFontData(PreferenceConstants.EDITOR_TEXT_FONT));
+//
+//             fFontPropertyChangeListener = new IPropertyChangeListener() {
+//                     public void propertyChange(PropertyChangeEvent event) {
+//                             if (PreferenceConstants.EDITOR_TEXT_FONT.equals(event
+//                                             .getProperty()))
+//                                     PreferenceConverter.putValue(getPreferenceStore(),
+//                                                     JFaceResources.TEXT_FONT,
+//                                                     JFaceResources.getFontRegistry().getFontData(
+//                                                                     PreferenceConstants.EDITOR_TEXT_FONT));
+//                     }
+//             };
+//             JFaceResources.getFontRegistry().addListener(
+//                             fFontPropertyChangeListener);
+//     }
 
        /**
         * Uninstalls backwards compatibility for the preference store.
         */
-       private void uninstallPreferenceStoreBackwardsCompatibility() {
-               JFaceResources.getFontRegistry().removeListener(
-                               fFontPropertyChangeListener);
-               // getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener);
-       }
+//     private void uninstallPreferenceStoreBackwardsCompatibility() {
+//             JFaceResources.getFontRegistry().removeListener(
+//                             fFontPropertyChangeListener);
+//             // getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener);
+//     }
 
        /*
         * (non - Javadoc) Method declared in Plugin
         */
-       public void start(BundleContext context) throws Exception {
-               super.start(context);
-
-               // JavaCore.start(this, context);
-               final JavaModelManager modelManager = JavaModelManager
-                               .getJavaModelManager();
-               try {
-                       modelManager.configurePluginDebugOptions();
-
-                       // request state folder creation (workaround 19885)
-                       getStateLocation();
-                       // retrieve variable values
-                       PHPeclipsePlugin.getDefault().getPluginPreferences()
-                                       .addPropertyChangeListener(
-                                                       new JavaModelManager.PluginPreferencesListener());
-                       // manager.loadVariablesAndContainers();
-
-                       final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                       workspace.addResourceChangeListener(modelManager.deltaState,
-                                       IResourceChangeEvent.PRE_BUILD
-                                                       | IResourceChangeEvent.POST_BUILD
-                                                       | IResourceChangeEvent.POST_CHANGE
-                                                       | IResourceChangeEvent.PRE_DELETE
-                                                       | IResourceChangeEvent.PRE_CLOSE);
-
-                       ISavedState savedState = workspace.addSaveParticipant(
-                                       PHPeclipsePlugin.this, modelManager);
-
-                       // process deltas since last activated in indexer thread so that
-                       // indexes are up-to-date.
-                       // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38658
-// This causes timeout at EclipseLazyStarter
-//                     Job processSavedState = new Job(Util.bind("savedState.jobName")) { //$NON-NLS-1$
-//                             protected IStatus run(IProgressMonitor monitor) {
-//                                     try {
-//                                             // add save participant and process delta atomically
-//                                             // see
-//                                             // https://bugs.eclipse.org/bugs/show_bug.cgi?id=59937
-//                                             workspace.run(new IWorkspaceRunnable() {
-//                                                     public void run(IProgressMonitor progress)
-//                                                                     throws CoreException {
-//                                                             ISavedState savedState = workspace
-//                                                                             .addSaveParticipant(
-//                                                                                             PHPeclipsePlugin.this,
-//                                                                                             modelManager);
-//                                                             if (savedState != null) {
-//                                                                     // the event type coming from the saved
-//                                                                     // state is always POST_AUTO_BUILD
-//                                                                     // force it to be POST_CHANGE so that the
-//                                                                     // delta processor can handle it
-//                                                                     modelManager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE;
-//                                                                     savedState
-//                                                                                     .processResourceChangeEvents(modelManager.deltaState);
-//                                                             }
-//                                                     }
-//                                             }, monitor);
-//                                     } catch (CoreException e) {
-//                                             return e.getStatus();
+//     public void start(BundleContext context) throws Exception {
+//             super.start(context);
+//
+//             // JavaCore.start(this, context);
+//             final JavaModelManager modelManager = JavaModelManager
+//                             .getJavaModelManager();
+//             try {
+//                     modelManager.configurePluginDebugOptions();
+//
+//                     // request state folder creation (workaround 19885)
+//                     getStateLocation();
+//                     // retrieve variable values
+//                     PHPeclipsePlugin.getDefault().getPluginPreferences()
+//                                     .addPropertyChangeListener(
+//                                                     new JavaModelManager.PluginPreferencesListener());
+//                     // manager.loadVariablesAndContainers();
+//
+//                     final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+//                     workspace.addResourceChangeListener(modelManager.deltaState,
+//                                     IResourceChangeEvent.PRE_BUILD
+//                                                     | IResourceChangeEvent.POST_BUILD
+//                                                     | IResourceChangeEvent.POST_CHANGE
+//                                                     | IResourceChangeEvent.PRE_DELETE
+//                                                     | IResourceChangeEvent.PRE_CLOSE);
+//
+//                     ISavedState savedState = workspace.addSaveParticipant(
+//                                     PHPeclipsePlugin.this, modelManager);
+//
+//                     // process deltas since last activated in indexer thread so that
+//                     // indexes are up-to-date.
+//                     // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38658
+//// This causes timeout at EclipseLazyStarter
+////                   Job processSavedState = new Job(Util.bind("savedState.jobName")) { //$NON-NLS-1$
+////                           protected IStatus run(IProgressMonitor monitor) {
+////                                   try {
+////                                           // add save participant and process delta atomically
+////                                           // see
+////                                           // https://bugs.eclipse.org/bugs/show_bug.cgi?id=59937
+////                                           workspace.run(new IWorkspaceRunnable() {
+////                                                   public void run(IProgressMonitor progress)
+////                                                                   throws CoreException {
+////                                                           ISavedState savedState = workspace
+////                                                                           .addSaveParticipant(
+////                                                                                           PHPeclipsePlugin.this,
+////                                                                                           modelManager);
+////                                                           if (savedState != null) {
+////                                                                   // the event type coming from the saved
+////                                                                   // state is always POST_AUTO_BUILD
+////                                                                   // force it to be POST_CHANGE so that the
+////                                                                   // delta processor can handle it
+////                                                                   modelManager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE;
+////                                                                   savedState
+////                                                                                   .processResourceChangeEvents(modelManager.deltaState);
+////                                                           }
+////                                                   }
+////                                           }, monitor);
+////                                   } catch (CoreException e) {
+////                                           return e.getStatus();
+////                                   }
+////                                   return Status.OK_STATUS;
+////                           }
+////                   };
+//// Replace Job + IWorkspace.run() to WorkspaceJob
+//                     WorkspaceJob processSavedState = new WorkspaceJob(
+//                                     Util.bind("savedState.jobName")) { //$NON-NLS-1$
+//                             public IStatus runInWorkspace(IProgressMonitor monitor)
+//                                             throws CoreException {
+//                                     ISavedState savedState = workspace.addSaveParticipant(
+//                                                     PHPeclipsePlugin.this, modelManager);
+//                                     if (savedState != null) {
+//                                             modelManager.deltaState.getDeltaProcessor().overridenEventType
+//                                                             = IResourceChangeEvent.POST_CHANGE;
+//                                             savedState.processResourceChangeEvents(modelManager.deltaState);
 //                                     }
 //                                     return Status.OK_STATUS;
 //                             }
 //                     };
-// Replace Job + IWorkspace.run() to WorkspaceJob
-                       WorkspaceJob processSavedState = new WorkspaceJob(
-                                       Util.bind("savedState.jobName")) { //$NON-NLS-1$
-                               public IStatus runInWorkspace(IProgressMonitor monitor)
-                                               throws CoreException {
-                                       ISavedState savedState = workspace.addSaveParticipant(
-                                                       PHPeclipsePlugin.this, modelManager);
-                                       if (savedState != null) {
-                                               modelManager.deltaState.getDeltaProcessor().overridenEventType
-                                                               = IResourceChangeEvent.POST_CHANGE;
-                                               savedState.processResourceChangeEvents(modelManager.deltaState);
-                                       }
-                                       return Status.OK_STATUS;
-                               }
-                       };
-                       processSavedState.setSystem(true);
-                       processSavedState.setPriority(Job.SHORT); // process asap
-                       processSavedState.schedule();
-               } catch (RuntimeException e) {
-                       modelManager.shutdown();
-                       throw e;
-               }
-
-               registerAdapters();
-
-               // if (USE_WORKING_COPY_OWNERS) {
-               WorkingCopyOwner.setPrimaryBufferProvider(new WorkingCopyOwner() {
-                       public IBuffer createBuffer(ICompilationUnit workingCopy) {
-                               ICompilationUnit original = workingCopy.getPrimary();
-                               IResource resource = original.getResource();
-                               if (resource instanceof IFile)
-                                       return new DocumentAdapter(workingCopy, (IFile) resource);
-                               return DocumentAdapter.NULL;
-                       }
-               });
-               // }
-
-               installPreferenceStoreBackwardsCompatibility();
-
-       }
-
-       private void registerAdapters() {
-               fJavaElementAdapterFactory = new JavaElementAdapterFactory();
-               fResourceAdapterFactory = new ResourceAdapterFactory();
-
-               IAdapterManager manager = Platform.getAdapterManager();
-               manager
-                               .registerAdapters(fJavaElementAdapterFactory,
-                                               IJavaElement.class);
-               manager.registerAdapters(fResourceAdapterFactory, IResource.class);
-       }
-
-       private void unregisterAdapters() {
-               IAdapterManager manager = Platform.getAdapterManager();
-               manager.unregisterAdapters(fJavaElementAdapterFactory);
-               manager.unregisterAdapters(fResourceAdapterFactory);
-       }
+//                     processSavedState.setSystem(true);
+//                     processSavedState.setPriority(Job.SHORT); // process asap
+//                     processSavedState.schedule();
+//             } catch (RuntimeException e) {
+//                     modelManager.shutdown();
+//                     throw e;
+//             }
+//
+//             registerAdapters();
+//
+//             // if (USE_WORKING_COPY_OWNERS) {
+//             WorkingCopyOwner.setPrimaryBufferProvider(new WorkingCopyOwner() {
+//                     public IBuffer createBuffer(ICompilationUnit workingCopy) {
+//                             ICompilationUnit original = workingCopy.getPrimary();
+//                             IResource resource = original.getResource();
+//                             if (resource instanceof IFile)
+//                                     return new DocumentAdapter(workingCopy, (IFile) resource);
+//                             return DocumentAdapter.NULL;
+//                     }
+//             });
+//             // }
+//
+//             installPreferenceStoreBackwardsCompatibility();
+//
+//     }
+//
+//     private void registerAdapters() {
+//             fJavaElementAdapterFactory = new JavaElementAdapterFactory();
+//             fResourceAdapterFactory = new ResourceAdapterFactory();
+//
+//             IAdapterManager manager = Platform.getAdapterManager();
+//             manager
+//                             .registerAdapters(fJavaElementAdapterFactory,
+//                                             IJavaElement.class);
+//             manager.registerAdapters(fResourceAdapterFactory, IResource.class);
+//     }
+
+//     private void unregisterAdapters() {
+//             IAdapterManager manager = Platform.getAdapterManager();
+//             manager.unregisterAdapters(fJavaElementAdapterFactory);
+//             manager.unregisterAdapters(fResourceAdapterFactory);
+//     }
 
        /**
         * Returns a combined preference store, this store is read-only.
@@ -1180,19 +1184,19 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * 
         * @since 3.0
         */
-       public IPreferenceStore getCombinedPreferenceStore() {
-               if (fCombinedPreferenceStore == null) {
-                       IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore();
-                       fCombinedPreferenceStore = new ChainedPreferenceStore(
-                                       new IPreferenceStore[] {
-                                                       getPreferenceStore(),
-                                                       new PreferencesAdapter(PHPeclipsePlugin
-                                                                       .getDefault().getPluginPreferences()),
-                                                       generalTextStore });
-               }
-               return fCombinedPreferenceStore;
-       }
-
+//     public IPreferenceStore getCombinedPreferenceStore() {
+//             if (fCombinedPreferenceStore == null) {
+//                     IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore();
+//                     fCombinedPreferenceStore = new ChainedPreferenceStore(
+//                                     new IPreferenceStore[] {
+//                                                     getPreferenceStore(),
+//                                                     new PreferencesAdapter(PHPeclipsePlugin
+//                                                                     .getDefault().getPluginPreferences()),
+//                                                     generalTextStore });
+//             }
+//             return fCombinedPreferenceStore;
+//     }
+//
        public synchronized IBufferFactory getBufferFactory() {
                if (fBufferFactory == null)
                        fBufferFactory = new CustomBufferFactory();
@@ -1208,11 +1212,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         *         <code>IJavaFoldingStructureProvider</code>
         * @since 3.0
         */
-       public synchronized JavaFoldingStructureProviderRegistry getFoldingStructureProviderRegistry() {
-               if (fFoldingStructureProviderRegistry == null)
-                       fFoldingStructureProviderRegistry = new JavaFoldingStructureProviderRegistry();
-               return fFoldingStructureProviderRegistry;
-       }
+//     public synchronized JavaFoldingStructureProviderRegistry getFoldingStructureProviderRegistry() {
+//             if (fFoldingStructureProviderRegistry == null)
+//                     fFoldingStructureProviderRegistry = new JavaFoldingStructureProviderRegistry();
+//             return fFoldingStructureProviderRegistry;
+//     }
 
        /**
         * Runs the given action as an atomic Java model operation.
@@ -1305,17 +1309,17 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @return the template context type registry for the java plugin
         * @since 3.0
         */
-       public ContextTypeRegistry getTemplateContextRegistry() {
-               if (fContextTypeRegistry == null) {
-                       fContextTypeRegistry = new ContributionContextTypeRegistry();
-
-                       fContextTypeRegistry.addContextType(new JavaContextType());
-                       fContextTypeRegistry.addContextType(new JavaDocContextType());
-                       fContextTypeRegistry.addContextType(new HTMLContextType());
-               }
-
-               return fContextTypeRegistry;
-       }
+//     public ContextTypeRegistry getTemplateContextRegistry() {
+//             if (fContextTypeRegistry == null) {
+//                     fContextTypeRegistry = new ContributionContextTypeRegistry();
+//
+//                     fContextTypeRegistry.addContextType(new JavaContextType());
+//                     fContextTypeRegistry.addContextType(new JavaDocContextType());
+//                     fContextTypeRegistry.addContextType(new HTMLContextType());
+//             }
+//
+//             return fContextTypeRegistry;
+//     }
 
        /**
         * Returns the template store for the java editor templates.
@@ -1323,20 +1327,20 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @return the template store for the java editor templates
         * @since 3.0
         */
-       public TemplateStore getTemplateStore() {
-               if (fTemplateStore == null) {
-                       fTemplateStore = new ContributionTemplateStore(
-                                       getTemplateContextRegistry(), getPreferenceStore(),
-                                       TEMPLATES_KEY);
-                       try {
-                               fTemplateStore.load();
-                       } catch (IOException e) {
-                               log(e);
-                       }
-               }
-
-               return fTemplateStore;
-       }
+//     public TemplateStore getTemplateStore() {
+//             if (fTemplateStore == null) {
+//                     fTemplateStore = new ContributionTemplateStore(
+//                                     getTemplateContextRegistry(), getPreferenceStore(),
+//                                     TEMPLATES_KEY);
+//                     try {
+//                             fTemplateStore.load();
+//                     } catch (IOException e) {
+//                             log(e);
+//                     }
+//             }
+//
+//             return fTemplateStore;
+//     }
 
        /**
         * Returns the template context type registry for the code generation
@@ -1346,16 +1350,16 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         *         templates
         * @since 3.0
         */
-       public ContextTypeRegistry getCodeTemplateContextRegistry() {
-               if (fCodeTemplateContextTypeRegistry == null) {
-                       fCodeTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
-
-                       CodeTemplateContextType
-                                       .registerContextTypes(fCodeTemplateContextTypeRegistry);
-               }
-
-               return fCodeTemplateContextTypeRegistry;
-       }
+//     public ContextTypeRegistry getCodeTemplateContextRegistry() {
+//             if (fCodeTemplateContextTypeRegistry == null) {
+//                     fCodeTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
+//
+//                     CodeTemplateContextType
+//                                     .registerContextTypes(fCodeTemplateContextTypeRegistry);
+//             }
+//
+//             return fCodeTemplateContextTypeRegistry;
+//     }
 
        /**
         * Returns the template store for the code generation templates.
@@ -1363,18 +1367,18 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         * @return the template store for the code generation templates
         * @since 3.0
         */
-       public TemplateStore getCodeTemplateStore() {
-               if (fCodeTemplateStore == null) {
-                       fCodeTemplateStore = new ContributionTemplateStore(
-                                       getCodeTemplateContextRegistry(), getPreferenceStore(),
-                                       CODE_TEMPLATES_KEY);
-                       try {
-                               fCodeTemplateStore.load();
-                       } catch (IOException e) {
-                               log(e);
-                       }
-               }
-
-               return fCodeTemplateStore;
-       }
+//     public TemplateStore getCodeTemplateStore() {
+//             if (fCodeTemplateStore == null) {
+//                     fCodeTemplateStore = new ContributionTemplateStore(
+//                                     getCodeTemplateContextRegistry(), getPreferenceStore(),
+//                                     CODE_TEMPLATES_KEY);
+//                     try {
+//                             fCodeTemplateStore.load();
+//                     } catch (IOException e) {
+//                             log(e);
+//                     }
+//             }
+//
+//             return fCodeTemplateStore;
+//     }
 }
\ No newline at end of file
index 4bb9ac8..685ff79 100644 (file)
@@ -7,7 +7,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.sourceforge.phpdt.internal.ui.util.StreamUtil;
+import net.sourceforge.phpdt.internal.core.util.StreamUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IStorage;
index 86de9b5..fc7e3c6 100644 (file)
@@ -24,7 +24,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.obfuscator.PHPIdentifier;
+//import net.sourceforge.phpeclipse.obfuscator.PHPIdentifier;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -149,7 +149,6 @@ public class IdentifierIndexManager {
                        boolean hasModifiers = false;
                        int phpdocOffset = -1;
                        int phpdocLength = -1;
-
                        try {
                                while (fToken != TokenNameEOF && fToken != TokenNameERROR) {
                                        phpdocOffset = -1;
@@ -326,7 +325,6 @@ public class IdentifierIndexManager {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                        }
-                       
                }
 
                synchronized public void parseIdentifiers(char[] charArray,
@@ -339,7 +337,6 @@ public class IdentifierIndexManager {
                        fScanner.setSource(charArray);
                        fScanner.setPHPMode(false);
                        fToken = TokenNameEOF;
-                       
                        try {
                                getNextToken();
                                while (fToken != TokenNameEOF) { // && fToken !=
@@ -388,10 +385,6 @@ public class IdentifierIndexManager {
                                                                                        skipComments();
                                                                                }
                                                                        }       
-/*                                                                     skipComments();
-                                                                       if (fToken == TokenNameCOMMA) {
-                                                                               skipComments();
-                                                                       }*/
                                                                } while (fToken != TokenNameRPAREN );
                                                        }
                                                        parseDeclarations(null, buf, true);
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/PHPIdentifier.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/PHPIdentifier.java
new file mode 100644 (file)
index 0000000..dad6c01
--- /dev/null
@@ -0,0 +1,119 @@
+package net.sourceforge.phpeclipse.builder;
+
+/**
+ * Object which holds an PHP identifier name (i.e. class, function,
+ * variable,...)
+ * 
+ */
+public class PHPIdentifier {
+
+       public final static int CLASS = 1;
+
+       public final static int FUNCTION = 2;
+
+       public final static int VARIABLE = 3;
+
+       public final static int METHOD = 4;
+
+       public final static int DEFINE = 5;
+
+       public final static int CONSTRUCTOR = 6;
+
+       public final static int GLOBAL_VARIABLE = 7;
+
+       public final static int EXTENDS = 8;
+
+       public final static int IMPLEMENTS = 9;
+
+       private String fIdentifier;
+
+       private int fType;
+
+       public PHPIdentifier(String identifier, int type) {
+               fType = type;
+               fIdentifier = identifier;
+       }
+
+       /*
+        * (non-Javadoc)
+        * 
+        * @see java.lang.Object#equals(java.lang.Object)
+        */
+       public boolean equals(Object obj) {
+               if (!(obj instanceof PHPIdentifier)) {
+                       return false;
+               }
+               return ((PHPIdentifier) obj).fType == fType
+                               && ((PHPIdentifier) obj).fIdentifier.equals(fIdentifier);
+       }
+
+       public String getIdentifier() {
+               return fIdentifier;
+       }
+
+       public int getType() {
+               return fType;
+       }
+
+       public boolean isClass() {
+               return fType == CLASS;
+       }
+
+       public boolean isFunction() {
+               return fType == FUNCTION;
+       }
+
+       public boolean isVariable() {
+               return fType == VARIABLE;
+       }
+
+       public boolean isMethod() {
+               return fType == METHOD;
+       }
+
+       public boolean isDefine() {
+               return fType == DEFINE;
+       }
+
+       public boolean isGlobalVariable() {
+               return fType == GLOBAL_VARIABLE;
+       }
+
+       public boolean isConstructor() {
+               return fType == CONSTRUCTOR;
+       }
+
+       public void setIdentifier(String fIdentifier) {
+               this.fIdentifier = fIdentifier;
+       }
+
+       public void setType(int fType) {
+               this.fType = fType;
+       }
+
+       /*
+        * (non-Javadoc)
+        * 
+        * @see java.lang.Object#toString()
+        */
+       public String toString() {
+               switch (fType) {
+               case CLASS:
+                       return "class - ";
+               case CONSTRUCTOR:
+                       return "constructor - ";
+               case DEFINE:
+                       return "define - ";
+               case FUNCTION:
+                       return "function - ";
+               case GLOBAL_VARIABLE:
+                       return "global variable - ";
+               case METHOD:
+                       return "method - ";
+               case VARIABLE:
+                       return "variable - ";
+               }
+               return "";
+       }
+
+}
\ No newline at end of file