renamed JaxbRootContextNode -> JaxbContextRoot; added api on JaxbContextNode

6 files changed, 32 insertions, 25 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
index fc73852d14..3a04e5405d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
@@ -9,9 +9,9 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProviderFactory;
@@ -40,8 +40,8 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
 			Object item,
 			DelegatingContentAndLabelProvider contentAndLabelProvider) {
 		
-		if (item instanceof JaxbRootContextNode) {
-			return new RootContextItemLabelProvider((JaxbRootContextNode) item, contentAndLabelProvider);
+		if (item instanceof JaxbContextRoot) {
+			return new JaxbContextRootItemLabelProvider((JaxbContextRoot) item, contentAndLabelProvider);
 		}
 		else if (item instanceof JaxbPackage) {
 			return new JaxbPackageItemLabelProvider((JaxbPackage) item, contentAndLabelProvider);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
index 873b9be415..5e33b1ad2e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
@@ -9,8 +9,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.TreeItemContentProvider;
@@ -43,8 +43,8 @@ public class GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory
 		DelegatingTreeContentAndLabelProvider treeContentAndLabelProvider = 
 				(DelegatingTreeContentAndLabelProvider) contentAndLabelProvider;
 		
-		if (item instanceof JaxbRootContextNode) {
-			return new RootContextItemContentProvider((JaxbRootContextNode) item, treeContentAndLabelProvider);
+		if (item instanceof JaxbContextRoot) {
+			return new JaxbContextRootItemContentProvider((JaxbContextRoot) item, treeContentAndLabelProvider);
 		}
 		else if (item instanceof JaxbPackage) {
 			return new JaxbPackageItemContentProvider((JaxbPackage) item, treeContentAndLabelProvider);	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemContentProvider.java
index eafd83a396..0c445fae8c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemContentProvider.java
@@ -10,25 +10,26 @@
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.utility.internal.model.value.CollectionAspectAdapter;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 
 
-public class RootContextItemContentProvider
+public class JaxbContextRootItemContentProvider
 		extends AbstractTreeItemContentProvider<JaxbPackage> {
 	
-	public RootContextItemContentProvider(
-			JaxbRootContextNode rootContext, DelegatingTreeContentAndLabelProvider contentProvider) {
+	public JaxbContextRootItemContentProvider(
+			JaxbContextRoot rootContext, DelegatingTreeContentAndLabelProvider contentProvider) {
 		super(rootContext, contentProvider);
 	}
 	
+	
 	@Override
-	public JaxbRootContextNode getModel() {
-		return (JaxbRootContextNode) super.getModel();
+	public JaxbContextRoot getModel() {
+		return (JaxbContextRoot) super.getModel();
 	}
 	
 	@Override
@@ -38,8 +39,8 @@ public class RootContextItemContentProvider
 	
 	@Override
 	protected CollectionValueModel<JaxbPackage> buildChildrenModel() {
-		return new CollectionAspectAdapter<JaxbRootContextNode, JaxbPackage>(
-				JaxbRootContextNode.PACKAGES_COLLECTION,
+		return new CollectionAspectAdapter<JaxbContextRoot, JaxbPackage>(
+				JaxbContextRoot.PACKAGES_COLLECTION,
 				getModel()) {
 			
 			@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
index 198df79e94..f01acefb64 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
@@ -20,17 +20,22 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 
 
-public class RootContextItemLabelProvider
+public class JaxbContextRootItemLabelProvider
 		 extends AbstractItemLabelProvider {
 	
-	public RootContextItemLabelProvider(
-			JaxbRootContextNode rootContextNode, DelegatingContentAndLabelProvider labelProvider) {
+	public JaxbContextRootItemLabelProvider(
+			JaxbContextRoot rootContextNode, DelegatingContentAndLabelProvider labelProvider) {
 		
 		super(rootContextNode, labelProvider);
 	}
 	
 	
 	@Override
+	public JaxbContextRoot model() {
+		return (JaxbContextRoot) super.model();
+	}
+	
+	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new StaticPropertyValueModel<Image>(JptJaxbUiPlugin.getImage(JptJaxbUiIcons.JAXB_CONTENT));
 	}
@@ -44,6 +49,6 @@ public class RootContextItemLabelProvider
 	protected PropertyValueModel<String> buildDescriptionModel() {
 		return new StaticPropertyValueModel<String>(
 				JptJaxbUiMessages.JaxbContent_label
-						+ " - " + ((JaxbRootContextNode) model()).getResource().getFullPath().makeRelative());
+						+ " - " + model().getResource().getFullPath().makeRelative());
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
index a6d194e80f..907e804b72 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
@@ -9,9 +9,9 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.utility.internal.model.value.CollectionAspectAdapter;
@@ -27,20 +27,21 @@ public class JaxbPackageItemContentProvider
 		super(jaxbPackage, contentProvider);
 	}
 	
+	
 	@Override
 	public JaxbPackage getModel() {
 		return (JaxbPackage) super.getModel();
 	}
 	
 	@Override
-	public JaxbRootContextNode getParent() {
-		return (JaxbRootContextNode) getModel().getParent();
+	public JaxbContextRoot getParent() {
+		return (JaxbContextRoot) getModel().getParent();
 	}
 	
 	@Override
 	protected CollectionValueModel<JaxbPersistentClass> buildChildrenModel() {
-		return new CollectionAspectAdapter<JaxbRootContextNode, JaxbPersistentClass>(
-				JaxbRootContextNode.PERSISTENT_CLASSES_COLLECTION, getParent()) {
+		return new CollectionAspectAdapter<JaxbContextRoot, JaxbPersistentClass>(
+				JaxbContextRoot.PERSISTENT_CLASSES_COLLECTION, getParent()) {
 			@Override
 			protected Iterable<JaxbPersistentClass> getIterable() {
 				return this.subject.getPersistentClasses(getModel());
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
index f8e4aa18ac..437ad3c193 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
@@ -137,7 +137,7 @@ public class JaxbNavigatorContentProvider
 							JptJaxbUiPlugin.getJaxbPlatformUiManager().getJaxbPlatformUi(desc);
 					
 					if (platformUi != null) {
-						return new Object[] {jaxbProject.getRootContextNode()};
+						return new Object[] {jaxbProject.getContextRoot()};
 					}
 				}	
 			}