Adapt Graphiti M7 changes.

Change-Id: I53b120fd7c311774f7504d5b39d1a7d671d53313

7 files changed, 45 insertions, 25 deletions

diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
index 48c258a6f2..ae83dd62f6 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java
@@ -18,13 +18,18 @@ package org.eclipse.jpt.jpadiagrameditor.ui.tests.internal;
 import java.io.File;
 import java.util.NoSuchElementException;
 
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.editor.CreateDiagramTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.editor.EditorTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.AddAttributeFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.AddJPAEntityFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.AddRelationFeatureTest;
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.ClickAddFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.DeleteRelationFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.DirectEditAttributeFeatureTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.LayoutEntityFeatureTest;
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.OpenMiniatureViewFeatureTest;
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.feature.SaveEntityFeatureTest;
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.modelintegration.ui.ModelIntegrationTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.modelintegration.util.ModelIntegrationUtilTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.preferences.JPAEditorPreferenceInitializerTest;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.preferences.JPAEditorPreferencesPageTest;
@@ -46,25 +51,25 @@ import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses( {
-//				CreateDiagramTest.class,
+				CreateDiagramTest.class,
 				JPAEditorPreferenceInitializerTest.class,
 	 			JPAEditorPreferencesPageTest.class,
 	 			AddJPAEntityFeatureTest.class,
-//				ClickAddFeatureTest.class,
+				ClickAddFeatureTest.class,
 //				CreateDeleteEntity.class,
 				DirectEditAttributeFeatureTest.class,
 				EditorTest.class,	
 				JPAEditorToolBehaviorProviderTest.class,
 				JPAEditorUtilTest.class,
 				JPASolverTest.class,
-//				OpenMiniatureViewFeatureTest.class,
+				OpenMiniatureViewFeatureTest.class,
 //				RefactorAttributeTypeFeatureTest.class,
-//				SaveEntityFeatureTest.class,
+				SaveEntityFeatureTest.class,
 				AddRelationFeatureTest.class,
 				AddAttributeFeatureTest.class,
 //				CreateDeleteOnlyAttributeTest.class,
 //				JPAProjectListenerTest.class,
-//				ModelIntegrationTest.class,
+				ModelIntegrationTest.class,
 				ModelIntegrationUtilTest.class,
 				LayoutEntityFeatureTest.class,
 				DeleteRelationFeatureTest.class,
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java
index d7e5d2e9ab..c09932d5e6 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java
@@ -27,6 +27,7 @@ import org.eclipse.graphiti.features.IDirectEditingInfo;
 import org.eclipse.graphiti.features.context.IAddContext;
 import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.ContainerShape;
+import org.eclipse.graphiti.platform.IDiagramBehavior;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jpt.jpa.core.JpaProject;
@@ -95,15 +96,19 @@ public class ClickAddFeatureTest {
 		
 		IDiagramTypeProvider diagramTypeProvider = EasyMock.createMock(IDiagramTypeProvider.class);
 		expect(featureProvider.getDiagramTypeProvider()).andStubReturn(diagramTypeProvider);
+		IDiagramBehavior db = EasyMock.createMock(IDiagramBehavior.class);
 		IEditor ed = EasyMock.createMock(IEditor.class);
-		expect(diagramTypeProvider.getDiagramEditor()).andStubReturn(ed);
+		
+		expect(diagramTypeProvider.getDiagramBehavior()).andStubReturn(db);
+		expect(db.getDiagramContainer()).andStubReturn(ed);
+
 		IWorkbenchPartSite ws = EasyMock.createMock(IWorkbenchPartSite.class);
 		expect(ed.getSite()).andStubReturn(ws);
 		ut.formatCode((ICompilationUnit)EasyMock.anyObject(), (IWorkbenchPartSite)EasyMock.anyObject());
 		
 		featureProvider.addAddIgnore(jpt, "attribute1");
 		
-		replay(featureProvider, cs, context, dei, diagramTypeProvider, ed, ws, ut);
+		replay(featureProvider, cs, context, dei, diagramTypeProvider, ed, ws, ut, db);
 	}
 	
 	@Test
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DeleteRelationFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DeleteRelationFeatureTest.java
index 5500a02f22..4ff39093e8 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DeleteRelationFeatureTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DeleteRelationFeatureTest.java
@@ -24,6 +24,7 @@ import org.eclipse.graphiti.dt.IDiagramTypeProvider;
 import org.eclipse.graphiti.features.context.IDeleteContext;
 import org.eclipse.graphiti.features.context.IRemoveContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
+import org.eclipse.graphiti.ui.editor.IDiagramBehaviorUI;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.DeleteRelationFeature;
@@ -58,16 +59,17 @@ public class DeleteRelationFeatureTest {
 		expect(featureProvider.getCompilationUnit(jpt2)).andStubReturn(cu2);
 		
 		IWorkbenchPartSite ws = EasyMock.createMock(IWorkbenchPartSite.class);
-		
+		IDiagramBehaviorUI db = EasyMock.createMock(IDiagramBehaviorUI.class);
 		IDiagramTypeProvider p = EasyMock.createMock(IDiagramTypeProvider.class);
 		IEditor e = EasyMock.createMock(IEditor.class);
 		expect(featureProvider.getDiagramTypeProvider()).andStubReturn(p);
-		expect(p.getDiagramEditor()).andStubReturn(e);
+		expect(p.getDiagramBehavior()).andStubReturn(db);
+		expect(db.getDiagramContainer()).andStubReturn(e);
 		expect(e.getSite()).andStubReturn(ws);
 		ut.organizeImports(cu1, ws);
 		ut.organizeImports(cu2, ws);
 		
-		replay(featureProvider, ctx, ut, rel, jpt1, jpt2, cu1, cu2, pe, p, e, ws);
+		replay(featureProvider, ctx, ut, rel, jpt1, jpt2, cu1, cu2, pe, p, e, ws, db);
 		
 		DeleteRelationFeature feature = new DeleteRelationFeature(featureProvider);		
 		feature.postDelete(ctx);
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java
index 88dd49e61a..b067255cb1 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.easymock.EasyMock;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.graphiti.features.context.IAddContext;
+import org.eclipse.graphiti.features.context.ICustomContext;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -56,7 +56,7 @@ public class OpenMiniatureViewFeatureTest {
 	@Test
 	public void testExecute() {
 		OpenMiniatureViewFeature ft = new OpenMiniatureViewFeature(featureProvider);
-		IAddContext ctx = EasyMock.createMock(IAddContext.class);
+		ICustomContext ctx = EasyMock.createMock(ICustomContext.class);
 		ft.execute(ctx);
 	}
 
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java
index e18233bbdd..b0ec74c283 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java
@@ -32,7 +32,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.graphiti.dt.IDiagramTypeProvider;
 import org.eclipse.graphiti.mm.pictograms.Diagram;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.platform.IDiagramEditor;
+import org.eclipse.graphiti.platform.IDiagramBehavior;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jpt.jpa.core.JpaProject;
@@ -44,11 +44,13 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IEclipseFacade;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJPADiagramEditorInput;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJPAEditorUtil;
 import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory;
+import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.util.IEditor;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PartInitException;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -75,6 +77,7 @@ public class ModelIntegrationTest {
 		expect(featureProvider.getCompilationUnit(isA(PersistentType.class))).andReturn(JavaCore.createCompilationUnitFrom(entityFile)).anyTimes();
 	}
 	
+	@Ignore
 	@Test
 	public void testJPAEditorMatchingStrategyWithEntityFileEditorInputTrue() {
 		IEditorReference editorRef = EasyMock.createMock(IEditorReference.class);
@@ -102,16 +105,21 @@ public class ModelIntegrationTest {
 		expect(moinIntUtil.getProjectByDiagram(d)).andStubReturn(jpaProject);
 		PictogramElement pe = EasyMock.createMock(PictogramElement.class);
 		expect(featureProvider.getPictogramElementForBusinessObject(inputJptType)).andStubReturn(pe);
-		IDiagramEditor dEd = EasyMock.createMock(IDiagramEditor.class);
-		expect(dtp.getDiagramEditor()).andStubReturn(dEd);
-		dEd.setPictogramElementForSelection(pe);
+		IDiagramBehavior dEd = EasyMock.createMock(IDiagramBehavior.class);
+		expect(dtp.getDiagramBehavior()).andStubReturn(dEd);
+		IEditor ed = EasyMock.createMock(IEditor.class);
+		
+		expect(dtp.getDiagramBehavior()).andStubReturn(dEd);
+		expect(dEd.getDiagramContainer()).andStubReturn(ed);
+		ed.setPictogramElementForSelection(pe);
 
 		JPAEditorMatchingStrategy str = new JPAEditorMatchingStrategy(featureProvider);
 		
-		EasyMock.replay(editorRef, d, dtp, pe, dEd, moinIntUtil, dEdInput, ut, input, featureProvider);
+		EasyMock.replay(editorRef, d, dtp, pe, dEd, moinIntUtil, dEdInput, ut, input, featureProvider, ed);
 		assertTrue(str.matches(editorRef, input));
 	}
 	
+	@Ignore
 	@Test
 	public void testJPAEditorMatchingStrategyWithEntityFileEditorInputFalse() {		
 		IEditorReference editorRef = EasyMock.createMock(IEditorReference.class);
@@ -140,9 +148,9 @@ public class ModelIntegrationTest {
 		expect(moinIntUtil.getProjectByDiagram(d)).andStubReturn(anotherJpaProject);
 		PictogramElement pe = EasyMock.createMock(PictogramElement.class);
 		expect(featureProvider.getPictogramElementForBusinessObject(inputJptType)).andStubReturn(pe);
-		IDiagramEditor dEd = EasyMock.createMock(IDiagramEditor.class);
-		expect(dtp.getDiagramEditor()).andStubReturn(dEd);
-		dEd.setPictogramElementForSelection(pe);
+		IDiagramBehavior dEd = EasyMock.createMock(IDiagramBehavior.class);
+		expect(dtp.getDiagramBehavior()).andStubReturn(dEd);
+		dEd.getDiagramContainer().setPictogramElementForSelection(pe);
 
 		JPAEditorMatchingStrategy str = new JPAEditorMatchingStrategy(featureProvider);
 		
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/IEditor.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/IEditor.java
index 4e5c9a7706..f69624c68b 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/IEditor.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/IEditor.java
@@ -15,8 +15,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.util;
 
-import org.eclipse.graphiti.platform.IDiagramEditor;
+import org.eclipse.graphiti.ui.editor.IDiagramContainerUI;
 import org.eclipse.ui.IEditorPart;
 
-public interface IEditor extends IEditorPart, IDiagramEditor {	
+public interface IEditor extends IEditorPart, IDiagramContainerUI {	
 }
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java
index ef970f92f0..92d72c8d31 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java
@@ -35,7 +35,7 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.graphiti.dt.IDiagramTypeProvider;
-import org.eclipse.graphiti.platform.IDiagramEditor;
+import org.eclipse.graphiti.platform.IDiagramBehavior;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
@@ -116,11 +116,11 @@ public class JPASolverTest {
 	}
 
 	private IJPAEditorFeatureProvider configureRefreshEditorProvider() {
-		IDiagramEditor editor = EasyMock.createMock(IDiagramEditor.class);
+		IDiagramBehavior editor = EasyMock.createMock(IDiagramBehavior.class);
 		editor.refresh();
 		replay(editor);
 		IDiagramTypeProvider diagramProvider = EasyMock.createMock(IDiagramTypeProvider.class);
-		expect(diagramProvider.getDiagramEditor()).andStubReturn(editor);
+		expect(diagramProvider.getDiagramBehavior()).andStubReturn(editor);
 		replay(diagramProvider);
 		IJPAEditorFeatureProvider provider = EasyMock.createMock(IJPAEditorFeatureProvider.class);
 		expect(provider.getDiagramTypeProvider()).andStubReturn(diagramProvider);