Refactored packages into public API, renamed interfaces

8 files changed, 34 insertions, 34 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMapping.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMapping.java
index da99a342ac..868fb7aa87 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMapping.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMapping.java
@@ -4,7 +4,7 @@ import org.eclipse.jpt.core.internal.content.java.mappings.JavaAttributeMapping;
 import org.eclipse.jpt.core.internal.jdtutility.Attribute;
 import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter;
 
-public class TestAttributeMapping extends JavaAttributeMapping
+public class TestAttributeMapping extends AbstractJavaAttributeMapping
 {
 	public TestAttributeMapping(Attribute attribute) {
 		super(attribute);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMappingProvider.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMappingProvider.java
index d12d28932b..6d7dbc18eb 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMappingProvider.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestAttributeMappingProvider.java
@@ -1,13 +1,13 @@
 package org.eclipse.jpt.core.tests.extension.resource;
 
-import org.eclipse.jpt.core.internal.IJpaFactory;
+import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.internal.content.java.IJavaAttributeMapping;
 import org.eclipse.jpt.core.internal.content.java.IJavaAttributeMappingProvider;
 import org.eclipse.jpt.core.internal.jdtutility.Attribute;
 import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter;
 
 public class TestAttributeMappingProvider
-	implements IJavaAttributeMappingProvider
+	implements JavaAttributeMappingProvider
 {
 	// singleton
 	private static final TestAttributeMappingProvider INSTANCE = new TestAttributeMappingProvider();
@@ -15,7 +15,7 @@ public class TestAttributeMappingProvider
 	/**
 	 * Return the singleton.
 	 */
-	public static IJavaAttributeMappingProvider instance() {
+	public static JavaAttributeMappingProvider instance() {
 		return INSTANCE;
 	}
 
@@ -30,7 +30,7 @@ public class TestAttributeMappingProvider
 		return "test";
 	}
 	
-	public IJavaAttributeMapping buildMapping(Attribute attribute, IJpaFactory factory) {
+	public JavaAttributeMapping buildMapping(Attribute attribute, JpaFactory factory) {
 		return ((TestJpaFactory) factory).createTestAttributeMapping(attribute);
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJavaEntity.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJavaEntity.java
index 4542e351a2..3d800a0824 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJavaEntity.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJavaEntity.java
@@ -3,7 +3,7 @@ package org.eclipse.jpt.core.tests.extension.resource;
 import org.eclipse.jpt.core.internal.content.java.mappings.JavaEntity;
 import org.eclipse.jpt.core.internal.jdtutility.Type;
 
-public class TestJavaEntity extends JavaEntity
+public class TestJavaEntity extends GenericJavaEntity
 {
 	protected TestJavaEntity(Type type) {
 		super(type);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaFactory.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaFactory.java
index a8bc35ed32..fb59714492 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaFactory.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.internal.platform.BaseJpaFactory;
 public class TestJpaFactory extends BaseJpaFactory
 {
 	@Override
-	public IJavaEntity createJavaEntity(Type type) {
+	public JavaEntity createJavaEntity(Type type) {
 		return new TestJavaEntity(type);
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java
index b4d7398d31..f22a765e06 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java
@@ -1,7 +1,7 @@
 package org.eclipse.jpt.core.tests.extension.resource;
 
 import java.util.Collection;
-import org.eclipse.jpt.core.internal.IJpaFactory;
+import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.internal.content.java.IJavaAttributeMappingProvider;
 import org.eclipse.jpt.core.internal.content.java.IJavaTypeMappingProvider;
 import org.eclipse.jpt.core.internal.platform.BaseJpaPlatform;
@@ -16,18 +16,18 @@ public class TestJpaPlatform extends BaseJpaPlatform
 	}
 
 	@Override
-	protected IJpaFactory buildJpaFactory() {
+	protected JpaFactory buildJpaFactory() {
 		return new TestJpaFactory();
 	}
 	
 	@Override
-	protected void addJavaTypeMappingProvidersTo(Collection<IJavaTypeMappingProvider> providers) {
+	protected void addJavaTypeMappingProvidersTo(Collection<JavaTypeMappingProvider> providers) {
 		super.addJavaTypeMappingProvidersTo(providers);
 		providers.add(TestTypeMappingProvider.instance());
 	}
 	
 	@Override
-	protected void addJavaAttributeMappingProvidersTo(Collection<IJavaAttributeMappingProvider> providers) {
+	protected void addJavaAttributeMappingProvidersTo(Collection<JavaAttributeMappingProvider> providers) {
 		super.addJavaAttributeMappingProvidersTo(providers);
 		providers.add(TestAttributeMappingProvider.instance());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatformUi.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatformUi.java
index 45331608a4..a0f125dee4 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatformUi.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatformUi.java
@@ -3,66 +3,66 @@ package org.eclipse.jpt.core.tests.extension.resource;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jpt.core.internal.IJpaProject;
-import org.eclipse.jpt.ui.internal.IJpaPlatformUi;
-import org.eclipse.jpt.ui.internal.IJpaUiFactory;
-import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider;
-import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider;
-import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider;
-import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider;
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.ui.JpaPlatformUi;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaDetailsProvider;
+import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
 
-public class TestJpaPlatformUi implements IJpaPlatformUi
+public class TestJpaPlatformUi implements JpaPlatformUi
 {
 	public TestJpaPlatformUi() {
 	// TODO Auto-generated constructor stub
 	}
 
-	public ListIterator<IAttributeMappingUiProvider> defaultJavaAttributeMappingUiProviders() {
+	public ListIterator<AttributeMappingUiProvider> defaultJavaAttributeMappingUiProviders() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public IJpaDetailsProvider detailsProvider(String fileContentType) {
+	public JpaDetailsProvider detailsProvider(String fileContentType) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public Iterator<IJpaDetailsProvider> detailsProviders() {
+	public Iterator<JpaDetailsProvider> detailsProviders() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public IJpaUiFactory getJpaUiFactory() {
+	public JpaUiFactory getJpaUiFactory() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public ListIterator<IAttributeMappingUiProvider> javaAttributeMappingUiProviders() {
+	public ListIterator<AttributeMappingUiProvider> javaAttributeMappingUiProviders() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public ListIterator<ITypeMappingUiProvider> javaTypeMappingUiProviders() {
+	public ListIterator<TypeMappingUiProvider> javaTypeMappingUiProviders() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public IJpaStructureProvider structureProvider(String fileContentType) {
+	public JpaStructureProvider structureProvider(String fileContentType) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public Iterator<IJpaStructureProvider> structureProviders() {
+	public Iterator<JpaStructureProvider> structureProviders() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public void generateDDL(IJpaProject project, IStructuredSelection selection) {
+	public void generateDDL(JpaProject project, IStructuredSelection selection) {
 		// TODO Auto-generated method stub
 		
 	}
 
-	public void generateEntities(IJpaProject project, IStructuredSelection selection) {
+	public void generateEntities(JpaProject project, IStructuredSelection selection) {
 		// TODO Auto-generated method stub
 		
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMapping.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMapping.java
index c123d9ecb6..c236897404 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMapping.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMapping.java
@@ -4,7 +4,7 @@ import org.eclipse.jpt.core.internal.content.java.mappings.JavaTypeMapping;
 import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.internal.jdtutility.Type;
 
-public class TestTypeMapping extends JavaTypeMapping
+public class TestTypeMapping extends AbstractJavaTypeMapping
 {
 	public TestTypeMapping(Type type) {
 		super(type);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMappingProvider.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMappingProvider.java
index 3440f4bcf2..f12f699931 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMappingProvider.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestTypeMappingProvider.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.tests.extension.resource;
 
-import org.eclipse.jpt.core.internal.IJpaFactory;
+import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.internal.content.java.IJavaTypeMapping;
 import org.eclipse.jpt.core.internal.content.java.IJavaTypeMappingProvider;
 import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter;
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.internal.jdtutility.Type;
  * 
  */
 public class TestTypeMappingProvider
-	implements IJavaTypeMappingProvider
+	implements JavaTypeMappingProvider
 {
 
 	// singleton
@@ -28,7 +28,7 @@ public class TestTypeMappingProvider
 	/**
 	 * Return the singleton.
 	 */
-	public static IJavaTypeMappingProvider instance() {
+	public static JavaTypeMappingProvider instance() {
 		return INSTANCE;
 	}
 
@@ -43,7 +43,7 @@ public class TestTypeMappingProvider
 		return "test";
 	}
 
-	public IJavaTypeMapping buildMapping(Type type, IJpaFactory factory) {
+	public JavaTypeMapping buildMapping(Type type, JpaFactory factory) {
 		return ((TestJpaFactory) factory).createTestTypeMapping(type);
 	}