Refactored packages into public API, renamed interfaces

3 files changed, 18 insertions, 18 deletions

diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
index f792c808be..3ee78b5726 100644
--- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
+++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
@@ -28,10 +28,10 @@ import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
-import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider;
-import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory;
-import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider;
-import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory;
+import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider;
+import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory;
+import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider;
+import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory;
 import org.eclipse.jpt.utility.internal.ClassTools;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
@@ -308,9 +308,9 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 	
 	
 	private static class VehicleContentProviderFactory
-		implements ITreeItemContentProviderFactory
+		implements TreeItemContentProviderFactory
 	{
-		public ITreeItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) {
+		public TreeItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) {
 			if (item instanceof Root) {
 				return new RootContentProvider(
 					(Root) item, (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider);
@@ -358,9 +358,9 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 	
 	
 	private static class VehicleLabelProviderFactory
-		implements IItemLabelProviderFactory
+		implements ItemLabelProviderFactory
 	{
-		public IItemLabelProvider buildItemLabelProvider(Object element, DelegatingContentAndLabelProvider labelProvider) {
+		public ItemLabelProvider buildItemLabelProvider(Object element, DelegatingContentAndLabelProvider labelProvider) {
 			return new VehicleLabelProvider((Vehicle) element, labelProvider);
 		}
 	}
diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
index c35ad607fb..61d12d1dcc 100644
--- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
+++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
@@ -30,8 +30,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
-import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider;
-import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory;
+import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider;
+import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory;
 import org.eclipse.jpt.utility.internal.ClassTools;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
@@ -287,10 +287,10 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 
-	private static abstract class TreeItemContentProviderFactory
-		implements ITreeItemContentProviderFactory
+	private static abstract class AbstractTreeItemContentProviderFactory
+		implements TreeItemContentProviderFactory
 	{
-		public ITreeItemContentProvider buildItemContentProvider(
+		public TreeItemContentProvider buildItemContentProvider(
 			Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) {
 			return new GenericTreeItemContentProvider(
 				(TreeNode) item, (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider);
@@ -298,17 +298,17 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 
-	private static class ControlTreeItemContentProviderFactory extends TreeItemContentProviderFactory
+	private static class ControlTreeItemContentProviderFactory extends AbstractTreeItemContentProviderFactory
 	{
 
 	}
 
 
 	private static class ViewTreeItemContentProviderFactory
-		extends TreeItemContentProviderFactory
+		extends AbstractTreeItemContentProviderFactory
 	{
 		@Override
-		public ITreeItemContentProvider buildItemContentProvider(
+		public TreeItemContentProvider buildItemContentProvider(
 				Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) {
 			if (item instanceof Parent) {
 				return new ViewTreeParentItemContentProvider(
diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
index d3ca0a1bb6..3b6f3e3731 100644
--- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
+++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
@@ -1,7 +1,7 @@
 package org.eclipse.jpt.ui.tests.internal.platform;
 
 import junit.framework.TestCase;
-import org.eclipse.jpt.core.internal.IJpaProject;
+import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
 import org.eclipse.jpt.core.tests.extension.resource.ExtensionTestPlugin;
 import org.eclipse.jpt.core.tests.extension.resource.TestJpaPlatform;
@@ -48,7 +48,7 @@ public class JpaPlatformUiExtensionTests extends TestCase
 		super.tearDown();
 	}
 
-	protected IJpaProject jpaProject() {
+	protected JpaProject jpaProject() {
 		return this.testProject.getJpaProject();
 	}