added basic registry support (can switch between XmlType and XmlRegistry)

3 files changed, 18 insertions, 18 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 3a04e5405d..f37b5b2cc2 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
@@ -11,7 +11,7 @@ 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.JaxbType;
 import org.eclipse.jpt.ui.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProviderFactory;
@@ -46,8 +46,8 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
 		else if (item instanceof JaxbPackage) {
 			return new JaxbPackageItemLabelProvider((JaxbPackage) item, contentAndLabelProvider);
 		}
-		else if (item instanceof JaxbPersistentClass) {
-			return new JaxbPersistentClassItemLabelProvider((JaxbPersistentClass) item, contentAndLabelProvider);
+		else if (item instanceof JaxbType) {
+			return new JaxbTypeItemLabelProvider((JaxbType) item, contentAndLabelProvider);
 		}
 		return null;
 	}
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 907e804b72..05b7281d5b 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
@@ -11,7 +11,7 @@ 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.JaxbType;
 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;
@@ -19,7 +19,7 @@ import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 
 
 public class JaxbPackageItemContentProvider
-		extends AbstractTreeItemContentProvider<JaxbPersistentClass> {
+		extends AbstractTreeItemContentProvider<JaxbType> {
 	
 	public JaxbPackageItemContentProvider(
 			JaxbPackage jaxbPackage, DelegatingTreeContentAndLabelProvider contentProvider) {
@@ -39,12 +39,12 @@ public class JaxbPackageItemContentProvider
 	}
 	
 	@Override
-	protected CollectionValueModel<JaxbPersistentClass> buildChildrenModel() {
-		return new CollectionAspectAdapter<JaxbContextRoot, JaxbPersistentClass>(
-				JaxbContextRoot.PERSISTENT_CLASSES_COLLECTION, getParent()) {
+	protected CollectionValueModel<JaxbType> buildChildrenModel() {
+		return new CollectionAspectAdapter<JaxbContextRoot, JaxbType>(
+				JaxbContextRoot.TYPES_COLLECTION, getParent()) {
 			@Override
-			protected Iterable<JaxbPersistentClass> getIterable() {
-				return this.subject.getPersistentClasses(getModel());
+			protected Iterable<JaxbType> getIterable() {
+				return this.subject.getTypes(getModel());
 			}
 		};
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentClassItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java
index 55621c5577..66102dc2c3 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentClassItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
+import org.eclipse.jpt.jaxb.core.context.JaxbType;
 import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
 import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider;
@@ -19,13 +19,13 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 
 
-public class JaxbPersistentClassItemLabelProvider
+public class JaxbTypeItemLabelProvider
 		extends AbstractItemLabelProvider {
 	
-	public JaxbPersistentClassItemLabelProvider(
-			JaxbPersistentClass jaxbPersistentClass, DelegatingContentAndLabelProvider labelProvider) {
+	public JaxbTypeItemLabelProvider(
+			JaxbType jaxbType, DelegatingContentAndLabelProvider labelProvider) {
 		
-		super(jaxbPersistentClass, labelProvider);
+		super(jaxbType, labelProvider);
 	}
 	
 	
@@ -37,13 +37,13 @@ public class JaxbPersistentClassItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel(((JaxbPersistentClass) model()).getTypeQualifiedName());
+		return new StaticPropertyValueModel(((JaxbType) model()).getTypeQualifiedName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		JaxbPersistentClass jpc = (JaxbPersistentClass) model();
+		JaxbType type = (JaxbType) model();
 		return new StaticPropertyValueModel(
-				jpc.getFullyQualifiedName() + " - " + jpc.getResource().getFullPath().makeRelative());
+				type.getFullyQualifiedName() + " - " + type.getResource().getFullPath().makeRelative());
 	}
 }