[353555] Inconsistent diagram name

5 files changed, 15 insertions, 7 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
index 174d5df0d3..ec3cb7e3b1 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
@@ -67,10 +67,12 @@ public class AddAllEntitiesFeature extends AbstractCustomFeature implements IAdd
 		return true;
 	}
 	
+	@SuppressWarnings("restriction")
 	public void execute(ICustomContext context) {
 		Diagram d = getDiagram();
 		JpaProject project = getTargetJPAProject();
-		PersistenceUnit unit = project.getRootContextNode().getPersistenceXml().getPersistence().getPersistenceUnits().iterator().next();
+		PersistenceUnit unit = project.getRootContextNode().getPersistenceXml().
+								getPersistence().getPersistenceUnits().iterator().next();
 		
 		
 		Point lowestRightestPointOfExistingDiagram = getLowestRightestPoint(d);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java
index 7805bfd3ff..e2ea8f112d 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java
@@ -46,7 +46,7 @@ public class CreateDiagramJob extends Job {
 	}
 
 	public CreateDiagramJob(PersistenceUnit persistenceUnit, int grid, boolean snap) {
-		super(MessageFormat.format(JPAEditorMessages.CreateDiagramJob_createDiagramJobName, new Object[] { persistenceUnit.getName()})); 
+		super(MessageFormat.format(JPAEditorMessages.CreateDiagramJob_createDiagramJobName, new Object[] { persistenceUnit.getJpaProject().getName()})); 
 		this.persistenceUnit = persistenceUnit;
 		this.grid = grid;
 		this.snap = snap;
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java
index a1483a6778..5cbc93b8cc 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java
@@ -73,7 +73,7 @@ public class ModelIntegrationUtil {
 	
 	public static IPath createDiagramPath(PersistenceUnit persistenceUnit) throws CoreException {
 	    IProject project = persistenceUnit.getJpaProject().getProject();
-	    String diagramName = persistenceUnit.getName();
+	    String diagramName = persistenceUnit.getJpaProject().getName();
 		IPath newXMIFilePath = getDiagramsFolderPath(project).append(diagramName).addFileExtension(DIAGRAM_FILE_EXTENSION);	
 		IFileSystem fileSystem = EFS.getLocalFileSystem();
 		IFileStore newXMIFile = fileSystem.getStore(newXMIFilePath);
@@ -150,7 +150,7 @@ public class ModelIntegrationUtil {
 										int grid, 
 										boolean snap) throws CoreException {
 		IPath path = createDiagramPath(persistenceUnit);
-		Diagram d = createDiagram(persistenceUnit.getJpaProject().getProject(), path, persistenceUnit.getName(), grid, snap); 
+		Diagram d = createDiagram(persistenceUnit.getJpaProject().getProject(), path, persistenceUnit.getJpaProject().getName(), grid, snap); 
 	    return d;
 	}
 	
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
index 9e2f47fe41..9b17022ec4 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
@@ -106,9 +106,11 @@ public class JPAEditorDiagramTypeProvider extends AbstractDiagramTypeProvider {
     	return (JPAEditorFeatureProvider)super.getFeatureProvider();
     }
     
+	@SuppressWarnings("restriction")
 	public boolean hasToAdd() {
 		JpaProject project = getTargetJPAProject();
-		PersistenceUnit unit = project.getRootContextNode().getPersistenceXml().getPersistence().getPersistenceUnits().iterator().next();
+		PersistenceUnit unit = project.getRootContextNode().getPersistenceXml().
+								getPersistence().getPersistenceUnits().iterator().next();
 		
 		for (ClassRef classRef : unit.getClassRefs()) {
 			if (classRef.getJavaPersistentType() != null) { 
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
index 080fa8eb73..1b246cc723 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
@@ -188,7 +188,8 @@ public class JPAEditorUtil {
     	return at.getTypeName();
     }        
     
-    public static List<String> getAttributeTypeTypeNames(JavaResourceAttribute at) {
+    @SuppressWarnings("restriction")
+	public static List<String> getAttributeTypeTypeNames(JavaResourceAttribute at) {
     	ListIterator<String> tt = at.getTypeTypeArgumentNames().iterator();
     	if ((tt == null) || !tt.hasNext()) 
     		return null;
@@ -203,7 +204,8 @@ public class JPAEditorUtil {
     }
 
     
-    public static String getAttributeTypeNameWithGenerics(JavaResourceAttribute at) {
+    @SuppressWarnings("restriction")
+	public static String getAttributeTypeNameWithGenerics(JavaResourceAttribute at) {
     	StringBuilder res = new StringBuilder(getAttributeTypeName(at));
     	ListIterator<String> it = at.getTypeTypeArgumentNames().iterator();
     	if ((it != null) && it.hasNext()) {
@@ -1336,6 +1338,7 @@ public class JPAEditorUtil {
 		return file;
 	}		
 	
+	@SuppressWarnings("restriction")
 	static private HashSet<String> getEntityNames(JpaProject jpaProject) {
 		HashSet<String> names = new HashSet<String>();
 		ListIterator<PersistenceUnit> lit = jpaProject.getRootContextNode().getPersistenceXml().
@@ -1347,6 +1350,7 @@ public class JPAEditorUtil {
 		return names;
 	}
 	
+	@SuppressWarnings("restriction")
 	static private HashSet<String> getEntitySimpleNames(JpaProject jpaProject) {
 		HashSet<String> names = new HashSet<String>();
 		ListIterator<PersistenceUnit> lit = jpaProject.getRootContextNode().getPersistenceXml().