|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:48:08
|
User: adrian
Date: 06/07/10 08:18:51
Modified: src/main/org/jboss/metadata/spi/retrieval/cummulative
CummulativeMetaDatasItem.java
CummulativeAnnotationsItem.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +13 -2 container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CummulativeMetaDatasItem.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CummulativeMetaDatasItem.java 22 Jun 2006 14:57:29 -0000 1.1
+++ CummulativeMetaDatasItem.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -35,13 +35,16 @@
* CummulativeMetaDatasItem.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CummulativeMetaDatasItem extends SimpleMetaDatasItem
{
/** The context */
private MetaDataContext context;
+ /** Whether to include the parent */
+ private boolean includeParent;
+
/** The valid time */
private long validTime;
@@ -49,13 +52,15 @@
* Create a new CummulativeMetaDatasItem.
*
* @param context the context
+ * @param includeParent whether to include the parent
*/
- public CummulativeMetaDatasItem(MetaDataContext context)
+ public CummulativeMetaDatasItem(MetaDataContext context, boolean includeParent)
{
if (context == null)
throw new IllegalArgumentException("Null context");
this.context = context;
+ this.includeParent = includeParent;
init(context.getValidTime().getValidTime());
}
@@ -115,7 +120,13 @@
{
Set<MetaDataItem> temp = null;
- List<MetaDataRetrieval> retrievals = context.getRetrievals();
+ List<MetaDataRetrieval> retrievals = null;
+
+ if (includeParent)
+ retrievals = context.getRetrievals();
+ else
+ retrievals = context.getLocalRetrievals();
+
for (MetaDataRetrieval retrieval : retrievals)
{
MetaDatasItem item = retrieval.retrieveMetaData();
1.2 +13 -2 container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CummulativeAnnotationsItem.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CummulativeAnnotationsItem.java 22 Jun 2006 14:57:29 -0000 1.1
+++ CummulativeAnnotationsItem.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -36,13 +36,16 @@
* CummulativeAnnotationsItem.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CummulativeAnnotationsItem extends SimpleAnnotationsItem
{
/** The context */
private MetaDataContext context;
+ /** Whether to include the parent */
+ private boolean includeParent;
+
/** The valid time */
private long validTime;
@@ -50,13 +53,15 @@
* Create a new CummulativeAnnotationsItem.
*
* @param context the context
+ * @param includeParent whether to include the parent
*/
- public CummulativeAnnotationsItem(MetaDataContext context)
+ public CummulativeAnnotationsItem(MetaDataContext context, boolean includeParent)
{
if (context == null)
throw new IllegalArgumentException("Null context");
this.context = context;
+ this.includeParent = includeParent;
init(context.getValidTime().getValidTime());
}
@@ -116,7 +121,13 @@
{
Set<AnnotationItem> temp = null;
- List<MetaDataRetrieval> retrievals = context.getRetrievals();
+ List<MetaDataRetrieval> retrievals = null;
+
+ if (includeParent)
+ retrievals = context.getRetrievals();
+ else
+ retrievals = context.getLocalRetrievals();
+
for (MetaDataRetrieval retrieval : retrievals)
{
AnnotationsItem item = retrieval.retrieveAnnotations();
|