343971 - Get to the new Graphiti release

6 files changed, 24 insertions, 22 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java
index 7a0ba8bf62..377e9ef137 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java
@@ -425,7 +425,7 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature {
 			System.err.println("Cannot check compilation unit for unsaved changes");	//$NON-NLS-1$
 			e.printStackTrace();			 
 		}
-		Text headerTextObj = Graphiti.getGaService().createDefaultText(headerRect,
+		Text headerTextObj = Graphiti.getGaService().createDefaultText(getDiagram(), headerRect,
 				headerTextString);
 		headerTextObj
 				.setForeground(manageColor(JPAEditorConstants.ENTITY_TEXT_FOREGROUND));
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java
index a804cc2019..c8c62db78c 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java
@@ -217,7 +217,7 @@ public class AddRelationFeature extends AbstractAddFeature {
 			if (a != null) {
 				optional = a.getOptional();
 				isOptional = (optional == null) ? true : optional.booleanValue();
-				imageCreator.createCardinalityConnectionDecorator(c, isOptional ? JPAEditorConstants.CARDINALITY_ZERO_ONE : JPAEditorConstants.CARDINALITY_ONE, 0.0);				
+				imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, isOptional ? JPAEditorConstants.CARDINALITY_ZERO_ONE : JPAEditorConstants.CARDINALITY_ONE, 0.0);				
 			}
 		}
 		JpaArtifactFactory.instance().refreshEntityModel(null, rel.getOwner());
@@ -229,25 +229,25 @@ public class AddRelationFeature extends AbstractAddFeature {
 			return;
 		optional = a.getOptional();
 		isOptional = (optional == null) ? true : optional.booleanValue();		
-		imageCreator.createCardinalityConnectionDecorator(c, isOptional ? JPAEditorConstants.CARDINALITY_ZERO_ONE : JPAEditorConstants.CARDINALITY_ONE, 1.0);									 
-		imageCreator.createCardinalityConnectionDecorator(c, rel.getOwnerAttributeName(), 0.0);				
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, isOptional ? JPAEditorConstants.CARDINALITY_ZERO_ONE : JPAEditorConstants.CARDINALITY_ONE, 1.0);									 
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getOwnerAttributeName(), 0.0);				
 		if (!UNI.equals(direction)) {
 			JpaArtifactFactory.instance().refreshEntityModel(null, rel.getInverse());
-			imageCreator.createCardinalityConnectionDecorator(c, rel.getInverseAttributeName(), 1.0);				
+			imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getInverseAttributeName(), 1.0);				
 		}
 	}
         
 	private void addOneToManyTextDecorator(FreeFormConnection c, IRelation rel) {
 		JpaArtifactFactory.instance().refreshEntityModel(null, rel.getOwner());
-		imageCreator.createCardinalityConnectionDecorator(c, JPAEditorConstants.CARDINALITY_ZERO_ONE, 0.0);
-		imageCreator.createCardinalityConnectionDecorator(c, JPAEditorConstants.CARDINALITY_ZERO_N, 1.0);	
-		imageCreator.createCardinalityConnectionDecorator(c, rel.getOwnerAttributeName(), 0.0);						
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_ONE, 0.0);
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_N, 1.0);	
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getOwnerAttributeName(), 0.0);						
 	}
                 
 	private void addManyToOneTextDecorator(FreeFormConnection c, RelDir direction, IRelation rel) {
 		JpaArtifactFactory.instance().refreshEntityModel(null, rel.getOwner());
-		imageCreator.createCardinalityConnectionDecorator(c, JPAEditorConstants.CARDINALITY_ZERO_N, 0.0);
-		imageCreator.createCardinalityConnectionDecorator(c, rel.getOwnerAttributeName(), 0.0);				
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_N, 0.0);
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getOwnerAttributeName(), 0.0);				
 		JavaPersistentAttribute owner = rel.getOwner().getAttributeNamed(rel.getOwnerAttributeName());
 		JavaAttributeMapping mapping = owner.getMapping();
 		ManyToOneAnnotation a = (ManyToOneAnnotation)mapping.getMappingAnnotation();
