[jboss-cvs] JBossAS SVN: r68747 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-01-09 15:22:38 -0500 (Wed, 09 Jan 2008)
New Revision: 68747

Added:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/SimpleValueVertex.java
Removed:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ValueVertex.java
Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java
Log:
Better value vertex name.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java	2008-01-09 20:05:26 UTC (rev 68746)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java	2008-01-09 20:22:38 UTC (rev 68747)
@@ -102,7 +102,7 @@
       if (isValueComplex(value))
          return new ComplexValueVertex(value);
       else
-         return new ValueVertex(value);
+         return new SimpleValueVertex(value);
    }
 
    public Visitor<String> visitor()

Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/SimpleValueVertex.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/SimpleValueVertex.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/SimpleValueVertex.java	2008-01-09 20:22:38 UTC (rev 68747)
@@ -0,0 +1,76 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.kernel.plugins.deployment.props.vertex;
+
+import java.util.Set;
+
+import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.ValueMetaDataAware;
+import org.jboss.kernel.plugins.deployment.props.TreeVertex;
+import org.jboss.util.graph.Vertex;
+
+/**
+ * Simple value vertex.
+ * Single string value.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SimpleValueVertex extends TreeVertex<Vertex<String>>
+{
+   public SimpleValueVertex(String value)
+   {
+      super(value);
+   }
+
+   public void visit(Vertex<String> parent, Set<Vertex<String>> children)
+   {
+      if (parent instanceof ValueMetaDataAware)
+      {
+         StringValueMetaData value = new StringValueMetaData(getName());
+         Set<Vertex<String>> parentsChildren = getChildren(parent);
+         for (Vertex<String> vertex : parentsChildren)
+         {
+            if (vertex == this)
+               continue;
+
+            String name = vertex.getName();
+            if (name.endsWith("type"))
+            {
+               Vertex<String> next = getNext(vertex);
+               value.setType(next.getName());
+            }
+            else if (name.endsWith("trim"))
+            {
+               Vertex<String> next = getNext(vertex);
+               value.setTrim(Boolean.parseBoolean(next.getName()));
+            }
+            else if (name.endsWith("replace"))
+            {
+               Vertex<String> next = getNext(vertex);
+               value.setReplace(Boolean.parseBoolean(next.getName()));
+            }
+         }
+         ValueMetaDataAware valueMetaDataAware = (ValueMetaDataAware)parent;
+         valueMetaDataAware.setValue(value);
+      }
+   }
+}

Deleted: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ValueVertex.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ValueVertex.java	2008-01-09 20:05:26 UTC (rev 68746)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ValueVertex.java	2008-01-09 20:22:38 UTC (rev 68747)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.kernel.plugins.deployment.props.vertex;
-
-import java.util.Set;
-
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
-import org.jboss.beans.metadata.plugins.ValueMetaDataAware;
-import org.jboss.kernel.plugins.deployment.props.TreeVertex;
-import org.jboss.util.graph.Vertex;
-
-/**
- * Value vertex.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ValueVertex extends TreeVertex<Vertex<String>>
-{
-   public ValueVertex(String value)
-   {
-      super(value);
-   }
-
-   public void visit(Vertex<String> parent, Set<Vertex<String>> children)
-   {
-      if (parent instanceof ValueMetaDataAware)
-      {
-         StringValueMetaData value = new StringValueMetaData(getName());
-         Set<Vertex<String>> parentsChildren = getChildren(parent);
-         for (Vertex<String> vertex : parentsChildren)
-         {
-            if (vertex == this)
-               continue;
-
-            String name = vertex.getName();
-            if (name.endsWith("type"))
-            {
-               Vertex<String> next = getNext(vertex);
-               value.setType(next.getName());
-            }
-            else if (name.endsWith("trim"))
-            {
-               Vertex<String> next = getNext(vertex);
-               value.setTrim(Boolean.parseBoolean(next.getName()));
-            }
-            else if (name.endsWith("replace"))
-            {
-               Vertex<String> next = getNext(vertex);
-               value.setReplace(Boolean.parseBoolean(next.getName()));
-            }
-         }
-         ValueMetaDataAware valueMetaDataAware = (ValueMetaDataAware)parent;
-         valueMetaDataAware.setValue(value);
-      }
-   }
-}