reenabled graphiti

2 files changed, 42 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
index 7f75ee07e8..860aff8d81 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
@@ -1,23 +1,24 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.graphiti.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.graphiti;bundle-version="[0.9.0,1.0.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.9.0,1.0.0)",
- org.eclipse.graphiti.examples.common;bundle-version="[0.9.0,1.0.0)",
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.100,2.0.0)",
- org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[1.0.100,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.0",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.0",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.0",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.0"
-Bundle-Vendor: %providerName
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.graphiti.Activator

+Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",

+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",

+ org.eclipse.graphiti;bundle-version="[0.9.0,1.0.0)",

+ org.eclipse.graphiti.ui;bundle-version="[0.9.0,1.0.0)",

+ org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",

+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",

+ org.eclipse.ui.views.properties.tabbed;bundle-version="[3.5.0,4.0.0)",

+ org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.100,2.0.0)",

+ org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[1.0.100,2.0.0)",

+ org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"

+Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.0",

+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.0",

+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.0",

+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.0"

+Bundle-Vendor: %providerName

diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
index 58bff474f5..39f65ed6af 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
@@ -12,19 +12,21 @@
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;

 

 import org.eclipse.emf.cdo.dawn.examples.acore.AClass;

+import org.eclipse.emf.cdo.dawn.helper.DawnEditorHelper;

 

-import org.eclipse.graphiti.examples.common.ExampleUtil;

 import org.eclipse.graphiti.features.IFeatureProvider;

 import org.eclipse.graphiti.features.context.ICustomContext;

 import org.eclipse.graphiti.features.custom.AbstractCustomFeature;

 import org.eclipse.graphiti.mm.pictograms.PictogramElement;

+import org.eclipse.jface.dialogs.InputDialog;

+import org.eclipse.jface.window.Window;

+import org.eclipse.swt.widgets.Shell;

 

 /**

  * @author Martin Fluegge

  */

 public class AcoreRenameAClassFeature extends AbstractCustomFeature

 {

-

   private boolean hasDoneChanges = false;

 

   public AcoreRenameAClassFeature(IFeatureProvider fp)

@@ -73,7 +75,7 @@ public class AcoreRenameAClassFeature extends AbstractCustomFeature
         AClass AClass = (AClass)bo;

         String currentName = AClass.getName();

         // ask user for a new class name

-        String newName = ExampleUtil.askString(getName(), getDescription(), currentName);

+        String newName = askString(getName(), getDescription(), currentName);

         if (newName != null && !newName.equals(currentName))

         {

           hasDoneChanges = true;

@@ -89,4 +91,17 @@ public class AcoreRenameAClassFeature extends AbstractCustomFeature
   {

     return hasDoneChanges;

   }

+

+  public String askString(String dialogTitle, String dialogMessage, String initialValue)

+  {

+    String ret = null;

+    Shell shell = DawnEditorHelper.getActiveShell();

+    InputDialog inputDialog = new InputDialog(shell, dialogTitle, dialogMessage, initialValue, null);

+    int retDialog = inputDialog.open();

+    if (retDialog == Window.OK)

+    {

+      ret = inputDialog.getValue();

+    }

+    return ret;

+  }

 }