BaseJpaContent -> GenericJpaContent; IBaseJpaContent -> BaseJpaContent

9 files changed, 55 insertions, 49 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
index 7bc79e72d7..b724a1a8ce 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jpt.core.context.AbstractJoinColumn;
 import org.eclipse.jpt.core.context.AssociationOverride;
 import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.JpaContextNode;
 import org.eclipse.jpt.core.context.NamedColumn;
@@ -174,7 +174,7 @@ public interface JpaFactory
 	
 	// **************** persistence context objects ****************************
 	
-	PersistenceXml buildPersistenceXml(IBaseJpaContent parent, PersistenceResource persistenceResource);
+	PersistenceXml buildPersistenceXml(BaseJpaContent parent, PersistenceResource persistenceResource);
 	
 	Persistence buildPersistence(PersistenceXml parent, XmlPersistence xmlPersistence);
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IBaseJpaContent.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseJpaContent.java
index 778cda23ef..1073bd69cf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IBaseJpaContent.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseJpaContent.java
@@ -1,21 +1,28 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
- *  All rights reserved.  This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.core.context;
 
 import org.eclipse.jpt.core.ContextModel;
 import org.eclipse.jpt.core.context.persistence.PersistenceXml;
 
-public interface IBaseJpaContent extends JpaContextNode, ContextModel
+/**
+ * 
+ * 
+ * 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 interface BaseJpaContent extends JpaContextNode, ContextModel
 {
-	// **************** persistence xml ***************************************
 	
 	/**
 	 * String constant associated with changes to the persistenceXml property
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/BaseJpaContent.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericJpaContent.java
index a030f7c261..c27dc9016e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/BaseJpaContent.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericJpaContent.java
@@ -1,13 +1,12 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
- *  All rights reserved.  This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.core.internal.context;
 
 import java.util.List;
@@ -15,7 +14,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
@@ -28,13 +27,13 @@ import org.eclipse.jpt.utility.internal.node.Node;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
-public class BaseJpaContent extends AbstractJpaContextNode 
-	implements IBaseJpaContent
+public class GenericJpaContent extends AbstractJpaContextNode 
+	implements BaseJpaContent
 {
 	protected PersistenceXml persistenceXml;
 	
 	
-	public BaseJpaContent(JpaProject jpaProject) {
+	public GenericJpaContent(JpaProject jpaProject) {
 		super(jpaProject);
 	}
 	
@@ -116,7 +115,7 @@ public class BaseJpaContent extends AbstractJpaContextNode
 				this.persistenceXml.update(pr);
 			}
 			else {
-				setPersistenceXml(buildPersistenceXml(pr));
+				setPersistenceXml(this.buildPersistenceXml(pr));
 			}
 		}
 		else {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java
index 4fb05613fa..ce477f1d11 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java
@@ -14,7 +14,7 @@ import java.util.List;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.TextRange;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.context.persistence.PersistenceXml;
@@ -33,7 +33,7 @@ public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode
 	protected Persistence persistence;
 	
 	
-	public GenericPersistenceXml(IBaseJpaContent baseJpaContent, PersistenceResource persistenceResource) {
+	public GenericPersistenceXml(BaseJpaContent baseJpaContent, PersistenceResource persistenceResource) {
 		super(baseJpaContent);
 		this.initialize(persistenceResource);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
index 61e0251102..1f811f14cf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.core.ResourceModel;
 import org.eclipse.jpt.core.context.AbstractJoinColumn;
 import org.eclipse.jpt.core.context.AssociationOverride;
 import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.JpaContextNode;
 import org.eclipse.jpt.core.context.NamedColumn;
@@ -113,7 +113,7 @@ import org.eclipse.jpt.core.context.persistence.Property;
 import org.eclipse.jpt.core.internal.GenericJpaDataSource;
 import org.eclipse.jpt.core.internal.GenericJpaFile;
 import org.eclipse.jpt.core.internal.GenericJpaProject;
-import org.eclipse.jpt.core.internal.context.BaseJpaContent;
+import org.eclipse.jpt.core.internal.context.GenericJpaContent;
 import org.eclipse.jpt.core.internal.context.java.GenericJavaAssociationOverride;
 import org.eclipse.jpt.core.internal.context.java.GenericJavaAttributeOverride;
 import org.eclipse.jpt.core.internal.context.java.GenericJavaBasicMapping;
@@ -306,17 +306,17 @@ public class GenericJpaFactory implements JpaFactory
 	// **************** Context objects ***************************************
 	
 	public ContextModel buildContextModel(JpaProject parent) {
-		return new BaseJpaContent(parent);
+		return new GenericJpaContent(parent);
 	}
 	
-	public PersistenceXml buildPersistenceXml(IBaseJpaContent parent, PersistenceResource persistenceResource) {
+	public PersistenceXml buildPersistenceXml(BaseJpaContent parent, PersistenceResource persistenceResource) {
 		return new GenericPersistenceXml(parent, persistenceResource);
 	}
-	
+
 	public OrmXml buildOrmXml(MappingFileRef parent, OrmResource ormResource) {
 		return new OrmXmlImpl(parent, ormResource);
 	}
-	
+
 	public EntityMappings buildEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) {
 		return new GenericEntityMappings(parent, xmlEntityMappings);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java
index 476d7da1fd..3fd9679224 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java
@@ -11,7 +11,7 @@
 package org.eclipse.jpt.ui.internal.platform.base;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
 import org.eclipse.ui.navigator.ICommonContentProvider;
@@ -23,8 +23,8 @@ public class BaseJpaNavigatorContentProvider implements ICommonContentProvider
 	}
 
 	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof IBaseJpaContent) {
-			IBaseJpaContent baseJpaContent = (IBaseJpaContent) parentElement;
+		if (parentElement instanceof BaseJpaContent) {
+			BaseJpaContent baseJpaContent = (BaseJpaContent) parentElement;
 			if (baseJpaContent.getPersistenceXml() != null) {
 				return new Object[] {baseJpaContent.getPersistenceXml()};
 			}
@@ -39,7 +39,7 @@ public class BaseJpaNavigatorContentProvider implements ICommonContentProvider
 	}
 
 	public boolean hasChildren(Object element) {
-		return element instanceof IBaseJpaContent;
+		return element instanceof BaseJpaContent;
 	}
 
 	public Object[] getElements(Object inputElement) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java
index 898b2eff76..316ac78d4a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.core.internal.synch.SynchronizeClassesJob;
 import org.eclipse.jpt.db.internal.Table;
@@ -132,7 +132,7 @@ public class EntitiesGenerator
 				// we currently only support *one* persistence.xml file per project
 				//TODO casting to IBaseJpaContent, IContextModel doesn't seem useful to me 
 				//just trying to get rid of all compiler errors for now KFB
-				PersistenceXml persistenceXml = ((IBaseJpaContent) this.project.contextModel()).getPersistenceXml();
+				PersistenceXml persistenceXml = ((BaseJpaContent) this.project.contextModel()).getPersistenceXml();
 				if (persistenceXml != null) {
 					//TODO casting to IFile - just trying to get rid of all compiler errors for now
 					SynchronizeClassesJob job = new SynchronizeClassesJob((IFile) persistenceXml.resource());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
index 9b156f8213..d8143a53cc 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
@@ -20,7 +20,7 @@ import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.ClassRef;
@@ -167,8 +167,8 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		xmlPersistenceUnit.getClasses().remove(xmlJavaClassRefToRemove);
 	}
 
-	protected IBaseJpaContent jpaContent() {
-		return (IBaseJpaContent) getJavaProject().getJpaProject().contextModel();
+	protected BaseJpaContent jpaContent() {
+		return (BaseJpaContent) getJavaProject().getJpaProject().contextModel();
 	}
 	
 	@Override
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/BaseJpaContentTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/BaseJpaContentTests.java
index 3356fd9e00..e5be736442 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/BaseJpaContentTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/BaseJpaContentTests.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.tests.internal.context.persistence;
 
-import org.eclipse.jpt.core.context.IBaseJpaContent;
+import org.eclipse.jpt.core.context.BaseJpaContent;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
@@ -27,7 +27,7 @@ public class BaseJpaContentTests extends ContextModelTestCase
 		
 		assertFalse(pr.exists());
 		
-		IBaseJpaContent baseJpaContent = (IBaseJpaContent) getJavaProject().getJpaProject().contextModel();
+		BaseJpaContent baseJpaContent = (BaseJpaContent) getJavaProject().getJpaProject().contextModel();
 		assertNull(baseJpaContent.getPersistenceXml());
 		
 		baseJpaContent.addPersistenceXml();
@@ -46,7 +46,7 @@ public class BaseJpaContentTests extends ContextModelTestCase
 	}
 	
 	public void testModifyRemovePersistenceXml() throws Exception {
-		IBaseJpaContent baseJpaContent = (IBaseJpaContent) getJavaProject().getJpaProject().contextModel();
+		BaseJpaContent baseJpaContent = (BaseJpaContent) getJavaProject().getJpaProject().contextModel();
 		
 		assertNotNull(baseJpaContent.getPersistenceXml());
 		
@@ -73,7 +73,7 @@ public class BaseJpaContentTests extends ContextModelTestCase
 		
 		assertFalse(pr.exists());
 		
-		IBaseJpaContent baseJpaContent = (IBaseJpaContent) getJavaProject().getJpaProject().contextModel();
+		BaseJpaContent baseJpaContent = (BaseJpaContent) getJavaProject().getJpaProject().contextModel();
 		assertNull(baseJpaContent.getPersistenceXml());
 		
 		pr.getContents().add(PersistenceFactory.eINSTANCE.createXmlPersistence());
@@ -83,7 +83,7 @@ public class BaseJpaContentTests extends ContextModelTestCase
 	
 	public void testUpdateRemovePersistenceXml() throws Exception {
 		PersistenceResource pr = persistenceResource();
-		IBaseJpaContent baseJpaContent = (IBaseJpaContent) getJavaProject().getJpaProject().contextModel();
+		BaseJpaContent baseJpaContent = (BaseJpaContent) getJavaProject().getJpaProject().contextModel();
 		
 		assertNotNull(baseJpaContent.getPersistenceXml());