Metamodel generation, part 4

6 files changed, 39 insertions, 6 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
index 0113ea583b..86b44c78d7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlJarFileRef;
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
 public interface JarFileRef
-	extends XmlContextNode, JpaStructureNode
+	extends XmlContextNode, JpaStructureNode, PersistentTypeContainer
 {
 	// **************** file name **********************************************
 	
@@ -71,7 +71,7 @@ public interface JarFileRef
 	
 	
 	// **************** queries ************************************************
-	
+
 	/**
 	 * Return the persistent type, as listed in the JAR file,
 	 * with the specified name. Return null if it does not exists.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
index a176dee34d..80e6e5d6f4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
 public interface MappingFileRef
-	extends XmlContextNode, JpaStructureNode
+	extends XmlContextNode, JpaStructureNode, PersistentTypeContainer
 {
 
 	// ********** file name **********
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java
index 3d967f9ff6..e34141dbf1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.context.persistence;
 import java.util.ListIterator;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.jpa2.MetamodelGenerator;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 
 /**
@@ -24,7 +25,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
 public interface Persistence
-	extends XmlContextNode, JpaStructureNode
+	extends XmlContextNode, JpaStructureNode, MetamodelGenerator
 {
 	/**
 	 * Return the resource model object associated with this context model object
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
index cb073c3242..f70066f74f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
@@ -20,6 +20,7 @@ import org.eclipse.jpt.core.context.Generator;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.Query;
 import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.jpa2.MetamodelGenerator;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 import org.eclipse.jpt.core.resource.persistence.XmlProperty;
 
@@ -35,7 +36,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlProperty;
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
 public interface PersistenceUnit
-	extends XmlContextNode, JpaStructureNode
+	extends XmlContextNode, JpaStructureNode, MetamodelGenerator
 {
 	/**
 	 * Covariant override.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java
index 33f7db9f43..81821b259d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.core.context.persistence;
 
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.jpa2.MetamodelGenerator;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 
 /**
@@ -23,7 +24,7 @@ import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
 public interface PersistenceXml
-	extends XmlContextNode, JpaStructureNode
+	extends XmlContextNode, JpaStructureNode, MetamodelGenerator
 {
 	// **************** persistence *******************************************
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistentTypeContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistentTypeContainer.java
new file mode 100644
index 0000000000..3131af9dcd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistentTypeContainer.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.core.context.persistence;
+
+import org.eclipse.jpt.core.context.PersistentType;
+
+/**
+ * Interface used by persistence unit to gather up persistent types.
+ * <p>
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ */
+public interface PersistentTypeContainer {
+
+	/**
+	 * Return the container's persistent types.
+	 */
+	Iterable<? extends PersistentType> getPersistentTypes();
+
+}