"net.sourceforge.phpeclipse").
*/
@@ -132,6 +131,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
//public static final String BUILDER_INDEX_ID = PLUGIN_ID + ".indexbuilder";
/** General debug flag */
+
public static final boolean DEBUG = false;
/**
@@ -140,26 +140,32 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
public final static int MAX_PROPOSALS = 200;
/**
- * The key to store customized templates.
- * @since 3.0
- */
- private static final String TEMPLATES_KEY= "net.sourceforge.phpdt.ui.text.custom_templates"; //$NON-NLS-1$
- /**
- * The key to store customized code templates.
- * @since 3.0
- */
- 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$
-
+ * The key to store customized templates.
+ *
+ * @since 3.0
+ */
+ private static final String TEMPLATES_KEY = "net.sourceforge.phpdt.ui.text.custom_templates"; //$NON-NLS-1$
+
+ /**
+ * The key to store customized code templates.
+ *
+ * @since 3.0
+ */
+ 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;
@@ -185,8 +191,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
// 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$
+ public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$
public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature";
@@ -200,28 +205,34 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
//The shared instance.
private static PHPeclipsePlugin plugin;
- /**
- * The template context type registry for the java editor.
- * @since 3.0
- */
- private ContextTypeRegistry fContextTypeRegistry;
- /**
- * The code template context type registry for the java editor.
- * @since 3.0
- */
- private ContextTypeRegistry fCodeTemplateContextTypeRegistry;
-
- /**
- * The template store for the java editor.
- * @since 3.0
- */
- private TemplateStore fTemplateStore;
- /**
- * The coded template store for the java editor.
- * @since 3.0
- */
- private TemplateStore fCodeTemplateStore;
-
+ /**
+ * The template context type registry for the java editor.
+ *
+ * @since 3.0
+ */
+ private ContextTypeRegistry fContextTypeRegistry;
+
+ /**
+ * The code template context type registry for the java editor.
+ *
+ * @since 3.0
+ */
+ private ContextTypeRegistry fCodeTemplateContextTypeRegistry;
+
+ /**
+ * The template store for the java editor.
+ *
+ * @since 3.0
+ */
+ private TemplateStore fTemplateStore;
+
+ /**
+ * The coded template store for the java editor.
+ *
+ * @since 3.0
+ */
+ private TemplateStore fCodeTemplateStore;
+
/** Windows 9x */
private static final int WINDOWS_9x = 6;
@@ -236,7 +247,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
private IBufferFactory fBufferFactory;
- private PHPDocumentProvider fCompilationUnitDocumentProvider;
+ private ICompilationUnitDocumentProvider fCompilationUnitDocumentProvider;
private JavaTextTools fJavaTextTools;
@@ -262,7 +273,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
*
* @since 3.0
*/
- private IPropertyChangeListener fPropertyChangeListener;
+// private IPropertyChangeListener fPropertyChangeListener;
/**
* The combined preference store.
@@ -272,17 +283,14 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
private IPreferenceStore fCombinedPreferenceStore;
/**
- * The extension point registry for the
- * net.sourceforge.phpdt.ui.javaFoldingStructureProvider extension
- * point.
+ * The extension point registry for the net.sourceforge.phpdt.ui.javaFoldingStructureProvider extension point.
*
* @since 3.0
*/
private JavaFoldingStructureProviderRegistry fFoldingStructureProviderRegistry;
/**
- * Mockup preference store for firing events and registering listeners on
- * project setting changes. FIXME: Temporary solution.
+ * Mockup preference store for firing events and registering listeners on project setting changes. FIXME: Temporary solution.
*
* @since 3.0
*/
@@ -325,15 +333,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
*/
public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
if (fJavaEditorTextHoverDescriptors == null) {
- fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor
- .getContributedHovers();
+ 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();
+ return ((JavaEditorTextHoverDescriptor) object).getConfigurationElement();
}
};
sorter.sort(fJavaEditorTextHoverDescriptors);
@@ -357,13 +363,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
if (first == -1)
first = i;
- if (fJavaEditorTextHoverDescriptors[i].getId().equals(
- "net.sourceforge.phpdt.ui.AnnotationHover")) { //$NON-NLS-1$
+ 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$
+ if (fJavaEditorTextHoverDescriptors[i].getId().equals("net.sourceforge.phpdt.ui.ProblemHover")) { //$NON-NLS-1$
problemHoverIndex = i;
continue;
}
@@ -391,8 +395,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
// Move Best Match hover to front
for (int i = 0; i < fJavaEditorTextHoverDescriptors.length - 1; i++) {
- if (PreferenceConstants.ID_BESTMATCH_HOVER
- .equals(fJavaEditorTextHoverDescriptors[i].getId())) {
+ if (PreferenceConstants.ID_BESTMATCH_HOVER.equals(fJavaEditorTextHoverDescriptors[i].getId())) {
hoverDescriptor = fJavaEditorTextHoverDescriptors[i];
for (int j = i; j > 0; j--)
fJavaEditorTextHoverDescriptors[j] = fJavaEditorTextHoverDescriptors[j - 1];
@@ -409,8 +412,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
/**
* Resets the Java editor text hovers contributed to the workbench.
* - * This will force a rebuild of the descriptors the next time a client asks - * for them. + * This will force a rebuild of the descriptors the next time a client asks for them. *
* * @return an array of JavaEditorTextHoverDescriptor @@ -448,9 +450,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Returns an array of all editors that have an unsaved content. If the - * identical content is presented in more than one editor, only one of those - * editor parts is part of the result. + * Returns an array of all editors that have an unsaved content. If the identical content is presented in more than one editor, + * only one of those editor parts is part of the result. * * @return an array of all dirty editor parts. */ @@ -504,9 +505,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Returns the standard display to be used. The method first checks, if the - * thread calling this method has an associated display. If so, this display - * is returned. Otherwise the method returns the default display. + * Returns the standard display to be used. The method first checks, if the 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(); @@ -561,13 +561,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } public static void log(Throwable e) { - log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, - "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$ } public static void logErrorMessage(String message) { - log(new Status(IStatus.ERROR, getPluginId(), - IJavaStatusConstants.INTERNAL_ERROR, message, null)); + log(new Status(IStatus.ERROR, getPluginId(), IJavaStatusConstants.INTERNAL_ERROR, message, null)); } private static void setJVM() { @@ -599,7 +597,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } // TODO: refactor this into a better method name ! - public synchronized PHPDocumentProvider getCompilationUnitDocumentProvider() { + public synchronized ICompilationUnitDocumentProvider getCompilationUnitDocumentProvider() { if (fCompilationUnitDocumentProvider == null) fCompilationUnitDocumentProvider = new PHPDocumentProvider(); return fCompilationUnitDocumentProvider; @@ -613,10 +611,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements * @return */ public IdentifierIndexManager getIndexManager(IProject iProject) { - String indexFilename = iProject.getLocation() + File.separator - + "project.index"; - IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap - .get(indexFilename); + String indexFilename = iProject.getLocation() + File.separator + "project.index"; + IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap.get(indexFilename); if (indexManager == null) { indexManager = new IdentifierIndexManager(indexFilename); fIndexManagerMap.put(indexFilename, indexManager); @@ -626,10 +622,10 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements public synchronized IWorkingCopyManager getWorkingCopyManager() { if (fWorkingCopyManager == null) { - PHPDocumentProvider provider = getCompilationUnitDocumentProvider(); - fWorkingCopyManager = new WorkingCopyManager(provider); - } - return fWorkingCopyManager; + ICompilationUnitDocumentProvider provider= getCompilationUnitDocumentProvider(); + fWorkingCopyManager= new WorkingCopyManager(provider); + } + return fWorkingCopyManager; } public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() { @@ -639,8 +635,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Returns the mockup preference store for firing events and registering - * listeners on project setting changes. Temporary solution. + * Returns the mockup preference store for firing events and registering listeners on project setting changes. Temporary solution. */ public MockupPreferenceStore getMockupPreferenceStore() { if (fMockupPreferenceStore == null) @@ -662,8 +657,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // } public synchronized JavaTextTools getJavaTextTools() { if (fJavaTextTools == null) - fJavaTextTools = new JavaTextTools(getPreferenceStore(), JavaCore - .getPlugin().getPluginPreferences()); + fJavaTextTools = new JavaTextTools(getPreferenceStore(), JavaCore.getPlugin().getPluginPreferences()); return fJavaTextTools; } @@ -672,8 +666,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Returns the string from the plugin's resource bundle, or 'key' if not - * found. + * Returns the string from the plugin's resource bundle, or 'key' if not found. */ // public static String getResourceString(String key) { // ResourceBundle bundle = PHPeclipsePlugin.getDefault().getResourceBundle(); @@ -694,33 +687,31 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // store.setDefault(LOCALHOST_PREF, "http://localhost"); // store.setDefault(DOCUMENTROOT_PREF, // getWorkspace().getRoot().getLocation().toString()); -// store.setDefault(PHP_LOCALHOST_PREF, "http://localhost"); -// store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot() -// .getLocation().toString()); + // store.setDefault(PHP_LOCALHOST_PREF, "http://localhost"); + // store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot() + // .getLocation().toString()); // store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true"); - store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false"); +// store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false"); store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true"); store.setDefault(PHP_OBFUSCATOR_DEFAULT, "c:\\temp"); -// store.setDefault(PHP_BOOKMARK_DEFAULT, ""); -// -// store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true"); -// store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true"); -// store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true"); + // store.setDefault(PHP_BOOKMARK_DEFAULT, ""); + // + // store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true"); + // store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true"); + // store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true"); String windowsSystem = Platform.getWS(); if (jvm == WINDOWS_9x) { - store.setDefault(EXTERNAL_BROWSER_PREF, - "command.com /c start iexplore {0}"); +// store.setDefault(EXTERNAL_BROWSER_PREF, "command.com /c start iexplore {0}"); } else if (windowsSystem.equals(Platform.WS_WIN32)) { - store.setDefault(EXTERNAL_BROWSER_PREF, - "rundll32 url.dll,FileProtocolHandler {0}"); +// store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}"); } else if (windowsSystem.equals(Platform.WS_CARBON)) { // TODO How do we start Safari on Mac OS X ? - store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}"); +// store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}"); } else { store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp"); - store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}"); +// store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}"); } // if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) { // @@ -735,6 +726,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld"); store.setDefault(APACHE_RUN_PREF, "/apache/apache"); } + store.setDefault(PHP_EXTENSION_PREFS, "php,php3,php4,php5,phtml,inc,module,class"); store.setDefault(MYSQL_PREF, "--standalone"); store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\""); store.setDefault(APACHE_STOP_PREF, "-k shutdown"); @@ -753,42 +745,32 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // php syntax highlighting store.setDefault(PHP_USERDEF_XMLFILE, ""); //assume there is none chooA - PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, - PHPColorProvider.MULTI_LINE_COMMENT); - PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, - PHPColorProvider.SINGLE_LINE_COMMENT); + PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT); + PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, PHPColorProvider.SINGLE_LINE_COMMENT); 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_FUNCTIONNAME, - PHPColorProvider.FUNCTION_NAME); - PreferenceConverter.setDefault(store, PHP_CONSTANT, - PHPColorProvider.CONSTANT); + PreferenceConverter.setDefault(store, PHP_KEYWORD, PHPColorProvider.KEYWORD); + PreferenceConverter.setDefault(store, PHP_VARIABLE, 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_STRING, PHPColorProvider.STRING); - 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)); + 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)); + 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); // PreferenceConverter.setDefault( // store, // PHP_EDITOR_BACKGROUND, @@ -829,7 +811,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // store.setDefault(RESOURCE_BUNDLE_DE, "false"); // store.setDefault(RESOURCE_BUNDLE_FR, "false"); // store.setDefault(RESOURCE_BUNDLE_ES, "false"); -// TemplatePreferencePage.initDefaults(store); + // TemplatePreferencePage.initDefaults(store); //this will initialize the static fields in the syntaxrdr class new PHPSyntaxRdr(); JavaCore.initializeDefaultPluginPreferences(); @@ -852,8 +834,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Open a file in the Workbench that may or may not exist in the workspace. - * Must be run on the UI thread. + * Open a file in the Workbench that may or may not exist in the workspace. Must be run on the UI thread. * * @param filename * @throws CoreException @@ -899,25 +880,21 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Open a file in the Workbench that may or may not exist in the workspace. - * Must be run on the UI thread. + * Open a file in the Workbench that may or may not exist in the workspace. Must be run on the UI thread. * * @param filename * @param line * @throws CoreException */ - public void openFileAndGotoLine(String filename, int 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)); + IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); + textEditor.selectAndReveal(document.getLineOffset(line), document.getLineLength(line)); } catch (BadLocationException e) { // invalid text position -> do nothing } @@ -926,35 +903,30 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Open a file in the Workbench that may or may not exist in the workspace. - * Must be run on the UI thread. + * Open a file in the Workbench that may or may not exist in the workspace. Must be run on the UI thread. * * @param filename * @param offset * @throws CoreException */ - public void openFileAndGotoOffset(String filename, int offset, int length) - 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()); + IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); textEditor.selectAndReveal(offset, length); } } } - public void openFileAndFindString(String filename, String findString) - throws CoreException { + 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()); + IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); int offset = document.search(0, findString, true, false, true); textEditor.selectAndReveal(offset, findString.length()); } catch (BadLocationException e) { @@ -976,8 +948,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // JavaCore.stop(this, context); plugin.savePluginPreferences(); IWorkspace workspace = ResourcesPlugin.getWorkspace(); - workspace.removeResourceChangeListener(JavaModelManager - .getJavaModelManager().deltaState); + workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaState); workspace.removeSaveParticipant(plugin); JavaModelManager.getJavaModelManager().shutdown(); @@ -1081,72 +1052,59 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements 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. + * 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().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)); + 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. + * 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)); + 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)); + PreferenceConverter.putValue(getPreferenceStore(), JFaceResources.TEXT_FONT, JFaceResources.getFontRegistry() + .getFontData(PreferenceConstants.EDITOR_TEXT_FONT)); } }; JFaceResources.getFontRegistry().addListener(fFontPropertyChangeListener); /* - * Backwards compatibility: propagate the Java editor tab width from a - * pre-3.0 plug-in to the new preference key. This is done only once. - */ - final String oldTabWidthKey = PreferenceConstants.EDITOR_TAB_WIDTH; - final String newTabWidthKey = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH; - String tabWidthPropagatedKey = "tabWidthPropagated"; //$NON-NLS-1$ - if (getPreferenceStore().contains(oldTabWidthKey) - && !getPreferenceStore().isDefault(oldTabWidthKey)) { - if (!getPreferenceStore().getBoolean(tabWidthPropagatedKey)) - getPreferenceStore().setValue(newTabWidthKey, - getPreferenceStore().getInt(oldTabWidthKey)); - } - getPreferenceStore().setValue(tabWidthPropagatedKey, true); - - /* - * Backwards compatibility: set the Java editor tab width in this plug-in's - * preference store with the old key to let older versions access it. Since - * 3.0 the tab width is managed by the extended texteditor and uses a new - * key. + * Backwards compatibility: propagate the Java editor tab width from a pre-3.0 plug-in to the new preference key. This is done + * only once. */ - getPreferenceStore().putValue(oldTabWidthKey, - getPreferenceStore().getString(newTabWidthKey)); - - fPropertyChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (newTabWidthKey.equals(event.getProperty())) - getPreferenceStore().putValue(oldTabWidthKey, - getPreferenceStore().getString(newTabWidthKey)); - } - }; - getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener); +// final String oldTabWidthKey = PreferenceConstants.EDITOR_TAB_WIDTH; +// final String newTabWidthKey = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH; +// String tabWidthPropagatedKey = "tabWidthPropagated"; //$NON-NLS-1$ +// if (getPreferenceStore().contains(oldTabWidthKey) && !getPreferenceStore().isDefault(oldTabWidthKey)) { +// if (!getPreferenceStore().getBoolean(tabWidthPropagatedKey)) +// getPreferenceStore().setValue(newTabWidthKey, getPreferenceStore().getInt(oldTabWidthKey)); +// } +// getPreferenceStore().setValue(tabWidthPropagatedKey, true); +// +// /* +// * Backwards compatibility: set the Java editor tab width in this plug-in's preference store with the old key to let older +// * versions access it. Since 3.0 the tab width is managed by the extended texteditor and uses a new key. +// */ +// getPreferenceStore().putValue(oldTabWidthKey, getPreferenceStore().getString(newTabWidthKey)); + +// fPropertyChangeListener = new IPropertyChangeListener() { +// public void propertyChange(PropertyChangeEvent event) { +// if (newTabWidthKey.equals(event.getProperty())) +// getPreferenceStore().putValue(oldTabWidthKey, getPreferenceStore().getString(newTabWidthKey)); +// } +// }; +// getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener); /* * Backward compatibility for the refactoring preference key. @@ -1160,9 +1118,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements * Uninstalls backwards compatibility for the preference store. */ private void uninstallPreferenceStoreBackwardsCompatibility() { - JFaceResources.getFontRegistry() - .removeListener(fFontPropertyChangeListener); - getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener); + JFaceResources.getFontRegistry().removeListener(fFontPropertyChangeListener); +// getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener); } /* @@ -1170,7 +1127,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements */ public void start(BundleContext context) throws Exception { super.start(context); - + // JavaCore.start(this, context); final JavaModelManager manager = JavaModelManager.getJavaModelManager(); try { @@ -1185,46 +1142,41 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements // manager.loadVariablesAndContainers(); final IWorkspace workspace = ResourcesPlugin.getWorkspace(); - workspace.addResourceChangeListener( - manager.deltaState, - IResourceChangeEvent.PRE_BUILD - | IResourceChangeEvent.POST_BUILD - | IResourceChangeEvent.POST_CHANGE - | IResourceChangeEvent.PRE_DELETE - | IResourceChangeEvent.PRE_CLOSE); - -// startIndexing(); - ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, manager); - - // 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 -// 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, manager); -// 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 -// manager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE; -// savedState.processResourceChangeEvents(manager.deltaState); -// } -// } -// }, -// monitor); -// } catch (CoreException e) { -// return e.getStatus(); -// } -// return Status.OK_STATUS; -// } -// }; -// processSavedState.setSystem(true); -// processSavedState.setPriority(Job.SHORT); // process asap -// processSavedState.schedule(); + workspace.addResourceChangeListener(manager.deltaState, IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_BUILD + | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE); + + // startIndexing(); + ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, manager); + + // 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 + // 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, manager); + // 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 + // manager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE; + // savedState.processResourceChangeEvents(manager.deltaState); + // } + // } + // }, + // monitor); + // } catch (CoreException e) { + // return e.getStatus(); + // } + // return Status.OK_STATUS; + // } + // }; + // processSavedState.setSystem(true); + // processSavedState.setPriority(Job.SHORT); // process asap + // processSavedState.schedule(); } catch (RuntimeException e) { manager.shutdown(); throw e; @@ -1360,11 +1312,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements public IPreferenceStore getCombinedPreferenceStore() { if (fCombinedPreferenceStore == null) { IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore(); - fCombinedPreferenceStore = new ChainedPreferenceStore( - new IPreferenceStore[] { - getPreferenceStore(), - new PreferencesAdapter(PHPeclipsePlugin.getDefault() - .getPluginPreferences()), generalTextStore }); + fCombinedPreferenceStore = new ChainedPreferenceStore(new IPreferenceStore[] { getPreferenceStore(), + new PreferencesAdapter(PHPeclipsePlugin.getDefault().getPluginPreferences()), generalTextStore }); } return fCombinedPreferenceStore; } @@ -1376,12 +1325,10 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements } /** - * Returns the registry of the extensions to the - *net.sourceforge.phpdt.ui.javaFoldingStructureProvider extension
+ * Returns the registry of the extensions to the net.sourceforge.phpdt.ui.javaFoldingStructureProvider extension
* point.
*
- * @return the registry of contributed
- * IJavaFoldingStructureProvider
+ * @return the registry of contributed IJavaFoldingStructureProvider
* @since 3.0
*/
public synchronized JavaFoldingStructureProviderRegistry getFoldingStructureProviderRegistry() {
@@ -1393,177 +1340,160 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
/**
* Runs the given action as an atomic Java model operation.
* - * After running a method that modifies java elements, registered listeners - * receive after-the-fact notification of what just transpired, in the form of - * a element changed event. This method allows clients to call a number of - * methods that modify java elements and only have element changed event - * notifications reported at the end of the entire batch. + * After running a method that modifies java elements, registered listeners receive after-the-fact notification of what just + * transpired, in the form of a element changed event. This method allows clients to call a number of methods that modify java + * elements and only have element changed event notifications reported at the end of the entire batch. *
*- * If this method is called outside the dynamic scope of another such call, - * this method runs the action and then reports a single element changed event - * describing the net effect of all changes done to java elements by the - * action. + * If this method is called outside the dynamic scope of another such call, this method runs the action and then reports a single + * element changed event describing the net effect of all changes done to java elements by the action. *
*- * If this method is called in the dynamic scope of another such call, this - * method simply runs the action. + * If this method is called in the dynamic scope of another such call, this method simply runs the action. *
* * @param action * the action to perform * @param monitor - * a progress monitor, ornull if progress reporting
- * and cancellation are not desired
+ * a progress monitor, or null if progress reporting and cancellation are not desired
* @exception CoreException
* if the operation failed.
* @since 2.1
*/
- public static void run(IWorkspaceRunnable action, IProgressMonitor monitor)
- throws CoreException {
+ public static void run(IWorkspaceRunnable action, IProgressMonitor monitor) throws CoreException {
run(action, ResourcesPlugin.getWorkspace().getRoot(), monitor);
}
/**
* Runs the given action as an atomic Java model operation.
* - * After running a method that modifies java elements, registered listeners - * receive after-the-fact notification of what just transpired, in the form of - * a element changed event. This method allows clients to call a number of - * methods that modify java elements and only have element changed event - * notifications reported at the end of the entire batch. + * After running a method that modifies java elements, registered listeners receive after-the-fact notification of what just + * transpired, in the form of a element changed event. This method allows clients to call a number of methods that modify java + * elements and only have element changed event notifications reported at the end of the entire batch. *
*- * If this method is called outside the dynamic scope of another such call, - * this method runs the action and then reports a single element changed event - * describing the net effect of all changes done to java elements by the - * action. + * If this method is called outside the dynamic scope of another such call, this method runs the action and then reports a single + * element changed event describing the net effect of all changes done to java elements by the action. *
*- * If this method is called in the dynamic scope of another such call, this - * method simply runs the action. + * If this method is called in the dynamic scope of another such call, this method simply runs the action. *
*
- * The supplied scheduling rule is used to determine whether this operation
- * can be run simultaneously with workspace changes in other threads. See
- * IWorkspace.run(...) for more details.
+ * The supplied scheduling rule is used to determine whether this operation can be run simultaneously with workspace changes in
+ * other threads. See IWorkspace.run(...) for more details.
*
null if there are no scheduling restrictions for
- * this operation.
+ * the scheduling rule to use when running this operation, or null if there are no scheduling restrictions
+ * for this operation.
* @param monitor
- * a progress monitor, or null if progress reporting
- * and cancellation are not desired
+ * a progress monitor, or null if progress reporting and cancellation are not desired
* @exception CoreException
* if the operation failed.
* @since 3.0
*/
- public static void run(IWorkspaceRunnable action, ISchedulingRule rule,
- IProgressMonitor monitor) throws CoreException {
+ public static void run(IWorkspaceRunnable action, ISchedulingRule rule, IProgressMonitor monitor) throws CoreException {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
if (workspace.isTreeLocked()) {
new BatchOperation(action).run(monitor);
} else {
// use IWorkspace.run(...) to ensure that a build will be done in
// autobuild mode
- workspace.run(new BatchOperation(action), rule, IWorkspace.AVOID_UPDATE,
- monitor);
+ workspace.run(new BatchOperation(action), rule, IWorkspace.AVOID_UPDATE, monitor);
}
}
-
+
/**
- * Returns the template context type registry for the java plugin.
- *
- * @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;
- }
-
- /**
- * Returns the template store for the java editor templates.
- *
- * @return the template store for the java editor templates
- * @since 3.0
- */
- public TemplateStore getTemplateStore() {
- if (fTemplateStore == null) {
-// boolean alreadyMigrated= getPreferenceStore().getBoolean(TEMPLATES_MIGRATION_KEY);
-// if (alreadyMigrated)
- fTemplateStore= new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), TEMPLATES_KEY);
-// else {
-// fTemplateStore= new CompatibilityTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), TEMPLATES_KEY, Templates.getInstance());
-// getPreferenceStore().setValue(TEMPLATES_MIGRATION_KEY, true);
-// }
-
- try {
- fTemplateStore.load();
- } catch (IOException e) {
- log(e);
- }
- }
-
- return fTemplateStore;
- }
+ * Returns the template context type registry for the java plugin.
+ *
+ * @return the template context type registry for the java plugin
+ * @since 3.0
+ */
+ public ContextTypeRegistry getTemplateContextRegistry() {
+ if (fContextTypeRegistry == null) {
+ fContextTypeRegistry = new ContributionContextTypeRegistry();
- /**
- * Returns the template context type registry for the code generation
- * templates.
- *
- * @return the template context type registry for the code generation
- * templates
- * @since 3.0
- */
- public ContextTypeRegistry getCodeTemplateContextRegistry() {
- if (fCodeTemplateContextTypeRegistry == null) {
- fCodeTemplateContextTypeRegistry= new ContributionContextTypeRegistry();
-
- CodeTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);
- }
-
- return fCodeTemplateContextTypeRegistry;
- }
-
- /**
- * Returns the template store for the code generation templates.
- *
- * @return the template store for the code generation templates
- * @since 3.0
- */
- public TemplateStore getCodeTemplateStore() {
- if (fCodeTemplateStore == null) {
-// boolean alreadyMigrated= getPreferenceStore().getBoolean(CODE_TEMPLATES_MIGRATION_KEY);
-// if (alreadyMigrated)
- fCodeTemplateStore= new ContributionTemplateStore(getCodeTemplateContextRegistry(), getPreferenceStore(), CODE_TEMPLATES_KEY);
-// else {
-// fCodeTemplateStore= new CompatibilityTemplateStore(getCodeTemplateContextRegistry(), getPreferenceStore(), CODE_TEMPLATES_KEY, CodeTemplates.getInstance());
-// getPreferenceStore().setValue(CODE_TEMPLATES_MIGRATION_KEY, true);
-// }
-
- try {
- fCodeTemplateStore.load();
- } catch (IOException e) {
- log(e);
- }
-
- // compatibility / bug fixing code for duplicated templates
- // TODO remove for 3.0
-// CompatibilityTemplateStore.pruneDuplicates(fCodeTemplateStore, true);
- }
-
- return fCodeTemplateStore;
- }
+ fContextTypeRegistry.addContextType(new JavaContextType());
+ fContextTypeRegistry.addContextType(new JavaDocContextType());
+ fContextTypeRegistry.addContextType(new HTMLContextType());
+ }
+
+ return fContextTypeRegistry;
+ }
+
+ /**
+ * Returns the template store for the java editor templates.
+ *
+ * @return the template store for the java editor templates
+ * @since 3.0
+ */
+ public TemplateStore getTemplateStore() {
+ if (fTemplateStore == null) {
+ // boolean alreadyMigrated= getPreferenceStore().getBoolean(TEMPLATES_MIGRATION_KEY);
+ // if (alreadyMigrated)
+ fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), TEMPLATES_KEY);
+ // else {
+ // fTemplateStore= new CompatibilityTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), TEMPLATES_KEY,
+ // Templates.getInstance());
+ // getPreferenceStore().setValue(TEMPLATES_MIGRATION_KEY, true);
+ // }
+
+ try {
+ fTemplateStore.load();
+ } catch (IOException e) {
+ log(e);
+ }
+ }
+
+ return fTemplateStore;
+ }
+
+ /**
+ * Returns the template context type registry for the code generation templates.
+ *
+ * @return the template context type registry for the code generation templates
+ * @since 3.0
+ */
+ public ContextTypeRegistry getCodeTemplateContextRegistry() {
+ if (fCodeTemplateContextTypeRegistry == null) {
+ fCodeTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
+
+ CodeTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);
+ }
+
+ return fCodeTemplateContextTypeRegistry;
+ }
+
+ /**
+ * Returns the template store for the code generation templates.
+ *
+ * @return the template store for the code generation templates
+ * @since 3.0
+ */
+ public TemplateStore getCodeTemplateStore() {
+ if (fCodeTemplateStore == null) {
+ // boolean alreadyMigrated= getPreferenceStore().getBoolean(CODE_TEMPLATES_MIGRATION_KEY);
+ // if (alreadyMigrated)
+ fCodeTemplateStore = new ContributionTemplateStore(getCodeTemplateContextRegistry(), getPreferenceStore(), CODE_TEMPLATES_KEY);
+ // else {
+ // fCodeTemplateStore= new CompatibilityTemplateStore(getCodeTemplateContextRegistry(), getPreferenceStore(),
+ // CODE_TEMPLATES_KEY, CodeTemplates.getInstance());
+ // getPreferenceStore().setValue(CODE_TEMPLATES_MIGRATION_KEY, true);
+ // }
+
+ try {
+ fCodeTemplateStore.load();
+ } catch (IOException e) {
+ log(e);
+ }
+
+ // compatibility / bug fixing code for duplicated templates
+ // TODO remove for 3.0
+ // CompatibilityTemplateStore.pruneDuplicates(fCodeTemplateStore, true);
+ }
+
+ return fCodeTemplateStore;
+ }
}
\ No newline at end of file