X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java index 7d66455..f914e46 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java @@ -15,6 +15,7 @@ import org.osgi.framework.BundleContext; public class PHPDebugUiPlugin extends AbstractUIPlugin { public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.ui"; //$NON-NLS-1$ + protected static PHPDebugUiPlugin plugin; public PHPDebugUiPlugin() { @@ -37,35 +38,34 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin { public static IWorkspace getWorkspace() { return PHPeclipsePlugin.getWorkspace(); } - + /** * Convenience method which returns the unique identifier of this plugin. */ -// public static String getUniqueIdentifier() -// { -// if ( getDefault() == null ) -// { -// // If the default instance is not yet initialized, -// // return a static identifier. This identifier must -// // match the plugin id defined in plugin.xml -// return PLUGIN_ID; -// } -// return getDefault().getDescriptor().getUniqueIdentifier(); -// } - + // public static String getUniqueIdentifier() + // { + // if ( getDefault() == null ) + // { + // // If the default instance is not yet initialized, + // // return a static identifier. This identifier must + // // match the plugin id defined in plugin.xml + // return PLUGIN_ID; + // } + // return getDefault().getDescriptor().getUniqueIdentifier(); + // } /** - * 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= Display.getCurrent(); + display = Display.getCurrent(); if (display == null) - display= Display.getDefault(); - return display; + display = Display.getDefault(); + return display; } - + /** * Returns the active workbench shell or null if none * @@ -78,34 +78,33 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin { } return null; } - - public static void errorDialog( String message, IStatus status ) - { - log( status ); - Shell shell = getActiveWorkbenchShell(); - if ( shell != null ) - { - ErrorDialog.openError( shell, "Error", message, status ); - } + + public static void errorDialog(String message, IStatus status) { + log(status); + Shell shell = getActiveWorkbenchShell(); + if (shell != null) { + ErrorDialog.openError(shell, "Error", message, status); } + } - public static void errorDialog( String message, Throwable t ) - { - log( t ); - Shell shell = getActiveWorkbenchShell(); - if ( shell != null ) - { - IStatus status = new Status( IStatus.ERROR, PLUGIN_ID, /*ICDebugUIConstants.INTERNAL_ERROR*/ 150, t.getMessage(), null ); //$NON-NLS-1$ - ErrorDialog.openError( shell, "Error", message, status ); - } - } + public static void errorDialog(String message, Throwable t) { + log(t); + Shell shell = getActiveWorkbenchShell(); + if (shell != null) { + IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, /* ICDebugUIConstants.INTERNAL_ERROR */ + 150, t.getMessage(), null); //$NON-NLS-1$ + ErrorDialog.openError(shell, "Error", message, status); + } + } public static void log(IStatus status) { getDefault().getLog().log(status); } public static void log(Throwable e) { - log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, PHPDebugUiMessages.getString("RdtDebugUiPlugin.internalErrorOccurred"), e)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, + PHPDebugUiMessages + .getString("RdtDebugUiPlugin.internalErrorOccurred"), e)); //$NON-NLS-1$ } /** @@ -121,14 +120,15 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin { public void stop(BundleContext context) throws Exception { super.stop(context); } - -// protected void initializeDefaultPreferences(IPreferenceStore store) { -// super.initializeDefaultPreferences(store); -// -// store.setDefault(RdtDebugUiConstants.PREFERENCE_KEYWORDS, getDefaultKeywords()); -// } - -// protected String getDefaultKeywords() { -// return "class,def,end,if,module,new,puts,require,rescue,throw,while"; -// } + + // protected void initializeDefaultPreferences(IPreferenceStore store) { + // super.initializeDefaultPreferences(store); + // + // store.setDefault(RdtDebugUiConstants.PREFERENCE_KEYWORDS, + // getDefaultKeywords()); + // } + + // protected String getDefaultKeywords() { + // return "class,def,end,if,module,new,puts,require,rescue,throw,while"; + // } }