Author: DartPeng Date: 2008-11-05 04:58:32 -0500 (Wed, 05 Nov 2008) New Revision: 11517 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java Log: JBIDE-2988 Extract the check method and put it in the UiUtil class. Add the selector check in java bean analyzer. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 09:49:54 UTC (rev 11516) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 09:58:32 UTC (rev 11517) @@ -690,6 +690,7 @@ public Object buildSourceInputObjects(GraphInformations graphInfo, SmooksResourceListType listType, IFile sourceFile) throws InvocationTargetException { + UIUtils.checkSelector(listType); return this.buildSourceInputObjects(graphInfo, listType, sourceFile, null); } @@ -697,6 +698,7 @@ public Object buildTargetInputObjects(GraphInformations graphInfo, SmooksResourceListType listType, IFile sourceFile) throws InvocationTargetException { + UIUtils.checkSelector(listType); return this.buildTargetInputObjects(graphInfo, listType, sourceFile, null); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-05 09:49:54 UTC (rev 11516) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-05 09:58:32 UTC (rev 11517) @@ -32,6 +32,9 @@ import org.jboss.tools.smooks.javabean.analyzer.JavaModelConnectionResolveCommand; import org.jboss.tools.smooks.javabean.analyzer.JavaModelResolveCommand; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.AbstractResourceConfig; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.model.util.SmooksModelUtils; import org.jboss.tools.smooks.ui.SmooksUIActivator; import org.jboss.tools.smooks.ui.ViewerInitorStore; @@ -51,6 +54,9 @@ */ public class UIUtils { + public static final String[] SELECTORE_SPLITER = new String[] { ":", "\\", + "/" }; + public static FillLayout createFillLayout(int marginW, int marginH) { FillLayout fill = new FillLayout(); fill.marginHeight = marginH; @@ -58,7 +64,46 @@ return fill; } - public static void assignConnectionPropertyToBinding( + public static void checkSelector(String selector) + throws InvocationTargetException { + if (selector == null) + return; + for (int i = 0; i < SELECTORE_SPLITER.length; i++) { + String splitString = SELECTORE_SPLITER[i]; + if (selector.indexOf(splitString) != -1) { + throw new InvocationTargetException(new Exception( + "The Selector string dosen't support \"" + splitString + + "\" character")); + } + } + } + + public static void checkSelector(SmooksResourceListType listType) + throws InvocationTargetException { + List<AbstractResourceConfig> lists = listType + .getAbstractResourceConfig(); + for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator + .hasNext();) { + ResourceConfigType resourceConfig = (ResourceConfigType) iterator + .next(); + String selector = resourceConfig.getSelector(); + UIUtils.checkSelector(selector); + List<Object> list = SmooksModelUtils + .getBindingListFromResourceConfigType(resourceConfig); + if (list == null) + continue; + for (Iterator<Object> iterator2 = list.iterator(); iterator2 + .hasNext();) { + AnyType binding = (AnyType) iterator2.next(); + String bindingMessage = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + UIUtils.checkSelector(bindingMessage); + } + } + } + + public static void assignConnectionPropertyToBinding( LineConnectionModel connection, AnyType binding, String[] ignorePropertiesName) { Object[] bindingPros = connection.getPropertyArray(); @@ -68,12 +113,13 @@ String pname = property.getName(); for (int j = 0; j < ignorePropertiesName.length; j++) { String ignoreName = ignorePropertiesName[j]; - if(pname.equals(ignoreName)){ + if (pname.equals(ignoreName)) { ignore = true; break; } } - if(ignore) continue; + if (ignore) + continue; String pvalue = property.getValue(); binding.getAnyAttribute() .add( @@ -82,8 +128,8 @@ } } - public static void assignBindingPropertyToMappingModel(AnyType binding, MappingModel model, - Object[] ignoreProperties) { + public static void assignBindingPropertyToMappingModel(AnyType binding, + MappingModel model, Object[] ignoreProperties) { FeatureMap it = binding.getAnyAttribute(); for (int i = 0; i < it.size(); i++) { EStructuralFeature feature = it.getEStructuralFeature(i); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 09:49:54 UTC (rev 11516) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 09:58:32 UTC (rev 11517) @@ -11,16 +11,11 @@ package org.jboss.tools.smooks.xml2java.analyzer; import java.lang.reflect.InvocationTargetException; -import java.util.Iterator; -import java.util.List; import org.eclipse.core.resources.IFile; -import org.eclipse.emf.ecore.xml.type.AnyType; import org.jboss.tools.smooks.graphical.GraphInformations; -import org.jboss.tools.smooks.model.AbstractResourceConfig; -import org.jboss.tools.smooks.model.ResourceConfigType; import org.jboss.tools.smooks.model.SmooksResourceListType; -import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.utils.UIUtils; /** * @author Dart Peng<br> @@ -28,8 +23,6 @@ */ public class XMLSourceModelAnalyzer extends AbstractXMLModelAnalyzer { - public static final String[] SELECTORE_SPLITER = new String[] { ":", "\\", "/" }; - public XMLSourceModelAnalyzer() { super("sourceDataPath"); } @@ -38,40 +31,7 @@ public Object buildSourceInputObjects(GraphInformations graphInfo, SmooksResourceListType listType, IFile sourceFile) throws InvocationTargetException { - List<AbstractResourceConfig> lists = listType - .getAbstractResourceConfig(); - for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator - .hasNext();) { - ResourceConfigType resourceConfig = (ResourceConfigType) iterator - .next(); - String selector = resourceConfig.getSelector(); - checkBindingSelector(selector); - List<Object> list = SmooksModelUtils - .getBindingListFromResourceConfigType(resourceConfig); - if(list == null) continue; - for (Iterator<Object> iterator2 = list.iterator(); iterator2 - .hasNext();) { - AnyType binding = (AnyType) iterator2.next(); - String bindingMessage = SmooksModelUtils - .getAttributeValueFromAnyType(binding, - SmooksModelUtils.ATTRIBUTE_SELECTOR); - checkBindingSelector(bindingMessage); - } - } + UIUtils.checkSelector(listType); return super.buildSourceInputObjects(graphInfo, listType, sourceFile); } - - protected void checkBindingSelector(String message) - throws InvocationTargetException { - if(message == null) return; - for (int i = 0; i < SELECTORE_SPLITER.length; i++) { - String splitString = SELECTORE_SPLITER[i]; - if (message.indexOf(splitString) != -1) { - throw new InvocationTargetException(new Exception( - "[XML] The Selector string dosen't support \"" - + splitString + "\" character")); - } - } - } - }