[Jboss-cvs] JBossAS SVN: r55949 - in projects/microcontainer/trunk/kernel/src/main/org/jboss: beans/metadata/plugins beans/metadata/spi kernel/plugins/dependency
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 15 09:20:40 EDT 2006
Author: alesj
Date: 2006-08-15 09:20:18 -0400 (Tue, 15 Aug 2006)
New Revision: 55949
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitorNode.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
Log:
Adding describe visit, renaming old visit to initialVisit.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -81,9 +81,9 @@
return ann;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -76,10 +76,10 @@
return classloader;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
visitor.setContextState(ControllerState.DESCRIBED);
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -101,12 +101,12 @@
return whenRequired;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
KernelControllerContext context = visitor.getControllerContext();
DependencyItem item = new DemandDependencyItem(context.getName());
visitor.addDependency(item);
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -77,7 +77,7 @@
return dependency;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
KernelControllerContext context = visitor.getControllerContext();
DependencyItem item = new LifecycleDependencyItem(context.getName(), ControllerState.CREATE);
@@ -85,7 +85,7 @@
item = new LifecycleDependencyItem(context.getName(), ControllerState.START);
visitor.addDependency(item);
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -136,7 +136,7 @@
return result;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
KernelControllerContext controllerContext = visitor.getControllerContext();
controller = (KernelController) controllerContext.getController();
@@ -147,7 +147,7 @@
DependencyItem item = new AbstractDependencyItem(name, iDependOn, whenRequired, dependentState);
visitor.addDependency(item);
- super.visit(visitor);
+ super.initialVisit(visitor);
}
public void toString(JBossStringBuilder buffer)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -85,9 +85,9 @@
return annotations;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -108,7 +108,7 @@
return super.getValue(info, cl);
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
// determine value
if (getUnderlyingValue() == null)
@@ -138,8 +138,8 @@
DependencyItem item = new PropertyPlaceholderDependencyItem(context.getName(), propertyMetaData.getName());
visitor.addDependency(item);
}
- visitor.visit(this); // as in AbstractValueMetaData
- // skip AbstractDependencyVMD.visit() - no value defined
+ visitor.initialVisit(this); // as in AbstractValueMetaData
+ // skip AbstractDependencyVMD.initialVisit() - no value defined
return;
}
else
@@ -147,7 +147,7 @@
throw new IllegalArgumentException("Unknown injection type=" + injectionType);
}
}
- super.visit(visitor);
+ super.initialVisit(visitor);
}
public void toString(JBossStringBuilder buffer)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -82,7 +82,7 @@
return dependentState;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
KernelControllerContext context = visitor.getControllerContext();
if (bean != null)
@@ -90,7 +90,7 @@
DependencyItem item = new InstallationDependencyItem(context.getName());
visitor.addDependency(item);
}
- super.visit(visitor);
+ super.initialVisit(visitor);
}
public void toString(JBossStringBuilder buffer)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -98,10 +98,10 @@
flushJBossObjectCache();
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
visitor.setContextState(state);
- super.visit(visitor);
+ super.initialVisit(visitor);
}
protected void addChildren(Set<MetaDataVisitorNode> children)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -133,10 +133,10 @@
flushJBossObjectCache();
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
visitor.setContextState(ControllerState.CONFIGURED);
- super.visit(visitor);
+ super.initialVisit(visitor);
}
public void addChildren(Set<MetaDataVisitorNode> children)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -73,9 +73,9 @@
return supply;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -71,10 +71,10 @@
return type;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
configurator = visitor.getControllerContext().getKernel().getConfigurator();
- visitor.visit(this);
+ visitor.initialVisit(this);
}
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -79,9 +79,9 @@
return value;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
- visitor.visit(this);
+ visitor.initialVisit(this);
}
public Iterator<? extends MetaDataVisitorNode> getChildren()
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -57,7 +57,7 @@
return result;
}
- public void visit(MetaDataVisitor visitor)
+ public void initialVisit(MetaDataVisitor visitor)
{
KernelControllerContext controllerContext = visitor.getControllerContext();
controller = (KernelController) controllerContext.getController();
@@ -67,6 +67,6 @@
DependencyItem item = new AbstractDependencyItem(value, value, whenRequired, ControllerState.INSTANTIATED);
visitor.addDependency(item);
- super.visit(visitor);
+ super.initialVisit(visitor);
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -68,14 +68,14 @@
*
* @param node the node
*/
- void visit(MetaDataVisitorNode node);
+ void initialVisit(MetaDataVisitorNode node);
/**
* Revisit the node
*
* @param node the node
*/
- void revisit(MetaDataVisitorNode node);
+ void describeVisit(MetaDataVisitorNode node);
/**
* Current meta data visited branch
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitorNode.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitorNode.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitorNode.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -36,14 +36,14 @@
*
* @param vistor the visitor
*/
- public void visit(MetaDataVisitor vistor);
+ public void initialVisit(MetaDataVisitor vistor);
/**
* Revisit the node
*
* @param vistor the visitor
*/
-// public void revisit(MetaDataVisitor vistor);
+// public void describeVisit(MetaDataVisitor vistor);
/**
* Return the child nodes
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2006-08-15 13:01:55 UTC (rev 55948)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2006-08-15 13:20:18 UTC (rev 55949)
@@ -179,11 +179,11 @@
this.bmd = bmd;
}
- public void visit(MetaDataVisitorNode node)
+ public void initialVisit(MetaDataVisitorNode node)
{
}
- public void revisit(MetaDataVisitorNode node)
+ public void describeVisit(MetaDataVisitorNode node)
{
}
@@ -232,7 +232,7 @@
*/
public Object run()
{
- bmd.visit(this);
+ bmd.initialVisit(this);
return null;
}
@@ -241,11 +241,11 @@
*
* @param node the node
*/
- public void visit(MetaDataVisitorNode node)
+ public void initialVisit(MetaDataVisitorNode node)
{
boolean trace = log.isTraceEnabled();
if (trace)
- log.trace("Visit node " + node);
+ log.trace("Initial visit node " + node);
// Visit the children of this node
Iterator children = node.getChildren();
@@ -257,7 +257,7 @@
MetaDataVisitorNode child = (MetaDataVisitorNode) children.next();
try
{
- child.visit(this);
+ child.initialVisit(this);
}
finally
{
@@ -289,7 +289,7 @@
public Object run()
{
visitorNodeStack.push(bmd);
-// bmd.revisit(this);
+// bmd.describeVisit(this);
visitorNodeStack.pop();
visitorNodeStack = null;
return null;
@@ -300,11 +300,11 @@
*
* @param node the node
*/
- public void revisit(MetaDataVisitorNode node)
+ public void describeVisit(MetaDataVisitorNode node)
{
boolean trace = log.isTraceEnabled();
if (trace)
- log.trace("Revisit node " + node);
+ log.trace("Describe visit node " + node);
// Visit the children of this node
Iterator children = node.getChildren();
@@ -317,7 +317,7 @@
visitorNodeStack.push(child);
try
{
-// child.revisit(this);
+// child.describeVisit(this);
}
finally
{
More information about the jboss-cvs-commits
mailing list