diff options
12 files changed, 47 insertions, 43 deletions
diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java index b2b6ed921..d9a1022a1 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java @@ -40,6 +40,7 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; @@ -154,7 +155,7 @@ public class StringVariableManager implements IStringVariableManager, IPropertyC Object[] copiedListeners= fListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IValueVariableListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fVariables = null; fListener = null; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java index 1dde02e32..a382bf8df 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; @@ -50,7 +50,7 @@ import org.w3c.dom.NodeList; * of changes in the source containers (i.e. when the set of source * containers changes). * <p> - * When a source director is intilaized, it adds it self as a launch listener, + * When a source director is initialized, it adds it self as a launch listener, * and automatically disposes itself when its associated launch is removed * from the launch manager. If a source director is instantiated by a client * that is not part of a launch, that client is responsible for disposing @@ -68,7 +68,7 @@ import org.w3c.dom.NodeList; */ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirector, ILaunchConfigurationListener, ILaunchListener { - // source locator type identifire + // source locator type identifier protected String fId; //ISourceLocatorParticipants that are listening for container changes protected ArrayList fParticipants = new ArrayList(); @@ -262,10 +262,10 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec /** * Registers the given source lookup participant. Has no effect if an identical - * participant is already registered. Paticipants receive notification + * participant is already registered. Participants receive notification * when the source containers associated with this source director change. * - * @param participant the particiapant to register + * @param participant the participant to register */ private synchronized void addSourceLookupParticipant(ISourceLookupParticipant participant) { if (!fParticipants.contains(participant)) { @@ -301,7 +301,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec } /** - * Removes the given participant from the list of registered partipants. + * Removes the given participant from the list of registered participants. * Has no effect if an identical participant is not already registered. * * @param participant the participant to remove @@ -321,7 +321,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec /* (non-Javadoc) * - * Updates source containers in repsonse to changes in underlying launch + * Updates source containers in response to changes in underlying launch * configuration. Only responds to changes in non-working copies. * * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration) @@ -392,7 +392,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec * @param memento source locator memento * @param dispose whether to dispose any current source containers and participants * before initializing - * @throws CoreException if an exception occurrs during initialization + * @throws CoreException if an exception occurs during initialization * @since 3.1 */ protected void doInitializeFromMemento(String memento, boolean dispose) throws CoreException { @@ -469,7 +469,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec */ protected List doSourceLookup(Object element) { SourceLookupQuery query = new SourceLookupQuery(element); - Platform.run(query); + SafeRunner.run(query); List sources = query.getSourceElements(); query.dispose(); return sources; @@ -559,7 +559,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec * Sets the launch configuration associated with this source lookup * director. If the given configuration is a working copy, this director * will respond to changes the working copy. If the given configuration - * is a persisted launch configration, this director will respond to changes + * is a persisted launch configuration, this director will respond to changes * in the persisted launch configuration. * * @param configuration launch configuration to associate with this @@ -607,7 +607,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec * Caches the resolved source element to use when one of the following * duplicates is found. * - * @param duplicates duplicates source elemnets + * @param duplicates duplicates source elements * @param sourceElement chosen source element to use in place of the * duplicates */ @@ -710,7 +710,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec */ public Object[] findSourceElements(Object object) throws CoreException { SourceLookupQuery query = new SourceLookupQuery(object); - Platform.run(query); + SafeRunner.run(query); List sources = query.getSourceElements(); Throwable exception = query.getException(); query.dispose(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java index 751ba5d13..222b35bac 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java @@ -38,6 +38,7 @@ import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugException; @@ -174,7 +175,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis * the workspace state has already been saved. See bug 7683. * * Since the <code>TRANSIENT</code> marker attribute/feature has been added, - * we no longer have to manully delete non-persisted markers - the platform + * we no longer have to manually delete non-persisted markers - the platform * does this for us (at shutdown, transient markers are not saved). However, * the code is still present to delete non-persisted markers from old * workspaces. @@ -574,8 +575,8 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis } /** - * Performs updates on accumlated changes, and fires change notification after - * a traversal. Accumlated updates are reset. + * Performs updates on accumulated changes, and fires change notification after + * a traversal. Accumulated updates are reset. */ public void update() { if (!fMoved.isEmpty()) { @@ -817,7 +818,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis for (int j = 0; j < breakpoints.length; j++) { fBreakpoint = breakpoints[j]; fDelta = deltas[j]; - Platform.run(this); + SafeRunner.run(this); } } fListener = null; @@ -880,7 +881,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis Object[] copiedListeners = fBreakpointsListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IBreakpointsListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fDeltas = null; fNotifierBreakpoints = null; @@ -971,7 +972,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis Object[] copiedListeners = fBreakpointManagerListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IBreakpointManagerListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fListener = null; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java index 18c5fc6be..526178628 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java @@ -32,6 +32,7 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugPlugin; @@ -143,7 +144,7 @@ public class ExpressionManager extends PlatformObject implements IExpressionMana } /** - * Loads any persisted watch expresions from the preferences. + * Loads any persisted watch expressions from the preferences. * NOTE: It's important that no setter methods are called on * the watchpoints which will fire change events as this * will cause an infinite loop (see Bug 27281). @@ -513,7 +514,7 @@ public class ExpressionManager extends PlatformObject implements IExpressionMana fListener = (IExpressionListener)copiedListeners[i]; for (int j = 0; j < expressions.length; j++) { fExpression = expressions[j]; - Platform.run(this); + SafeRunner.run(this); } } } @@ -574,7 +575,7 @@ public class ExpressionManager extends PlatformObject implements IExpressionMana Object[] copiedListeners = fExpressionsListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IExpressionsListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } } fNotifierExpressions = null; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index 3960bce7d..cfdbe6cc2 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -70,6 +70,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.PlatformObject; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.core.DebugException; @@ -181,7 +182,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe Object[] listeners = fLaunchConfigurationListeners.getListeners(); for (int i = 0; i < listeners.length; i++) { fListener = (ILaunchConfigurationListener)listeners[i]; - Platform.run(this); + SafeRunner.run(this); } } fConfiguration = null; @@ -238,7 +239,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe Object[] copiedListeners= fLaunchesListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (ILaunchesListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fNotifierLaunches = null; fRegistered = null; @@ -423,7 +424,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe Object[] copiedListeners= fListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (ILaunchListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fLaunch = null; fListener = null; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/MemoryBlockManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/MemoryBlockManager.java index 8167180b6..57b9789d8 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/MemoryBlockManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/MemoryBlockManager.java @@ -14,7 +14,7 @@ package org.eclipse.debug.internal.core; import java.util.ArrayList; import org.eclipse.core.runtime.ISafeRunnable; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; @@ -88,7 +88,7 @@ public class MemoryBlockManager implements IMemoryBlockManager, IDebugEventSetLi for (int i= 0; i < copiedListeners.length; i++) { fListener = (IMemoryBlockListener)copiedListeners[i]; fMemoryBlocks = memBlocks; - Platform.run(this); + SafeRunner.run(this); } } fListener = null; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java index 4919b8ace..b93859a16 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java @@ -17,7 +17,7 @@ import java.io.InputStream; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IStreamListener; import org.eclipse.debug.core.model.IFlushableStreamMonitor; @@ -251,7 +251,7 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor { Object[] copiedListeners= fListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IStreamListener) copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fListener = null; fText = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java index 21cd2c3a1..0f069f140 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ import java.util.Map; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider; @@ -124,7 +124,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis Object[] listeners = list.getListeners(); for (int i = 0; i < listeners.length; i++) { final IDebugContextListener listener = (IDebugContextListener) listeners[i]; - Platform.run(new ISafeRunnable() { + SafeRunner.run(new ISafeRunnable() { public void run() throws Exception { if (type == ACTIVATED) { listener.contextActivated(context, part); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java index d5bbf597b..70460e0dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java @@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.viewers.provisional; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.debug.internal.ui.DebugUIPlugin; /** @@ -71,7 +71,7 @@ public abstract class AbstractModelProxy implements IModelProxy { } }; - Platform.run(safeRunnable); + SafeRunner.run(safeRunnable); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index af4155b50..ebdcb21e5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugException; @@ -152,7 +152,7 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi Object[] listeners = fListeners.getListeners(); for (int i = 0; i < listeners.length; i++) { final IDebugContextListener listener = (IDebugContextListener) listeners[i]; - Platform.run(new ISafeRunnable() { + SafeRunner.run(new ISafeRunnable() { public void run() throws Exception { listener.contextActivated(fContext, ContextProvider.this.getPart()); } @@ -171,7 +171,7 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi Object[] listeners = fListeners.getListeners(); for (int i = 0; i < listeners.length; i++) { final IDebugContextListener listener = (IDebugContextListener) listeners[i]; - Platform.run(new ISafeRunnable() { + SafeRunner.run(new ISafeRunnable() { public void run() throws Exception { listener.contextChanged(fContext, ContextProvider.this.getPart()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java index bb655cb37..3d1da1a7a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java @@ -13,7 +13,7 @@ package org.eclipse.debug.ui; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.views.breakpoints.OtherBreakpointCategory; @@ -110,7 +110,7 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint listener.propertyChange(event); } }; - Platform.run(runnable); + SafeRunner.run(runnable); } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java index f33215075..cd70528dc 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java @@ -13,7 +13,7 @@ package org.eclipse.ui.console; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.IPropertyChangeListener; @@ -117,7 +117,7 @@ public abstract class AbstractConsole implements IConsole { Object[] copiedListeners= fListeners.getListeners(); for (int i= 0; i < copiedListeners.length; i++) { fListener = (IPropertyChangeListener)copiedListeners[i]; - Platform.run(this); + SafeRunner.run(this); } fListener = null; } @@ -147,7 +147,7 @@ public abstract class AbstractConsole implements IConsole { * @param autoLifecycle whether this console's lifecycle methods should be called * automatically when it is added (<code>initialize()</code>) and removed * (<code>destroy()</code>) from the console manager. When <code>false</code>, - * clients are responsible for calling the lifecycle methdods. + * clients are responsible for calling the lifecycle methods. * @since 3.1 */ public AbstractConsole(String name, String type, ImageDescriptor imageDescriptor, boolean autoLifecycle) { @@ -273,7 +273,7 @@ public abstract class AbstractConsole implements IConsole { * Disposes this console. This method should only be called by clients managing a * console's lifecycle, otherwise this method will be called automatically when this * console is removed from the console manager. The method is called once to dispose - * this console, afterwhich this console will no longer be used. + * this console, after which this console will no longer be used. * * @since 3.1 */ |