added getRegistry()

2 files changed, 17 insertions, 2 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbPackage.java
index 719da82b2d..b1fa5fe6d8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbPackage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbPackage.java
@@ -66,6 +66,12 @@ public interface JaxbPackage
 	boolean isEmpty();
 	
 	/**
+	 * Return the {@link JaxbRegistry} for this package if there is one.
+	 * Return *one* if there are more than one (which is an error case at any rate)
+	 */
+	JaxbRegistry getRegistry();
+	
+	/**
 	 * Return the {@link XsdSchema} associated with this package, if there is one, null otherwise
 	 */
 	XsdSchema getXsdSchema();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
index b189b97133..4828557c13 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
@@ -11,9 +11,11 @@ package org.eclipse.jpt.jaxb.core.internal.context;
 
 import java.util.List;
 import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
+import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
+import org.eclipse.jpt.jaxb.core.context.JaxbRegistry;
 import org.eclipse.jpt.jaxb.core.context.XmlNsForm;
 import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages;
 import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages;
@@ -94,9 +96,16 @@ public class GenericPackage
 		return getFactory().buildJavaPackageInfo(this, resourcePackage);
 	}
 	
-	
 	public boolean isEmpty() {
-		return getPackageInfo() == null;
+		return getPackageInfo() == null && getRegistry() == null;
+	}
+	
+	public JaxbRegistry getRegistry() {
+		Iterable<JaxbRegistry> registries = getContextRoot().getRegistries(this);
+		if (CollectionTools.isEmpty(registries)) {
+			return null;
+		}
+		return CollectionTools.get(registries, 0);
 	}