quick reversion for patch making

4 files changed, 17 insertions, 34 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModelProvider.java
index fe716a1356..b0ad9ed707 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModelProvider.java
@@ -14,7 +14,6 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.JpaConstants;
 import org.eclipse.jpt.core.internal.resource.JpaResourceModelProviderManager;
@@ -25,7 +24,7 @@ import org.eclipse.jpt.core.resource.orm.OrmResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 
 public class OrmResourceModelProvider
-	extends AbstractResourceModelProvider<OrmResource>
+	extends AbstractResourceModelProvider
 {
 	/**
 	 * (Convenience method) Returns an ORM resource model provider for 
@@ -81,7 +80,7 @@ public class OrmResourceModelProvider
 	}
 	
 	@Override
-	protected OrmResource ensureCorrectType(Resource resource) throws ClassCastException {
-		return (OrmResource) resource;
+	public OrmResource getResource() {
+		return (OrmResource) super.getResource();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModelProvider.java
index 18337a7940..6d8c5be80f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModelProvider.java
@@ -14,7 +14,6 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.JpaConstants;
 import org.eclipse.jpt.core.internal.resource.JpaResourceModelProviderManager;
@@ -26,7 +25,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 
 public class PersistenceResourceModelProvider
-	extends AbstractResourceModelProvider<PersistenceResource>
+	extends AbstractResourceModelProvider
 {
 	/**
 	 * (Convenience method) Returns a persistence resource model provider for 
@@ -85,7 +84,7 @@ public class PersistenceResourceModelProvider
 	}
 	
 	@Override
-	protected PersistenceResource ensureCorrectType(Resource resource) throws ClassCastException {
-		return (PersistenceResource) resource;
+	public PersistenceResource getResource() {
+		return (PersistenceResource) super.getResource();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractResourceModelProvider.java
index da88edbc93..57f4216acc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractResourceModelProvider.java
@@ -52,21 +52,14 @@ import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateVa
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
 
-/**
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public abstract class AbstractResourceModelProvider<R extends JpaXmlResource> 
+public abstract class AbstractResourceModelProvider 
 	implements JpaResourceModelProvider, ResourceStateInputProvider, ResourceStateValidator
 {
 	protected IProject project;
 	
 	protected URI fileUri;
 	
-	protected R resource;
+	protected JpaXmlResource resource;
 	
 	protected final ResourceAdapter resourceAdapter = new ResourceAdapter();
 	
@@ -109,29 +102,23 @@ public abstract class AbstractResourceModelProvider<R extends JpaXmlResource>
 	 * this will return a stub resource.  You must call #createResource() to 
 	 * create the file on the file system.
 	 */
-	public R getResource() {
+	public JpaXmlResource getResource() {
 		if (this.resource == null) {
 			try {
-				this.resource = ensureCorrectType(WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet()));
+				this.resource = 
+					(JpaXmlResource) WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet());
 			}
 			catch (ClassCastException cce) {
 				Resource.Factory resourceFactory = 
 					WTPResourceFactoryRegistry.INSTANCE.getFactory(fileUri, getContentType(getContentTypeDescriber()));
 				this.resource = 
-					(R)((FlexibleProjectResourceSet) getResourceSet()).createResource(fileUri, resourceFactory);
+					(JpaXmlResource)((FlexibleProjectResourceSet) getResourceSet()).createResource(fileUri, resourceFactory);
 			}
 		}
 		return this.resource;
 	}
 	
-	/**
-	 * Ensure that the given resource is of the expected type for this resource
-	 * model provider.
-	 * Return it if so, throw a ClassCastException otherwise.
-	 */
-	protected abstract R ensureCorrectType(Resource resource) throws ClassCastException;
-	
-	public R createResource() throws CoreException {
+	public JpaXmlResource createResource() throws CoreException {
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
 			public void run(IProgressMonitor monitor) throws CoreException {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmResourceModelProvider.java
index 94cd0f7e8f..00bebd7873 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmResourceModelProvider.java
@@ -14,10 +14,9 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.resource.JpaResourceModelProviderManager;
-import org.eclipse.jpt.core.resource.AbstractResourceModelProvider;
+import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModelProvider;
 import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkConstants;
@@ -25,8 +24,7 @@ import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmResource;
 
-public class EclipseLinkOrmResourceModelProvider
-	extends AbstractResourceModelProvider<EclipseLinkOrmResource>
+public class EclipseLinkOrmResourceModelProvider extends OrmResourceModelProvider
 {
 	/**
 	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
@@ -83,7 +81,7 @@ public class EclipseLinkOrmResourceModelProvider
 	}
 	
 	@Override
-	protected EclipseLinkOrmResource ensureCorrectType(Resource resource) throws ClassCastException {
-		return (EclipseLinkOrmResource) resource;
+	public EclipseLinkOrmResource getResource() {
+		return (EclipseLinkOrmResource) super.getResource();
 	}
 }