Revert "Bug 448496 - IllegalArgumentException when creating a new entity with the diagram"

This reverts commit 6bff4ac94fa51b77ab97115107579edc5c8e9439.

16 files changed, 125 insertions, 130 deletions

diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
index c95ff4be38..609428b1ea 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
+++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
@@ -4,7 +4,7 @@
 	
 	<groupId>org.eclipse.jpt.jpadiagrameditor</groupId>
 	<artifactId>org.eclipse.jpt.jpadiagrameditor_parent</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<properties>
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
index 10f6f37f1e..cca57cd5ec 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
+++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <site>

-   <feature url="features/org.eclipse.jpt.jpadiagrameditor.feature_1.3.100.qualifier.jar" id="org.eclipse.jpt.jpadiagrameditor.feature" version="1.2.100.qualifier">

+   <feature url="features/org.eclipse.jpt.jpadiagrameditor.feature_1.2.100.qualifier.jar" id="org.eclipse.jpt.jpadiagrameditor.feature" version="1.2.100.qualifier">

       <category name="jpa_diagram_editor"/>

    </feature>

    <category-def name="jpa_diagram_editor" label="JPA Diagram Editor"/>

diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
index 7d1efcb9e6..9efb0e0b65 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
+++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
@@ -24,7 +24,7 @@
 	
     <groupId>org.eclipse.webtools.dali</groupId>
 	<artifactId>org.eclipse.jpt.jpadiagrameditor.repository</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<name>JPA Editor Update Site</name>
 </project>
\ No newline at end of file
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
index e38d9c2b67..fd84405c00 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/feature.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.jpt.jpadiagrameditor.feature"

-      label="%featureName"

-      version="1.3.100.qualifier"

-      provider-name="%providerName"

-      plugin="org.eclipse.jpt.jpadiagrameditor.branding"

-      license-feature="org.eclipse.license"

-      license-feature-version="1.0.1.qualifier">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="license.html">

-      %license

-   </license>

-

-   <requires>

-      <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.jpt.jpa.feature" version="3.3.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.jpt.jpadiagrameditor.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.jpt.jpadiagrameditor.doc.user"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.jpt.jpadiagrameditor.branding"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jpt.jpadiagrameditor.feature"
+      label="%featureName"
+      version="1.2.100.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.jpt.jpadiagrameditor.branding"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jpt.jpa.feature" version="3.3.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jpt.jpadiagrameditor.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jpt.jpadiagrameditor.doc.user"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jpt.jpadiagrameditor.branding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/pom.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/pom.xml
index 0ee548186b..03c699acbf 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/pom.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature/pom.xml
@@ -24,7 +24,7 @@
 	
     <groupId>org.eclipse.webtools.dali</groupId>
 	<artifactId>org.eclipse.jpt.jpadiagrameditor.feature</artifactId>
-    <version>1.3.100-SNAPSHOT</version>
+    <version>1.2.100-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>JPA Diagram Editor Feature</name>
 	
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
index 6132849236..5ef7d23f2f 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/feature.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.jpt.jpadiagrameditor.tests.feature"

-      label="%featureName"

-      version="1.3.100.qualifier"

-      provider-name="%providerName"

-      license-feature="org.eclipse.license"

-      license-feature-version="1.0.1.qualifier">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="license.html">

-      %license

-   </license>

-

-   <requires>

-      <import plugin="org.easymock" version="2.4.0" match="compatible"/>

-      <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.jpt.jpa.feature" version="3.3.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.jpt.jpadiagrameditor.ui.tests"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jpt.jpadiagrameditor.tests.feature"
+      label="%featureName"
+      version="1.2.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.easymock" version="2.4.0" match="compatible"/>
+      <import feature="org.eclipse.graphiti.feature" version="0.10.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jpt.jpa.feature" version="3.3.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jpt.jpadiagrameditor.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/pom.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/pom.xml
index 4ead3bb868..c8b815cddf 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/pom.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.dali</groupId>
   <artifactId>org.eclipse.jpt.jpadiagrameditor.tests.feature</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
index 7c9e9621ce..bc6312fac8 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"

-      label="%featureName"

-      version="1.3.100.qualifier"

-      provider-name="%providerName"

-      license-feature="org.eclipse.license"

-      license-feature-version="1.0.1.qualifier">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="license.html">

-      %license

-   </license>

-

-   <includes

-         id="org.eclipse.jpt.jpadiagrameditor.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jpt.jpadiagrameditor.feature.source"

-         version="0.0.0"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"
+      label="%featureName"
+      version="1.2.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.jpt.jpadiagrameditor.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jpt.jpadiagrameditor.feature.source"
+         version="0.0.0"/>
+
+</feature>
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
index 4f33d833c8..e9459cb7a9 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.dali</groupId>
   <artifactId>org.eclipse.jpt.jpadiagrameditor_sdk.feature</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
index 79b5c2e7b0..661914ea11 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.ui;singleton:=true
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
index c2dc3de349..aa3686528e 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
@@ -24,7 +24,7 @@
 	

     <groupId>org.eclipse.webtools.dali</groupId>

 	<artifactId>org.eclipse.jpt.jpadiagrameditor.ui</artifactId>

-	<version>1.3.100-SNAPSHOT</version>

+	<version>1.2.100-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<name>JPA Diagram Editor Plug-in</name>	

 </project>
\ No newline at end of file
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 93c6f3fb8c..8b0031e1c2 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
@@ -38,7 +38,6 @@ import java.util.jar.JarFile;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -1346,10 +1345,6 @@ public class JPAEditorUtil {
 	
 	static private File getFile(IPath classPathEntry) {
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = root.findMember(classPathEntry);
-		if(resource != null && resource.exists() && !(resource instanceof IFile)) {
-			return null;
-		}
 		IFile f = root.getFile(classPathEntry);
 		if ((f != null) && f.exists()) {
 			URI uri = f.getLocationURI();
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
index 1fe24fc1e6..86f83f97df 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.swtbot.tests;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.swtbot.tests.internal.JPAEditorTestsActivator
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
index 9b09bb4bea..c9cca1809a 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
@@ -23,7 +23,7 @@
 	
     <groupId>org.eclipse.webtools.dali</groupId>
 	<artifactId>org.eclipse.jpt.jpadiagrameditor.swtbot.tests</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<name>JPA Diagram Editor SWTBot Test Plug-in</name>
 	
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
index a8b235a5fb..0d08701635 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.ui.tests;singleton:=true
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPAEditorTestsActivator
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
index 45b776bc5d..99cc11715c 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
@@ -24,7 +24,7 @@
 	

     <groupId>org.eclipse.webtools.dali</groupId>

 	<artifactId>org.eclipse.jpt.jpadiagrameditor.ui.tests</artifactId>

-    <version>1.3.100-SNAPSHOT</version>

+    <version>1.2.100-SNAPSHOT</version>

 	<packaging>eclipse-test-plugin</packaging>

 	<name>JPA Diagram Editor Test Plug-in</name>