@@ -255,23 +255,23 @@ public class AddRelationFeature extends AbstractAddFeature {
 			return;
 		Boolean optional = a.getOptional();
 		boolean isOptional = (optional == null) ? true : optional.booleanValue();		
-		imageCreator.createCardinalityConnectionDecorator(c, isOptional ?
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, isOptional ?
 																	JPAEditorConstants.CARDINALITY_ZERO_ONE :
 																	JPAEditorConstants.CARDINALITY_ONE, 1.0);
 		if (!UNI.equals(direction)) {
 			JpaArtifactFactory.instance().refreshEntityModel(null, rel.getInverse());
-			imageCreator.createCardinalityConnectionDecorator(c, rel.getInverseAttributeName(), 1.0);
+			imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getInverseAttributeName(), 1.0);
 		}
     }
     
 	private void addManyToManyTextDecorator(FreeFormConnection c, RelDir direction, IRelation rel) {
 		JpaArtifactFactory.instance().refreshEntityModel(null, rel.getOwner());
-		imageCreator.createCardinalityConnectionDecorator(c, JPAEditorConstants.CARDINALITY_ZERO_N, 0.0);		
-		imageCreator.createCardinalityConnectionDecorator(c, JPAEditorConstants.CARDINALITY_ZERO_N, 1.0);	
-		imageCreator.createCardinalityConnectionDecorator(c, rel.getOwnerAttributeName(), 0.0);
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_N, 0.0);		
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_N, 1.0);	
+		imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getOwnerAttributeName(), 0.0);
 		if (!UNI.equals(direction)) {
 			JpaArtifactFactory.instance().refreshEntityModel(null, rel.getInverse());
-			imageCreator.createCardinalityConnectionDecorator(c, rel.getInverseAttributeName(), 1.0);	
+			imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getInverseAttributeName(), 1.0);	
 		}
     }
 
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java
index 743b9c8d6b..853f916909 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java
@@ -92,7 +92,7 @@ public class UpdateAttributeFeature extends AbstractCustomFeature {
 	}
 
 	public static Text addText(IFeatureProvider fp, Rectangle textRectangle, String txt) {
-		Text text = Graphiti.getGaService().createDefaultText(textRectangle, txt);
+		Text text = Graphiti.getGaService().createDefaultText(fp.getDiagramTypeProvider().getDiagram(), textRectangle, txt);
 		Color color = Graphiti.getGaService().manageColor(fp.getDiagramTypeProvider().getDiagram(),
 				JPAEditorConstants.ENTITY_TEXT_FOREGROUND);
 		text.setForeground(color);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorImageCreator.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorImageCreator.java
index 5ead0c8776..625d575b27 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorImageCreator.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorImageCreator.java
@@ -31,7 +31,7 @@ public interface IJPAEditorImageCreator {
 
 	public Polyline createConnectionLine(Diagram d, Connection connection);
 
-	public ConnectionDecorator createTextConnectionDecorator(Connection connection, String text, double location);
+	//public ConnectionDecorator createTextConnectionDecorator(Connection connection, String text, double location);
 
 	public ConnectionDecorator createArrowConnectionDecorator(Connection connection, double location);
 
@@ -43,7 +43,7 @@ public interface IJPAEditorImageCreator {
 
 	public ConnectionDecorator createIconConnectionDecorator(Connection connection, String iconId, double location);
 	
-	public ConnectionDecorator createCardinalityConnectionDecorator(Connection c, String text, double location);
+	public ConnectionDecorator createCardinalityConnectionDecorator(Diagram d, Connection c, String text, double location);
 	
 
 }
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java
index 70bc11801d..eb3198065a 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java
@@ -37,6 +37,7 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator {
 		return polyline;
 	}
 
+	/*
 	public ConnectionDecorator createTextConnectionDecorator(Connection connection, String text, double location) {
 		ConnectionDecorator textDecorator = Graphiti.getPeService().createConnectionDecorator(connection, true, 0.5, true);
 		Text txt = Graphiti.getGaService().createDefaultText(textDecorator);
@@ -46,10 +47,11 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator {
 		Graphiti.getGaService().setLocation(txt, 5, -20);
 		return textDecorator;
 	}
+	*/
 	
-	public ConnectionDecorator createCardinalityConnectionDecorator(Connection c, String text, double location) {
+	public ConnectionDecorator createCardinalityConnectionDecorator(Diagram d, Connection c, String text, double location) {
 		ConnectionDecorator textDecorator = Graphiti.getPeService().createConnectionDecorator(c, true, location, true);
-		Text txt = Graphiti.getGaService().createDefaultText(textDecorator);
+		Text txt = Graphiti.getGaService().createDefaultText(d, textDecorator);
 		txt.setLineWidth(JPAEditorConstants.CONNECTION_LINE_WIDTH);
 		txt.setValue(text);
 		Graphiti.getGaService().manageColor(c.getParent(), IColorConstant.BLACK);
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddRelationFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddRelationFeatureTest.java
index 1b777dfb48..242dedead9 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddRelationFeatureTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddRelationFeatureTest.java
@@ -198,7 +198,7 @@ public class AddRelationFeatureTest {
 
 	@SuppressWarnings("unused")
 	private void expectTextConnectionDecorator(String text, double location) {
-		expect(imageCreator.createCardinalityConnectionDecorator(isA(Connection.class), eq(text), eq(location))).andReturn(
+		expect(imageCreator.createCardinalityConnectionDecorator(diagram, isA(Connection.class), eq(text), eq(location))).andReturn(
 				null);
 	}