diff options
3 files changed, 12 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java index 9ef338862b..19113ae43a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java @@ -7,13 +7,14 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.container.IPluginContainer; -import org.eclipse.net4j.util.ui.actions.SafeAction; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; import org.eclipse.net4j.util.ui.views.ContainerItemProvider; import org.eclipse.net4j.util.ui.views.ContainerView; import org.eclipse.net4j.util.ui.views.IElementFilter; import org.eclipse.emf.internal.cdo.CDOSessionFactory; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.ui.IWorkbenchPage; @@ -73,7 +74,7 @@ public class CDOSessionsView extends ContainerView /** * @author Eike Stepper */ - private static final class OpenSessionAction extends SafeAction + private static final class OpenSessionAction extends LongRunningAction { private int port; @@ -84,7 +85,7 @@ public class CDOSessionsView extends ContainerView } @Override - protected void doRun() throws Exception + protected void doRun(IProgressMonitor monitor) throws Exception { IPluginContainer.INSTANCE.getElement(CDOSessionFactory.PRODUCT_GROUP, CDOProtocolConstants.PROTOCOL_NAME, "tcp://127.0.0.1:" + port + "/repo1"); diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java index 20aa00e792..b922f55a09 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java @@ -15,11 +15,12 @@ import org.eclipse.net4j.IChannel; import org.eclipse.net4j.IConnector; import org.eclipse.net4j.internal.ui.SharedIcons; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.net4j.util.ui.actions.SafeAction; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; import org.eclipse.net4j.util.ui.views.ContainerItemProvider; import org.eclipse.net4j.util.ui.views.ContainerView; import org.eclipse.net4j.util.ui.views.IElementFilter; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.swt.graphics.Image; @@ -88,7 +89,7 @@ public class Net4jItemProvider extends ContainerItemProvider /** * @author Eike Stepper */ - public class RemoveAction extends SafeAction + public class RemoveAction extends LongRunningAction { private Object object; @@ -99,7 +100,7 @@ public class Net4jItemProvider extends ContainerItemProvider } @Override - protected void doRun() throws Exception + protected void doRun(IProgressMonitor monitor) throws Exception { LifecycleUtil.deactivateNoisy(object); } diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java index fbfabda458..e0c2e0e343 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java @@ -12,11 +12,12 @@ package org.eclipse.net4j.util.internal.ui.views; import org.eclipse.net4j.util.internal.ui.SharedIcons; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.net4j.util.ui.actions.SafeAction; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; import org.eclipse.net4j.util.ui.views.ContainerItemProvider; import org.eclipse.net4j.util.ui.views.ContainerView; import org.eclipse.net4j.util.ui.views.IElementFilter; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.swt.graphics.Image; @@ -52,7 +53,7 @@ public class Net4jItemProvider extends ContainerItemProvider /** * @author Eike Stepper */ - public class RemoveAction extends SafeAction + public class RemoveAction extends LongRunningAction { private ITreeSelection selection; @@ -63,7 +64,7 @@ public class Net4jItemProvider extends ContainerItemProvider } @Override - protected void doRun() throws Exception + protected void doRun(IProgressMonitor monitor) throws Exception { for (Iterator it = selection.iterator(); it.hasNext();) { |