Author: gvanmatre
Date: Tue Oct 24 11:48:48 2006
New Revision: 467434
URL: http://svn.apache.org/viewvc?view=rev&rev=467434
Log:
Decoupled the markup parser from the config bean builder.
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/Node.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java?view=diff&rev=467434&r1=467433&r2=467434
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
Tue Oct 24 11:48:48 2006
@@ -42,6 +42,7 @@
import org.apache.shale.clay.parser.Parser;
import org.apache.shale.clay.parser.Token;
import org.apache.shale.clay.parser.builder.Builder;
+import org.apache.shale.clay.parser.builder.BuilderFactory;
import org.apache.shale.util.Messages;
import org.xml.sax.SAXException;
@@ -163,7 +164,7 @@
Iterator ri = roots.iterator();
while (ri.hasNext()) {
Node node = (Node) ri.next();
- Builder renderer = node.getBuilder();
+ Builder renderer = getBuilder(node);
ElementBean child = renderer.createElement(node);
root.addChild(child);
@@ -329,6 +330,18 @@
}
return enc;
+ }
+
+ /**
+ * <p>Returns the [EMAIL PROTECTED]
org.apache.shale.clay.parser.builder.Builder} that
+ * is assigned the task of converting the html node to a corresponding
component
+ * metadata used to construct a JSF resource.</p>
+ *
+ * @param node markup node
+ * @return builder that maps markup to config beans
+ */
+ public Builder getBuilder(Node node) {
+ return BuilderFactory.getRenderer(node);
}
}
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/Node.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/Node.java?view=diff&rev=467434&r1=467433&r2=467434
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/Node.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/Node.java
Tue Oct 24 11:48:48 2006
@@ -26,9 +26,6 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.shale.clay.parser.builder.Builder;
-import org.apache.shale.clay.parser.builder.BuilderFactory;
-
/**
* <p>This class represents a node within a parsed document.</p>
@@ -266,17 +263,6 @@
*/
public void setQname(String qname) {
this.qname = qname;
- }
-
- /**
- * <p>Returns the [EMAIL PROTECTED]
org.apache.shale.clay.parser.builder.Builder} that
- * is assigned the task of converting the html node to a corresponding
component
- * metadata used to construct a JSF resource.</p>
- *
- * @return builder that maps markup to config beans
- */
- public Builder getBuilder() {
- return BuilderFactory.getRenderer(this);
}
/**
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java?view=diff&rev=467434&r1=467433&r2=467434
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
Tue Oct 24 11:48:48 2006
@@ -199,7 +199,7 @@
Iterator ci = node.getChildren().iterator();
while (ci.hasNext()) {
Node child = (Node) ci.next();
- Builder childRenderer = child.getBuilder();
+ Builder childRenderer = getBuilder(child);
ElementBean targetChild = childRenderer.createElement(child);
root.addChild(targetChild);
@@ -381,6 +381,18 @@
}
+ }
+
+ /**
+ * <p>Returns the [EMAIL PROTECTED]
org.apache.shale.clay.parser.builder.Builder} that
+ * is assigned the task of converting the html node to a corresponding
component
+ * metadata used to construct a JSF resource.</p>
+ *
+ * @param node markup node
+ * @return builder that maps markup to config beans
+ */
+ public Builder getBuilder(Node node) {
+ return BuilderFactory.getRenderer(node);
}
}
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java?view=diff&rev=467434&r1=467433&r2=467434
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
Tue Oct 24 11:48:48 2006
@@ -127,7 +127,7 @@
ConverterBean targetConverter = new ConverterBean();
//make sure we have the correct jsfid based on the namespace prefix
- Builder tmpBuilder = node.getBuilder();
+ Builder tmpBuilder = getBuilder(node);
ElementBean tmp = tmpBuilder.createElement(node);
String jsfid = tmp.getJsfid();
@@ -191,7 +191,7 @@
ValidatorBean targetValidator = new ValidatorBean();
//make sure we have the correct jsfid based on the namespace prefix
- Builder tmpBuilder = node.getBuilder();
+ Builder tmpBuilder = getBuilder(node);
ElementBean tmp = tmpBuilder.createElement(node);
String jsfid = tmp.getJsfid();
@@ -232,7 +232,7 @@
ActionListenerBean targetActionListener = new ActionListenerBean();
//make sure we have the correct jsfid based on the namespace prefix
- Builder tmpBuilder = node.getBuilder();
+ Builder tmpBuilder = getBuilder(node);
ElementBean tmp = tmpBuilder.createElement(node);
String jsfid = tmp.getJsfid();
@@ -261,7 +261,7 @@
ValueChangeListenerBean targetValueChangeListener = new
ValueChangeListenerBean();
//make sure we have the correct jsfid based on the namespace prefix
- Builder tmpBuilder = node.getBuilder();
+ Builder tmpBuilder = getBuilder(node);
ElementBean tmp = tmpBuilder.createElement(node);
String jsfid = tmp.getJsfid();
@@ -345,7 +345,7 @@
while (ci.hasNext()) {
Node child = (Node) ci.next();
if (child.isWellFormed()) {
- Builder childBuilder = child.getBuilder();
+ Builder childBuilder = getBuilder(child);
ElementBean nextTarget = childBuilder.createElement(child);
nextTarget.setFacetName(facetName);
target.addChild(nextTarget);
@@ -448,4 +448,17 @@
return jsfid.toString();
}
+
+ /**
+ * <p>Returns the [EMAIL PROTECTED]
org.apache.shale.clay.parser.builder.Builder} that
+ * is assigned the task of converting the html node to a corresponding
component
+ * metadata used to construct a JSF resource.</p>
+ *
+ * @param node markup node
+ * @return builder that maps markup to config beans
+ */
+ public Builder getBuilder(Node node) {
+ return BuilderFactory.getRenderer(node);
+ }
+
}
