Adjusted to Graphiti API changes

9 files changed, 107 insertions, 94 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/plugin.xml b/plugins/org.eclipse.emf.cdo.dawn.graphiti/plugin.xml
index 7dbddfe6d1..ac185f4aef 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/plugin.xml
@@ -33,7 +33,7 @@
       </editor>

    </extension>

  <extension point="org.eclipse.ui.elementFactories" id=".DiagramEditorFactory" name="%_diagram_editor_factory">

-      <factory class="org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditorFactory" id="org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditorFactory">

+      <factory class="org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditorInputFactory" id="org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditorFactory">

       </factory>

    </extension>

 </plugin>

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java
index 369791fe7c..a1fef4d90c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java
@@ -19,11 +19,12 @@ import org.eclipse.emf.cdo.view.CDOView;
 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

 

 import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.graphiti.mm.pictograms.Diagram;

+import org.eclipse.graphiti.ui.editor.DefaultPersistencyBehavior;

 import org.eclipse.graphiti.ui.editor.DiagramEditor;

-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;

+import org.eclipse.graphiti.ui.editor.IDiagramEditorInput;

 import org.eclipse.graphiti.ui.internal.services.GraphitiUiInternal;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorSite;

@@ -43,6 +44,8 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi
 

   private IDawnEditorSupport dawnEditorSupport;

 

+  private DefaultPersistencyBehavior persistencyBehavior;

