Author: DartPeng Date: 2008-09-26 02:22:23 -0400 (Fri, 26 Sep 2008) New Revision: 10493 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/.classpath trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/build.properties trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java Log: delete the freemarker.jar. I will find other way to instead of it. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/.classpath =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/.classpath 2008-09-26 06:21:37 UTC (rev 10492) +++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/.classpath 2008-09-26 06:22:23 UTC (rev 10493) @@ -4,6 +4,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/> - <classpathentry kind="lib" path="libs/freemarker-2.3.8.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/build.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/build.properties 2008-09-26 06:21:37 UTC (rev 10492) +++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/build.properties 2008-09-26 06:22:23 UTC (rev 10493) @@ -3,5 +3,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - libs/dom4j-1.6.1.jar,\ - libs/freemarker-2.3.8.jar + libs/dom4j-1.6.1.jar Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java 2008-09-26 06:21:37 UTC (rev 10492) +++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java 2008-09-26 06:22:23 UTC (rev 10493) @@ -13,15 +13,7 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import java.util.Enumeration; -import org.jboss.tools.smooks.java2xml.utils.XMLConstants; - -import freemarker.core.TemplateElement; -import freemarker.core.TextBlock; -import freemarker.template.Configuration; -import freemarker.template.Template; - /** * @author Dart Peng * @Date : Sep 25, 2008 @@ -29,14 +21,14 @@ public class FreeMarkerContentReplacer { public String replaceFreeMarkerTemplate(Reader reader) throws IOException { - - Configuration fmConfiguration = new Configuration(); - fmConfiguration.setTagSyntax(Configuration.AUTO_DETECT_TAG_SYNTAX); StringBuffer buffer = new StringBuffer(); - Template template; - template = new Template("XML2Java_FreeMarker", reader, fmConfiguration); - TemplateElement root = template.getRootTreeNode(); - visitTemplateElement(root, buffer); +// Configuration fmConfiguration = new Configuration(); +// fmConfiguration.setTagSyntax(Configuration.AUTO_DETECT_TAG_SYNTAX); +// +// Template template; +// template = new Template("XML2Java_FreeMarker", reader, fmConfiguration); +// TemplateElement root = template.getRootTreeNode(); +// visitTemplateElement(root, buffer); return buffer.toString(); } @@ -46,39 +38,39 @@ return replaceFreeMarkerTemplate(reader); } - private void visitTemplateElement(TemplateElement model, StringBuffer buffer) { +// private void visitTemplateElement(TemplateElement model, StringBuffer buffer) { - Enumeration children = ((TemplateElement) model).children(); - if (!"MixedContent".equals(model.getNodeName())) { - buffer - .append("<" - + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME - + " " - + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE - + "= \"" + model.getDescription() + "\">"); - } - while (children.hasMoreElements()) { - Object obj = children.nextElement(); - if (!(obj instanceof TextBlock)) { - TemplateElement child = (TemplateElement) obj; - String str = child.getSource(); - if (child.isLeaf()) { - if (child.getNodeName().equals("DollarVariable")) { - buffer.append(child.getSource()); - } else { - buffer.append(child.getDescription()); - } - continue; - } - visitTemplateElement(child, buffer); - } else { - buffer.append(obj); - } - } - if (!"MixedContent".equals(model.getNodeName())) { - buffer.append("</" - + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME - + ">"); - } - } +// Enumeration children = ((TemplateElement) model).children(); +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer +// .append("<" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + " " +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE +// + "= \"" + model.getDescription() + "\">"); +// } +// while (children.hasMoreElements()) { +// Object obj = children.nextElement(); +// if (!(obj instanceof TextBlock)) { +// TemplateElement child = (TemplateElement) obj; +// String str = child.getSource(); +// if (child.isLeaf()) { +// if (child.getNodeName().equals("DollarVariable")) { +// buffer.append(child.getSource()); +// } else { +// buffer.append(child.getDescription()); +// } +// continue; +// } +// visitTemplateElement(child, buffer); +// } else { +// buffer.append(obj); +// } +// } +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer.append("</" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + ">"); +// } +// } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java 2008-09-26 06:21:37 UTC (rev 10492) +++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java 2008-09-26 06:22:23 UTC (rev 10493) @@ -15,7 +15,7 @@ * @Date : Sep 25, 2008 */ public class XMLConstants { - public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME = "adfafdafafda_dfafda"; + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME = "replaceElementNameForFreeMarker"; public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE = "desc"; Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java 2008-09-26 06:21:37 UTC (rev 10492) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java 2008-09-26 06:22:23 UTC (rev 10493) @@ -10,18 +10,11 @@ ******************************************************************************/ package org.jboss.tools.smooks.test.xml; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; import junit.framework.TestCase; -import org.dom4j.Document; import org.dom4j.DocumentException; -import org.dom4j.io.SAXReader; -import org.jboss.tools.smooks.java2xml.analyzer.DOM2FreeMarkerTransformor; -import org.jboss.tools.smooks.java2xml.analyzer.FreeMarkerContentReplacer; /** * @author Dart Peng @@ -29,17 +22,17 @@ */ public class FreeMarkerTest extends TestCase { public void testParse() throws DocumentException, IOException { - Reader reader = new InputStreamReader(FreeMarkerTest.class - .getResourceAsStream("test.flt")); - FreeMarkerContentReplacer replacer = new FreeMarkerContentReplacer(); - String contents = replacer.replaceFreeMarkerTemplate(reader); - System.out.println(contents); - - SAXReader sax = new SAXReader(); - Document doc = sax.read(new ByteArrayInputStream(contents.getBytes())); - DOM2FreeMarkerTransformor trans = new DOM2FreeMarkerTransformor(); - String result = trans.transformDOM(doc); - - System.out.println(result); +// Reader reader = new InputStreamReader(FreeMarkerTest.class +// .getResourceAsStream("test.flt")); +// FreeMarkerContentReplacer replacer = new FreeMarkerContentReplacer(); +// String contents = replacer.replaceFreeMarkerTemplate(reader); +// System.out.println(contents); +// +// SAXReader sax = new SAXReader(); +// Document doc = sax.read(new ByteArrayInputStream(contents.getBytes())); +// DOM2FreeMarkerTransformor trans = new DOM2FreeMarkerTransformor(); +// String result = trans.transformDOM(doc); +// +// System.out.println(result); } }