254910 - fixed validation for new entity wizard and a mapping file that does not exist

2 files changed, 6 insertions, 6 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties
index efe04c77d7..efdf650706 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties
+++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties
@@ -26,7 +26,7 @@ CHOOSE_XML=Mapping file:
 MAPPING_XML_TITLE=Mapping File
 XML_NAME_TITLE=XML name:
 CHOOSE_MAPPING_XML_MESSAGE=Choose mapping XML
-INVALID_XML_NAME=A mapping file of the given name can not be created 
+INVALID_XML_NAME=The mapping file does not exist
 TYPE_DIALOG_TITLE=Choose Type
 TYPE_DIALOG_DESCRIPTION=Choose the type of the entity field.
 ENTITY_NAME=Entity name:
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
index 71bf158ad5..00836cf5bc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModelProvider;
+import org.eclipse.jpt.core.resource.orm.OrmResource;
 import org.eclipse.jpt.ui.JptUiPlugin;
 import org.eclipse.jpt.ui.internal.wizards.entity.EntityWizardMsg;
 import org.eclipse.jpt.ui.internal.wizards.entity.data.operation.NewEntityClassOperation;
@@ -26,7 +27,6 @@ import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
 import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
 import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
 
 public class EntityDataModelProvider extends NewJavaClassDataModelProvider implements IEntityDataModelProperties{
@@ -179,12 +179,12 @@ public class EntityDataModelProvider extends NewJavaClassDataModelProvider imple
 			IProject project = ProjectUtilities.getProject(projectName);
 			if (project != null) {
 				OrmResourceModelProvider modelProvider = OrmResourceModelProvider.getModelProvider(project, xmlName);
-				try {
-					modelProvider.getResource();
-				} catch (Exception e) {
+				OrmResource ormResource = modelProvider.getResource();
+				if (!ormResource.exists()) {
 					return new Status(
 						IStatus.ERROR, JptUiPlugin.PLUGIN_ID,
-						EntityWizardMsg.INVALID_XML_NAME);
+							EntityWizardMsg.INVALID_XML_NAME);
+						
 				}
 			}
 		}