summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-03 01:20:42 (EDT)
committerEike Stepper2007-07-03 01:20:42 (EDT)
commita5fe345cc14b6ec20ba8322c5480b2ea84236793 (patch)
tree242163e90a42ffca2b8d6fbe5d97cf23f0c8593c
parent5d09e30fe32ae05c51681ffb3b22f138eb6912c3 (diff)
downloadcdo-a5fe345cc14b6ec20ba8322c5480b2ea84236793.zip
cdo-a5fe345cc14b6ec20ba8322c5480b2ea84236793.tar.gz
cdo-a5fe345cc14b6ec20ba8322c5480b2ea84236793.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java4
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java12
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java12
3 files changed, 26 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
index 8e20e62..d0ae02c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
@@ -194,7 +194,7 @@ public class CDOItemProvider extends ContainerItemProvider
{
if (view.isReadWrite())
{
- manager.add(new LongRunningAction(page, "Create Resource", "Create a CDO resource", null)
+ manager.add(new LongRunningAction(page, "Create Resource", "Create a CDO resource")
{
private String resourcePath;
@@ -223,7 +223,7 @@ public class CDOItemProvider extends ContainerItemProvider
});
}
- manager.add(new LongRunningAction(page, "Open", "Open a CDO editor", null)
+ manager.add(new LongRunningAction(page, "Show Editor", "Show a CDO editor")
{
@Override
protected void doRun(IWorkbenchPage page, IProgressMonitor monitor) throws Exception
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
index 75d0734..1f0c9c9 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
@@ -41,6 +41,18 @@ public abstract class LongRunningAction extends SafeAction
this.page = page;
}
+ public LongRunningAction(IWorkbenchPage page, String text, ImageDescriptor image)
+ {
+ super(text, image);
+ this.page = page;
+ }
+
+ public LongRunningAction(IWorkbenchPage page, String text, String toolTipText)
+ {
+ super(text, toolTipText);
+ this.page = page;
+ }
+
public LongRunningAction(IWorkbenchPage page, String text, int style)
{
super(text, style);
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
index 7c307d2..fac5da1 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
@@ -20,6 +20,17 @@ public abstract class SafeAction extends Action
setToolTipText(toolTipText);
}
+ public SafeAction(String text, String toolTipText)
+ {
+ super(text, null);
+ setToolTipText(toolTipText);
+ }
+
+ public SafeAction(String text, ImageDescriptor image)
+ {
+ super(text, image);
+ }
+
public SafeAction(String text, int style)
{
super(text, style);
@@ -30,6 +41,7 @@ public abstract class SafeAction extends Action
super(text);
}
+ @Override
public final void run()
{
try