changed dependendcy from "diagramming" plugin to "diagram.ad"
diff --git a/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF
index 4209f01..f8e7195 100755
--- a/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
org.eclipse.ui.workbench.texteditor,
org.eclipse.epf.validation,
org.eclipse.team.cvs.ui,
- org.eclipse.epf.diagramming,
+ org.eclipse.epf.diagram.ad,
org.eclipse.epf.diagram.add,
org.eclipse.epf.diagram.wpdd,
org.eclipse.search,
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java
index 042de86..8edebfc 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java
@@ -21,7 +21,7 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
+//import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
import org.eclipse.epf.library.LibraryService;
import org.eclipse.epf.library.configuration.ConfigurationHelper;
import org.eclipse.epf.library.edit.IFilter;
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java
index d8e0e28..cebd890 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java
@@ -13,13 +13,13 @@
import org.eclipse.draw2d.LayeredPane;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.epf.diagram.ad.edit.parts.UMLEditPartFactory;
import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
import org.eclipse.epf.diagram.core.services.DiagramManager;
import org.eclipse.epf.diagram.model.LinkedObject;
import org.eclipse.epf.diagram.model.NamedNode;
import org.eclipse.epf.diagram.model.Node;
import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
import org.eclipse.epf.library.edit.IFilter;
import org.eclipse.epf.library.edit.util.Suppression;
import org.eclipse.epf.library.edit.util.TngUtil;
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java
index d8e64a2..cff3d84 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java
@@ -24,7 +24,6 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.epf.diagram.core.services.DiagramManager;
import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
import org.eclipse.epf.library.LibraryService;
import org.eclipse.epf.library.configuration.ConfigurationHelper;
import org.eclipse.epf.library.edit.IFilter;
@@ -134,13 +133,13 @@
getViewerHolder(parent);
switch (diagramType) {
- case IDiagramService.ACTIVITY_DIAGRAM:
+ case IDiagramManager.ACTIVITY_DIAGRAM:
return new NewActivityDiagramViewer(holder, wrapper);
- case IDiagramService.ACTIVITY_DETAIL_DIAGRAM:
+ case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
return new NewActivityDetailDiagramViewer(holder,wrapper);
- case IDiagramService.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
+ case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
return new NewWPDependencyDiagramViewer(holder,wrapper);
default:
@@ -225,21 +224,21 @@
org.eclipse.epf.diagram.model.util.DiagramInfo info = new org.eclipse.epf.diagram.model.util.DiagramInfo((Activity)e);
switch (getIntType(diagramType))
{
- case IDiagramService.ACTIVITY_DIAGRAM:
+ case IDiagramManager.ACTIVITY_DIAGRAM:
if ( info.canPublishADImage() )
{
return (info.getActivityDiagram() != null) && info.canPublishADImage();
}
break;
- case IDiagramService.ACTIVITY_DETAIL_DIAGRAM:
+ case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
if ( info.canPublishADDImage() )
{
return (info.getActivityDetailDiagram() != null) && info.canPublishADDImage();
}
break;
- case IDiagramService.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
+ case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
if ( info.canPublishWPDImage() )
{
return (info.getWPDDiagram() != null ) && info.canPublishWPDImage();
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java
index ac12a93..28d8462 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java
@@ -15,9 +15,9 @@
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.epf.diagram.ad.edit.parts.UMLEditPartFactory;
import org.eclipse.epf.diagram.core.bridge.ActivityDiagramAdapter;
import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
import org.eclipse.epf.library.edit.IFilter;
import org.eclipse.epf.library.edit.util.Suppression;
import org.eclipse.epf.library.layout.diagram.DiagramInfo;
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java
index 0c85867..42d99cb 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java
@@ -46,8 +46,6 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.command.CreateChildCommand;
-import org.eclipse.emf.edit.command.CutToClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
@@ -92,6 +90,7 @@
import org.eclipse.epf.authoring.ui.views.LibraryView;
import org.eclipse.epf.authoring.ui.views.ProcessViewer;
import org.eclipse.epf.authoring.ui.views.ViewHelper;
+import org.eclipse.epf.diagram.ad.part.ActivityDiagramEditorPlugin;
import org.eclipse.epf.diagram.add.part.ActivityDetailDiagramEditorPlugin;
import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
import org.eclipse.epf.diagram.core.part.util.DiagramEditorUtil;
@@ -99,7 +98,6 @@
import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
import org.eclipse.epf.diagram.wpdd.part.WPDDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
import org.eclipse.epf.library.ILibraryManager;
import org.eclipse.epf.library.ILibraryServiceListener;
import org.eclipse.epf.library.LibraryPlugin;
@@ -1683,7 +1681,7 @@
private static PreferencesHint getDiagramPreferencesHint(int diagramType) {
switch(diagramType) {
case IDiagramManager.ACTIVITY_DIAGRAM:
- return EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
+ return ActivityDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
return ActivityDetailDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
