From: Jan P. <jp...@us...> - 2006-06-25 16:17:32
|
Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7837/src/org/epic/perleditor Modified Files: PerlEditorPlugin.java Log Message: Applied Jae Gangemi's patch #1511653 (editor action refactoring) with small modifications, see patch comments on sf.net. Index: PerlEditorPlugin.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/PerlEditorPlugin.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- PerlEditorPlugin.java 25 Apr 2006 19:21:23 -0000 1.18 +++ PerlEditorPlugin.java 25 Jun 2006 16:17:25 -0000 1.19 @@ -1,6 +1,7 @@ package org.epic.perleditor; import java.io.File; +import java.net.URL; import java.util.*; import org.eclipse.core.resources.IWorkspace; @@ -32,7 +33,7 @@ //Resource bundle. private ResourceBundle resourceBundle; - + private PerlColorProvider colorProvider = new PerlColorProvider(); public static final String PERL_EXECUTABLE_PREFERENCE = "PERL_EXECUTABLE"; @@ -59,7 +60,7 @@ public static final String SYNTAX_VALIDATION_PREFERENCE = "SYNTAX_VALIDATION_PREFERENCE"; public static final boolean SYNTAX_VALIDATION_PREFERENCE_DEFAULT = true; - + public static final String SYNTAX_VALIDATION_INTERVAL_PREFERENCE = "SYNTAX_VALIDATION_IDLE_INTERVAL"; public static final int SYNTAX_VALIDATION_INTERVAL_DEFAULT = 400; @@ -105,7 +106,7 @@ Team.setAllTypes(extensions, types); } - + /** * Returns a color with the requested RGB value. */ @@ -121,7 +122,7 @@ { return getColor( PreferenceConverter.getColor(getPreferenceStore(), preferenceKey) - ); + ); } /** @@ -131,6 +132,11 @@ return plugin; } + public static URL getBundleRoot() + { + return getDefault().getBundle().getEntry("/"); + } + /** * Returns the workspace instance. */ @@ -170,7 +176,7 @@ /** * Initializes a preference store with default preference values for this * plug-in. - * + * * @param store * the preference store to fill */ @@ -247,7 +253,7 @@ getPreferenceStore().setValue(WARNINGS_PREFERENCE, value == true ? "1" : "0"); } - + public boolean getSyntaxValidationPreference() { String value = getPreferenceStore().getString(SYNTAX_VALIDATION_PREFERENCE); @@ -257,7 +263,7 @@ public boolean getDefaultSyntaxValidationPreference() { return SYNTAX_VALIDATION_PREFERENCE_DEFAULT; } - + public void setSyntaxValidationPreference(boolean value) { getPreferenceStore().setValue(SYNTAX_VALIDATION_PREFERENCE, value == true ? "1" : "0"); @@ -275,7 +281,7 @@ fDocumentProvider = new PerlDocumentProvider(); return fDocumentProvider; } - + /** * @return false if no valid Perl interpreter has been available in * Preferences since the plug-in's activation; @@ -285,11 +291,11 @@ { return requirePerlCheckPassed; } - + /** * Same as {@link #hasPerlInterpreter}, but displays an error dialog * if false is returned. - * + * * @param interactive * true, if the check is performed in context of a user-requested * action, false if the check is performed in context of a background @@ -300,7 +306,7 @@ if (!requirePerlCheckPassed) checkForPerlInterpreter(interactive); return requirePerlCheckPassed; } - + /** * Checks that a valid Perl interpreter is specified in Preferences * and updates the requirePerlCheckPassed flag. Displays an error dialog @@ -308,12 +314,12 @@ * until Preferences are updated). */ private void checkForPerlInterpreter(boolean interactive) - { + { final String ERROR_TITLE = "Missing Perl interpreter"; final String ERROR_MSG = "To operate correctly, EPIC requires a Perl interpreter. " + "Check your configuration settings (\"Window/Preferences/Perl EPIC\")."; - + PerlExecutor executor = new PerlExecutor(); try { @@ -333,7 +339,7 @@ "The executable specified in EPIC Preferences " + "does not appear to be a valid Perl interpreter.", null); - + getLog().log(status); if (!requirePerlErrorDisplayed || interactive) { @@ -355,7 +361,7 @@ } finally { executor.dispose(); } } - + private void showErrorDialog( final String title, final String msg, @@ -366,7 +372,7 @@ ErrorDialog.openError(null, title, msg, status); } }); } - + public void stop(BundleContext context) throws Exception { |