1) Moved net.sourceforge.phpeclipse.ui\src\net\sourceforge\phpdt back to net.sourcefo...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPeclipsePlugin.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 97c36bc..2624642 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -52,8 +52,8 @@ 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.phpeditor.DocumentAdapter;
+import net.sourceforge.phpeclipse.CustomBufferFactory;
+import net.sourceforge.phpeclipse.DocumentAdapter;
 import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
 import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
@@ -162,42 +162,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
         */
        private static final String CODE_TEMPLATES_KEY = "net.sourceforge.phpdt.ui.text.custom_code_templates"; //$NON-NLS-1$
 
-       /**
-        * The key to store whether the legacy templates have been migrated
-        * 
-        * @since 3.0
-        */
-       // private static final String TEMPLATES_MIGRATION_KEY=
-       // "net.sourceforge.phpdt.ui.text.templates_migrated"; //$NON-NLS-1$
-       /**
-        * The key to store whether the legacy code templates have been migrated
-        * 
-        * @since 3.0
-        */
-       // private static final String CODE_TEMPLATES_MIGRATION_KEY=
-       // "net.sourceforge.phpdt.ui.text.code_templates_migrated";
-       // //$NON-NLS-1$
-       // private static ExternalToolsPlugin externalTools;
-       /**
-        * The Java virtual machine that we are running on.
-        */
-       // private static int jvm;
-       // /** MRJ 2.0 */
-       // private static final int MRJ_2_0 = 0;
-       //
-       // /** MRJ 2.1 or later */
-       // private static final int MRJ_2_1 = 1;
-       //
-       // /** Java on Mac OS X 10.0 (MRJ 3.0) */
-       // private static final int MRJ_3_0 = 3;
-       //
-       // /** MRJ 3.1 */
-       // private static final int MRJ_3_1 = 4;
-       //
-       // /** JVM constant for any other platform */
-       // private static final int OTHER = -1;
-       // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID +
-       // ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
        public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID
                        + ".ui.CodingActionSet"; //$NON-NLS-1$
 
@@ -830,7 +794,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
                JavaCore.initializeDefaultPluginPreferences();
                PreferenceConstants.initializeDefaultValues(store);
                // externalTools.initializeDefaultPreferences(store);
-               MarkerAnnotationPreferences.initializeDefaultValues(store);
+               // MarkerAnnotationPreferences.initializeDefaultValues(store);
        }
 
        private IWorkbenchPage internalGetActivePage() {
@@ -863,7 +827,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
                IWorkbenchPage page = window.getActivePage();
                IPath path = new Path(filename);
                // If the file exists in the workspace, open it
-               IFile file = getWorkspace().getRoot().getFileForLocation(path);
+               IFile file = getWorkspace().getRoot().getFile(path);
                IEditorPart editor;
                ITextEditor textEditor;
                if (file != null && file.exists()) {