[jbosstools-commits] JBoss Tools SVN: r26309 - in trunk/smooks/plugins: org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util and 2 other directories.

Author: tfennelly Date: 2010-11-05 13:45:07 -0400 (Fri, 05 Nov 2010) New Revision: 26309 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java Log: https://jira.jboss.org/browse/JBIDE-7445 Java Source to target (templating) configs not reopening properly Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java 2010-11-05 17:11:37 UTC (rev 26308) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java 2010-11-05 17:45:07 UTC (rev 26309) @@ -442,7 +442,7 @@ * @return The fully resolved path. */ public String resolveMappingSrcPath(Mapping mapping) { - String[] srcPathTokens = mapping.getSrcPath().split("\\."); + String[] srcPathTokens = mapping.getSrcPath().split("/"); if(srcPathTokens.length > 1) { CollectionMapping parentCollection = findParentCollection(srcPathTokens[0], mapping); @@ -451,7 +451,7 @@ pathBuilder.append(resolveMappingSrcPath(parentCollection)); for(int i = 1; i < srcPathTokens.length; i++) { - pathBuilder.append('.'); + pathBuilder.append('/'); pathBuilder.append(srcPathTokens[i]); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-11-05 17:11:37 UTC (rev 26308) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-11-05 17:45:07 UTC (rev 26309) @@ -121,8 +121,12 @@ public static String toPath(String srcPath, boolean nodeModelSource) { if(nodeModelSource) { StringBuilder builder = new StringBuilder(); - String[] tokens = srcPath.split("\\."); + if(srcPath.startsWith("/") && srcPath.length() > 0) { + srcPath = srcPath.substring(1); + } + + String[] tokens = srcPath.split("/"); builder.append(".vars[\"").append(tokens[0]).append("\"]"); if(tokens.length > 1) { builder.append("[\""); @@ -145,7 +149,7 @@ public static String normalizePath(String srcPath) { Matcher matcher = varsPattern.matcher(srcPath); if(matcher.matches()) { - return matcher.group(1) + "." + matcher.group(2).replace('/', '.'); + return matcher.group(1) + "/" + matcher.group(2); } else { return srcPath; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2010-11-05 17:11:37 UTC (rev 26308) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2010-11-05 17:45:07 UTC (rev 26309) @@ -26,6 +26,7 @@ import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; import org.jboss.tools.smooks.graphical.editors.model.IValidatableModel; +import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel; import org.w3c.dom.Node; /** @@ -413,7 +414,7 @@ } public TreeNodeModel getModelNode(String srcPath) { - String[] pathTokens = srcPath.split("\\."); + String[] pathTokens = srcPath.split("/"); if(pathTokens.length > 0) { return getModeNode(pathTokens, 0); @@ -485,8 +486,7 @@ TagObject tagObj = (TagObject) childData; if(tagObj.getName().equals(nodeName)) { isMatch = true; - } - + } } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java 2010-11-05 17:11:37 UTC (rev 26308) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java 2010-11-05 17:45:07 UTC (rev 26309) @@ -188,11 +188,11 @@ } if(currentNode == sourceCollectionDomNode) { - builder.insert(0, collectionMapping.getCollectionItemName() + "."); + builder.insert(0, collectionMapping.getCollectionItemName() + "/"); } } else { // No parent connection... just use the connection source path... - builder.append(SmooksUIUtils.generateFullPath((IXMLStructuredObject) sourceNodeModel.getData(), ".")); + builder.append(SmooksUIUtils.generateFullPath((IXMLStructuredObject) sourceNodeModel.getData(), "/")); } if(builder.length() > 1 && builder.charAt(0) == '.') {