From 6da925d59e1d48ac6200308c1951cc33132042a2 Mon Sep 17 00:00:00 2001
From: Martin Fluegge
Date: Tue, 9 Aug 2011 15:45:56 +0000
Subject: [332902] [Dawn] Decouple Dawn Runtime from integrated frameworks
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=332902

---
 .../META-INF/MANIFEST.MF                                           | 7 ++++---
 .../fragment.xml                                                   | 2 +-
 .../examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java   | 2 +-
 .../dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java   | 3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn')

diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
index b07bcf89cb..ddcdabb335 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="1.0.0.qualifier"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: fragment
-Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.0",
  org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.0",
  org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.0",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml
index 67828e1493..800ac7855f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml
@@ -67,7 +67,7 @@
              point="org.eclipse.emf.cdo.dawn.editpartstylizers">
           <DawnEditPartStylizers
                 editpart="org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassEditPart"
-                stylizer="org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicNodeEditPartStylizerImpl">
+                stylizer="org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicNodeEditPartStylizerImpl">
           </DawnEditPartStylizers>
        </extension>
       <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
index d149c2f3f8..37701233e6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
 import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin;
-import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper;
+import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper;
 
 import org.eclipse.emf.ecore.EObject;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
index bfebc22501..4491e220bb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
 import org.eclipse.emf.cdo.dawn.editors.IDawnEditor;
 import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport;
-import org.eclipse.emf.cdo.dawn.editors.impl.DawnGMFEditorSupport;
+import org.eclipse.emf.cdo.dawn.gmf.editors.impl.DawnGMFEditorSupport;
 import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput;
 import org.eclipse.emf.cdo.ui.CDOEditorInput;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -36,7 +36,6 @@ import org.eclipse.ui.IFileEditorInput;
  */
 public class DawnAcoreDiagramEditor extends AcoreDiagramEditor implements IDawnEditor
 {
-
   public static String ID = "org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.DawnAcoreDiagramEditor";
 
   private IDawnEditorSupport dawnEditorSupport;
-- 
cgit v1.2.3