+

   public DawnGraphitiDiagramEditor()

   {

     dawnEditorSupport = new DawnGraphitiEditorSupport(this);

@@ -55,14 +58,17 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi
     {

       CDOConnectionUtil.instance.getCurrentSession();

       final URIEditorInput uriInput = (URIEditorInput)input;

-      final TransactionalEditingDomain domain = DawnGraphitiDiagramEditorFactory.createResourceSetAndEditingDomain();

+

+      // TODO Check, if needed:

+      // final TransactionalEditingDomain domain = DawnGraphitiUtil.createResourceSetAndEditingDomain();

+

       URI diagramFileUri = uriInput.getURI();

       if (diagramFileUri != null)

       {

         // the file's first base node has to be a diagram

 

         URI diagramUri = GraphitiUiInternal.getEmfService().mapDiagramFileUriToDiagramUri(diagramFileUri);

-        input = new DawnGraphitiEditorInput(diagramUri, domain, null, true);

+        input = new DawnGraphitiEditorInput(diagramUri, null);

       }

     }

 

@@ -73,9 +79,10 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi
   public void setInput(IEditorInput input)

   {

     super.setInput(input);

-    DiagramEditorInput iDawnEditorInput = (DiagramEditorInput)input;

+    IDiagramEditorInput diagramEditorInput = (IDiagramEditorInput)input;

 

-    Resource eResource = iDawnEditorInput.getDiagram().eResource();

+    Diagram diagram = persistencyBehavior.loadDiagram(diagramEditorInput.getUri());

+    Resource eResource = diagram.eResource();

 

     /**

      * TODO check if this can be always done this way and if the view can be canceled from the DawnEditorInput or if

@@ -122,10 +129,19 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi
   }

 

   @Override

-  public void doSave(IProgressMonitor monitor)

+  protected DefaultPersistencyBehavior createPersistencyBehavior()

   {

-    dawnEditorSupport.setDirty(false);

-    super.doSave(monitor);

+    persistencyBehavior = new DefaultPersistencyBehavior(this)

+    {

+      @Override

+      public void saveDiagram(IProgressMonitor monitor)

+      {

+        dawnEditorSupport.setDirty(false);

+        super.saveDiagram(monitor);

+      }

+    };

+

+    return persistencyBehavior;

   }

 

   @Override

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorFactory.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorFactory.java
deleted file mode 100644
index a6a355e4b9..0000000000
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.emf.cdo.dawn.graphiti.editors;

-

-import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;

-import org.eclipse.emf.cdo.dawn.transaction.DawnTransactionalEditingDomainImpl;

-import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.transaction.TransactionalCommandStack;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

-

-import org.eclipse.core.commands.operations.DefaultOperationHistory;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;

-import org.eclipse.graphiti.ui.editor.DiagramEditorInputFactory;

-import org.eclipse.graphiti.ui.internal.editor.GFWorkspaceCommandStackImpl;

-import org.eclipse.ui.IMemento;

-

-@SuppressWarnings("restriction")

-public class DawnGraphitiDiagramEditorFactory extends DiagramEditorInputFactory

-{

-  @Override

-  public IAdaptable createElement(IMemento memento)

-  {

-    final String diagramUriString = memento.getString(DiagramEditorInput.KEY_URI);

-    if (diagramUriString == null)

-    {

-      return null;

-    }

-

-    final String providerID = memento.getString(DiagramEditorInput.KEY_PROVIDER_ID);

-

-    final TransactionalEditingDomain domain = createResourceSetAndEditingDomain();

-    return new DawnGraphitiEditorInput(diagramUriString, domain, providerID, true);

-  }

-

-  public static TransactionalEditingDomain createResourceSetAndEditingDomain()

-  {

-    // TODO check if this is still needed here

-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),

-        PreferenceConstants.getServerName());

-    CDOConnectionUtil.instance.getCurrentSession();

-

-    final ResourceSet resourceSet = new ResourceSetImpl();

-

-    final TransactionalCommandStack workspaceCommandStack = new GFWorkspaceCommandStackImpl(

-        new DefaultOperationHistory());

-

-    final TransactionalEditingDomainImpl editingDomain = new DawnTransactionalEditingDomainImpl(

-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), workspaceCommandStack,

-        resourceSet);

-    WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(editingDomain);

-    return editingDomain;

-  }

-}

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java
new file mode 100644
index 0000000000..118b810618
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java
@@ -0,0 +1,41 @@
+/*

+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *    Martin Fluegge - initial API and implementation

+ */

+package org.eclipse.emf.cdo.dawn.graphiti.editors;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.graphiti.ui.editor.DiagramEditorInput;

+import org.eclipse.graphiti.ui.editor.DiagramEditorInputFactory;

+import org.eclipse.ui.IMemento;

+

+/**

+ * @author Martin Fluegge

+ */

+public class DawnGraphitiDiagramEditorInputFactory extends DiagramEditorInputFactory

+{

+  @Override

+  public IAdaptable createElement(IMemento memento)

+  {

+    final String diagramUriString = memento.getString(DiagramEditorInput.KEY_URI);

+    if (diagramUriString == null)

+    {

+      return null;

+    }

+

+    final String providerID = memento.getString(DiagramEditorInput.KEY_PROVIDER_ID);

+

+    // TODO Check, if needed:

+    // final TransactionalEditingDomain domain = createResourceSetAndEditingDomain();

+

+    return new DawnGraphitiEditorInput(URI.createURI(diagramUriString), providerID);

+  }

+}

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
index e8d5747baf..a68b0a682f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.view.CDOView;
 

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

 

 import org.eclipse.graphiti.ui.editor.DiagramEditorInput;

 

@@ -28,27 +27,18 @@ public class DawnGraphitiEditorInput extends DiagramEditorInput implements IDawn
 {

   private DawnEditorInput input;

 

-  public DawnGraphitiEditorInput(URI uri, TransactionalEditingDomain domain, String providerId,

-      boolean disposeEditingDomain)

+  public DawnGraphitiEditorInput(URI uri, String providerId)

   {

-    super(uri, domain, providerId, disposeEditingDomain);

+    super(uri, providerId);

     input = new DawnEditorInput(uri);

   }

 

-  public DawnGraphitiEditorInput(URI uri, TransactionalEditingDomain domain, String providerId,

-      boolean disposeEditingDomain, Resource resource)

+  public DawnGraphitiEditorInput(URI uri, String providerId, Resource resource)

   {

-    this(uri, domain, providerId, disposeEditingDomain);

+    this(uri, providerId);

     input.setResource((CDOResource)resource);

   }

 

-  public DawnGraphitiEditorInput(String diagramUriString, TransactionalEditingDomain domain, String providerID,

-      boolean disposeEditingDomain)

-  {

-    super(diagramUriString, domain, providerID, disposeEditingDomain);

-    input = new DawnEditorInput(URI.createURI(diagramUriString));

-  }

-

   public CDOView getView()

   {

     return input.getView();

@@ -72,6 +62,6 @@ public class DawnGraphitiEditorInput extends DiagramEditorInput implements IDawn
   @Override

   public String getFactoryId()

   {

-    return DawnGraphitiDiagramEditorFactory.class.getName();

+    return DawnGraphitiDiagramEditorInputFactory.class.getName();

   }

 }

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
index 9ab8f9f525..4b68967356 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
@@ -48,7 +48,6 @@ import java.util.Map;
  * TODO remove this suppress warning as soon as I have found a way to workaround the problem that the Graphiti editor

  * which is extended is internal

  */

-@SuppressWarnings("restriction")

 public class DawnGraphitiEditorSupport extends DawnAbstractEditorSupport

 {

   private DawnGraphitiHandler dawnGraphitiHandler;

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
index e683afa090..18e59317c8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
@@ -63,7 +63,6 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
   /**

    * @since 2.0

    */

-  @SuppressWarnings("restriction")

   @Override

   public void handleTransactionConflictEvent(CDOTransactionConflictEvent event)

   {

@@ -183,11 +182,8 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
 

     Display.getDefault().asyncExec(new Runnable()

     {

-

       public void run()

       {

-

-        @SuppressWarnings("restriction")

         RootEditPart rootEditPart = ((DiagramEditor)editor).getGraphicalViewer().getRootEditPart();

         DawnDiagramUpdater.refreshEditPart(rootEditPart);

       }

@@ -217,7 +213,6 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
     // }

   }

 

-  @SuppressWarnings("restriction")

   protected void refresh(CDOObject object)

   {

     DawnDiagramUpdater.refreshEditPart(((DiagramEditor)editor).getGraphicalViewer().getRootEditPart());

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
index 40b6dcd0b4..e44eda3ea5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
@@ -10,8 +10,20 @@
  */

 package org.eclipse.emf.cdo.dawn.graphiti.util;

 

+import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;

+import org.eclipse.emf.cdo.dawn.transaction.DawnTransactionalEditingDomainImpl;

+import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;

+

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.transaction.TransactionalCommandStack;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

 

+import org.eclipse.core.commands.operations.DefaultOperationHistory;

 import org.eclipse.gef.EditPart;

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

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

@@ -25,6 +37,26 @@ import java.util.List;
  */

 public class DawnGraphitiUtil

 {

+  public static TransactionalEditingDomain createResourceSetAndEditingDomain()

+  {

+    // TODO check if this is still needed here

+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),

+        PreferenceConstants.getServerName());

+    CDOConnectionUtil.instance.getCurrentSession();

+

+    final ResourceSet resourceSet = new ResourceSetImpl();

+

+    @SuppressWarnings("restriction")

+    final TransactionalCommandStack workspaceCommandStack = new org.eclipse.graphiti.ui.internal.editor.GFWorkspaceCommandStackImpl(

+        new DefaultOperationHistory());

+

+    final TransactionalEditingDomainImpl editingDomain = new DawnTransactionalEditingDomainImpl(

+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), workspaceCommandStack,

+        resourceSet);

+    WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(editingDomain);

+    return editingDomain;

+  }

+

   /**

    * This method tries to find an editpart for a given pictogram element. It recursivly searches all children for the

    * given editpart if the model matches to pictogramElement.

diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
index 13fa352372..8554c27864 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
@@ -12,8 +12,8 @@ package org.eclipse.emf.cdo.dawn.graphiti.wizards;
 

 import org.eclipse.emf.cdo.dawn.graphiti.DawnGraphitiUIPlugin;

 import org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditor;

-import org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiDiagramEditorFactory;

 import org.eclipse.emf.cdo.dawn.graphiti.editors.DawnGraphitiEditorInput;

+import org.eclipse.emf.cdo.dawn.graphiti.util.DawnGraphitiUtil;

 import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;

 import org.eclipse.emf.cdo.dawn.ui.composites.CDOResourceNodeChooserComposite.ResourceChooserValidator;

 import org.eclipse.emf.cdo.dawn.ui.wizards.DawnCreateNewDiagramResourceWizardPage;

@@ -135,8 +135,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     Resource diagramResource = createDiagramResource(diagramResourceURI, diagram, editingDomain);

 

     String providerId = GraphitiUi.getExtensionManager().getDiagramTypeProviderId(diagram.getDiagramTypeId());

-    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), editingDomain, providerId,

-        true, diagramResource);

+    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), providerId, diagramResource);

 

     try

     {

@@ -181,8 +180,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
 

   private TransactionalEditingDomain createEditingDomain(URI diagramResourceURI, final Diagram diagram)

   {

-    final TransactionalEditingDomain editingDomain = DawnGraphitiDiagramEditorFactory

-        .createResourceSetAndEditingDomain();

+    final TransactionalEditingDomain editingDomain = DawnGraphitiUtil.createResourceSetAndEditingDomain();

 

     return editingDomain;

   }