Author: tfennelly Date: 2010-09-04 10:00:24 -0400 (Sat, 04 Sep 2010) New Revision: 24723 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/SmooksModelUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ModelFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ResourceFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/FreemarkerFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ResourceConfigFilter.java Removed: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/impl/AbstractAnyTypeImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanStrucutredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TextTypeSwicher.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/DeleteTaskNodeAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ProcessAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/CreateFreemarkerTemplateModelCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerCSVTemplateGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerXMLTemplateCreationWizard.java Log: https://jira.jboss.org/browse/JBIDE-6992 Add DOM NodeModel config when Templating Tasks are connected from the Input Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2010-09-04 14:00:24 UTC (rev 24723) @@ -13,7 +13,8 @@ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.jboss.tools.smooks.core, +Export-Package: org.jboss.tools.smooks, + org.jboss.tools.smooks.core, org.jboss.tools.smooks.model.common, org.jboss.tools.smooks.model.common.impl, org.jboss.tools.smooks.model.common.provider, @@ -46,6 +47,7 @@ org.jboss.tools.smooks.model.smooks.impl, org.jboss.tools.smooks.model.smooks.provider, org.jboss.tools.smooks.model.smooks.util, - org.jboss.tools.smooks10.model.smooks.util + org.jboss.tools.smooks10.model.smooks.util, + org.jboss.tools.smooks10.model.smooks.util.filters Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/SmooksModelUtils.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/SmooksModelUtils.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -0,0 +1,761 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CompoundCommand; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.util.ExtendedMetaData; +import org.eclipse.emf.ecore.util.FeatureMapUtil; +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.eclipse.emf.ecore.xml.type.XMLTypePackage; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.CommandParameter; +import org.eclipse.emf.edit.command.RemoveCommand; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.jboss.tools.smooks.core.SmooksInputType; +import org.jboss.tools.smooks.model.freemarker.Freemarker; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; +import org.jboss.tools.smooks.model.smooks.ConditionType; +import org.jboss.tools.smooks.model.smooks.ConditionsType; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; + +/** + * @author Dart Peng + * + */ + +public class SmooksModelUtils { + + public static final String KEY_TEMPLATE_TYPE = "messageType"; //$NON-NLS-1$ + + public static final String TEMPLATE_DATA_PROVIDER_PARAM_NAME = "templateDataProvider"; //$NON-NLS-1$ + + public static final String FREEMARKER_TEMPLATE_TYPE_CSV = "CSV"; //$NON-NLS-1$ + + public static final String FREEMARKER_TEMPLATE_TYPE_XML = "XML"; //$NON-NLS-1$ + + public static final String KEY_CSV_FIELDS = "csvFields"; //$NON-NLS-1$ + + public static final String KEY_INCLUDE_FIELD_NAMES = "includeFieldNames"; //$NON-NLS-1$ + + public static final String KEY_TASK_ID_REF = "idref"; //$NON-NLS-1$ + + public static final String KEY_OBJECT_ID = "id"; //$NON-NLS-1$ + + public static final String KEY_XML_FILE_TYPE = "modelSrcType"; //$NON-NLS-1$ + + public static final String KEY_XML_FILE_PATH = "modelSrc"; //$NON-NLS-1$ + + public static final String KEY_XML_ROOT_NAME = "rootElementName"; //$NON-NLS-1$ + + public static final String KEY_XML_FILE_TYPE_XSD = "XSD"; //$NON-NLS-1$ + + public static final String KEY_XML_FILE_TYPE_XML = "XML"; //$NON-NLS-1$ + + public static final String KEY_CSV_SEPERATOR = "seperator"; //$NON-NLS-1$ + + public static final String KEY_CSV_QUOTE = "quote"; //$NON-NLS-1$ + + public static final String INPUT_TYPE_JAVA = SmooksInputType.INPUT_TYPE_JAVA; + + public static final String INPUT_TYPE = "inputType"; //$NON-NLS-1$ + + public static final String INPUT_TYPE_CUSTOME = SmooksInputType.INPUT_TYPE_CUSTOM; + + public static final String INPUT_TYPE_JSON_1_1 = SmooksInputType.INPUT_TYPE_JSON; + + public static final String INPUT_TYPE_CSV = SmooksInputType.INPUT_TYPE_CSV; + + public static final String INPUT_ACTIVE_TYPE = "input.type.actived"; //$NON-NLS-1$ + + public static final String INPUT_DEACTIVE_TYPE = "input.type.deactived"; //$NON-NLS-1$ + + public static final String INPUT_TYPE_CSV_1_2 = SmooksInputType.INPUT_TYPE_CSV; + + public static final String PARAM_NAME_CLASS = "class"; //$NON-NLS-1$ + + public static final String PARAM_NAME_PATH = "path"; //$NON-NLS-1$ + + public static final String PARAM_NAME_ACTIVED = "actived"; //$NON-NLS-1$ + + public static final String INPUT_TYPE_XML = SmooksInputType.INPUT_TYPE_XML; + + public static final String INPUT_TYPE_XSD = SmooksInputType.INPUT_TYPE_XSD; + + public static final String TYPE_XSL = "xsl"; //$NON-NLS-1$ + + public static final String[] TEMPLATE_TYPES = new String[] { "xsl", "ftl" }; //$NON-NLS-1$ //$NON-NLS-2$ + + public static final String BEAN_CLASS = "beanClass"; //$NON-NLS-1$ + + public static final String BEAN_ID = "beanId"; //$NON-NLS-1$ + + public static final String BINDINGS = "bindings"; //$NON-NLS-1$ + + public static final String INPUT_TYPE_EDI_1_1 = SmooksInputType.INPUT_TYPE_EDI; + + public static final String INPUT_TYPE_EDI_1_2 = SmooksInputType.INPUT_TYPE_EDI; + + public static final String INPUT_TYPE_JSON_1_2 = SmooksInputType.INPUT_TYPE_JSON; + + public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE.demandFeature(null, "property", //$NON-NLS-1$ + false); + + public static EStructuralFeature ATTRIBUTE_SELECTOR = ExtendedMetaData.INSTANCE.demandFeature(null, "selector", //$NON-NLS-1$ + false); + + public static EStructuralFeature ATTRIBUTE_TYPE = ExtendedMetaData.INSTANCE.demandFeature(null, "type", false); //$NON-NLS-1$ + + public static EStructuralFeature ELEMENT_BINDING = ExtendedMetaData.INSTANCE.demandFeature( + "http://www.milyn.org/xsd/smooks-1.0.xsd", "binding", true); //$NON-NLS-1$ //$NON-NLS-2$ + + // public static AnyType addBindingTypeToParamType(ParamType param, String + // property, String selector, String type, + // String uri) { + // AnyType binding = createBindingType(property, selector, type, uri); + // param.getMixed().add(ELEMENT_BINDING, binding); + // return binding; + // } + // + // public static List<Object> + // getBindingListFromResourceConfigType(ResourceConfigType resourceConfig) { + // List<ParamType> paramList = resourceConfig.getParam(); + // for (Iterator<ParamType> iterator = paramList.iterator(); + // iterator.hasNext();) { + // ParamType param = iterator.next(); + // if ("bindings".equals(param.getName())) { + // if (param.eContents().isEmpty()) + // continue; + // List<Object> bindingList = (List<Object>) + // param.getMixed().list(SmooksModelUtils.ELEMENT_BINDING); + // return bindingList; + // } + // } + // return Collections.emptyList(); + // } + // + // public static boolean isBeanPopulatorResource(ResourceConfigType type) { + // ResourceType resource = type.getResource(); + // if (resource == null) + // return false; + // String value = resource.getStringValue(); + // if (value != null) + // value = value.trim(); + // if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { + // return true; + // } + // return false; + // } + + public static void setPropertyValueToAnyType(Object value, EStructuralFeature attribute, AnyType anyType) { + anyType.getAnyAttribute().set(attribute, value); + } + + // public static AnyType getBindingViaProperty(ResourceConfigType + // resourceConfig, String property) { + // List bindingList = getBindingListFromResourceConfigType(resourceConfig); + // for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) { + // AnyType binding = (AnyType) iterator.next(); + // String pro = getAttributeValueFromAnyType(binding, ATTRIBUTE_PROPERTY); + // if (pro != null) + // pro = pro.trim(); + // if (property.equals(pro)) { + // return binding; + // } + // } + // return null; + // } + // + // public static boolean isInnerFileContents(ResourceConfigType + // resourceConfig) { + // ResourceType resource = resourceConfig.getResource(); + // if (resource == null) + // return false; + // String type = resource.getType(); + // if (type != null) + // type = type.trim(); + // for (int i = 0; i < TEMPLATE_TYPES.length; i++) { + // String type1 = TEMPLATE_TYPES[i]; + // if (type1.equalsIgnoreCase(type)) + // return true; + // } + // return false; + // } + // + // public static boolean isDateTypeSelector(ResourceConfigType type) { + // ResourceType resource = type.getResource(); + // if (resource == null) + // return false; + // String value = resource.getStringValue(); + // if (value != null) + // value = value.trim(); + // for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + // String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; + // if (decoderClass.equals(value)) { + // return true; + // } + // } + // return false; + // } + // + // public static String getTransformType(ResourceConfigType resourceConfig) + // { + // ParamType typeParam = null; + // if (resourceConfig == null) + // return ""; + // if (isTransformTypeResourceConfig(resourceConfig)) { + // List paramList = resourceConfig.getParam(); + // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + // ParamType param = (ParamType) iterator.next(); + // String name = param.getName(); + // if (name != null) + // name = name.trim(); + // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(name)) { + // typeParam = param; + // break; + // } + // } + // if (typeParam != null) { + // return SmooksModelUtils.getAnyTypeText(typeParam); + // } + // } + // return ""; + // } + // + // public static void setTransformType(ResourceConfigType resourceConfig, + // String type) { + // if (type == null) + // type = ""; + // if (isTransformTypeResourceConfig(resourceConfig)) { + // List paramList = resourceConfig.getParam(); + // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + // ParamType param = (ParamType) iterator.next(); + // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param.getName())) { + // cleanTextToSmooksType(param); + // setTextToAnyType(param, type); + // } + // } + // } + // } + // + // public static boolean isFilePathResourceConfig(ResourceConfigType + // resourceConfig) { + // ResourceType resource = resourceConfig.getResource(); + // if (resource != null) { + // String value = resource.getStringValue(); + // if (value != null) { + // if (value.startsWith("\\")) { + // return true; + // } + // if (value.startsWith("/")) { + // return true; + // } + // } + // } + // return false; + // } + // + // public static boolean isTransformTypeResourceConfig(ResourceConfigType + // resourceConfig) { + // String selector = resourceConfig.getSelector(); + // if (selector != null) + // selector = selector.trim(); + // if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { + // return false; + // } + // + // if (resourceConfig.getParam().isEmpty()) { + // return false; + // } else { + // List paramList = resourceConfig.getParam(); + // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + // ParamType p = (ParamType) iterator.next(); + // String paramName = p.getName(); + // if (paramName != null) + // paramName = paramName.trim(); + // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(paramName)) { + // return true; + // } + // } + // return false; + // } + // } + // + // public static void setParamText(String paramName, String value, + // ResourceConfigType resourceConfigType) { + // List<ParamType> list = resourceConfigType.getParam(); + // ParamType param = null; + // for (Iterator<ParamType> iterator = list.iterator(); iterator.hasNext();) + // { + // ParamType paramType = (ParamType) iterator.next(); + // String n = paramType.getName(); + // if (n == null) + // continue; + // n = n.trim(); + // if (n.equalsIgnoreCase(paramName)) { + // param = paramType; + // break; + // } + // } + // if (param == null) { + // param = SmooksFactory.eINSTANCE.createParamType(); + // param.setName(paramName); + // resourceConfigType.getParam().add(param); + // } + // setTextToAnyType(param, value); + // } + // + // public static String getParmaText(String paramName, ResourceConfigType + // resourceConfigType) { + // List plist = resourceConfigType.getParam(); + // for (Iterator iterator = plist.iterator(); iterator.hasNext();) { + // ParamType p = (ParamType) iterator.next(); + // String n = p.getName(); + // if (n == null) + // continue; + // n = n.trim(); + // if (paramName.equalsIgnoreCase(n)) { + // return getAnyTypeText(p); + // } + // } + // return null; + // } + + public static String getAttributeValueFromAnyType(AnyType anyType, EStructuralFeature attribute) { + String value = (String) anyType.getAnyAttribute().get(attribute, false); + return value; + } + + public static String getAnyTypeText(AnyType anyType) { + Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); + if (value != null) { + if (value instanceof List && !((List<?>) value).isEmpty()) { + Object v = ((List<?>) value).get(0); + if (v != null) { + return v.toString().trim(); + } + } + // return value.toString(); + } + return null; + } + + public static String getAnyTypeCDATA(AnyType anyType) { + Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); + if (value != null) { + if (value instanceof List && !((List) value).isEmpty()) { + Object v = ((List) value).get(0); + if (v != null) { + return v.toString().trim(); + } + } + // return value.toString(); + } + return null; + } + + public static String getAnyTypeComment(AnyType anyType) { + EList<Object> value = anyType.getMixed().list(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT); + if (value != null && !value.isEmpty()) { + Object v = ((List<?>) value).get(0); + if (v != null) { + return v.toString().trim(); + } + // return value.toString(); + } + return null; + } + + // public static AnyType createBindingType(String property, String selector, + // String type, String uri) { + // if (uri == null) { + // uri = SmooksPackage.eNS_URI; + // } + // + // AnyType binding = (AnyType) + // EcoreUtil.create(XMLTypePackage.Literals.ANY_TYPE); + // if (property != null) { + // binding.getAnyAttribute().add(ATTRIBUTE_PROPERTY, property); + // } + // + // if (selector != null) { + // binding.getAnyAttribute().add(ATTRIBUTE_SELECTOR, selector); + // } + // if (type != null) { + // binding.getAnyAttribute().add(ATTRIBUTE_TYPE, false); + // } + // return binding; + // } + + public static void appendTextToSmooksType(AnyType smooksModel, String text) { + smooksModel.getMixed().add(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); + } + + public static void setTextToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String text) { + CompoundCommand ccommand = new CompoundCommand(); + Command addCommand = null; + if (text != null) { + addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text)); + } + Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true)); + if (removeValue != null && removeValue instanceof Collection<?>) { + List<Object> rList = new ArrayList<Object>(); + for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { + Object string = (Object) iterator.next(); + rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, string)); + } + Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); + if (cc != null && cc.canExecute()) { + ccommand.append(cc); + } + } + if (addCommand != null && addCommand.canExecute()) { + ccommand.append(addCommand); + } + if (smooksModel.eContainer() == null) { + ccommand.execute(); + } else { + editingDomain.getCommandStack().execute(ccommand); + } + } + + public static void setCommentToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String comment) { + CompoundCommand ccommand = new CompoundCommand(); + Command addCommand = null; + if (comment != null) { + addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, comment)); + } + Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, true)); + if (removeValue != null && removeValue instanceof Collection<?>) { + List<Object> rList = new ArrayList<Object>(); + for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { + Object string = (Object) iterator.next(); + rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, string)); + } + Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); + if (cc != null && cc.canExecute()) { + ccommand.append(cc); + } + } + if (addCommand != null && addCommand.canExecute()) { + ccommand.append(addCommand); + } + if (smooksModel.eContainer() == null) { + ccommand.execute(); + } else { + editingDomain.getCommandStack().execute(ccommand); + } + } + + public static void setCDATAToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String cdata) { + CompoundCommand ccommand = new CompoundCommand(); + Command addCommand = null; + if (cdata != null) { + addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, cdata)); + } + Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true)); + if (removeValue != null && removeValue instanceof Collection<?>) { + List<Object> rList = new ArrayList<Object>(); + for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { + Object string = (Object) iterator.next(); + rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, string)); + } + Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); + if (cc != null && cc.canExecute()) { + ccommand.append(cc); + } + } + if (addCommand != null && addCommand.canExecute()) { + ccommand.append(addCommand); + } + if (smooksModel.eContainer() == null) { + ccommand.execute(); + } else { + editingDomain.getCommandStack().execute(ccommand); + } + } + + public static void appendCDATAToSmooksType(AnyType smooksModel, String text) { + smooksModel.getMixed().add(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, text); + } + + /** + * @deprecated + * @param smooksModel + * @param text + */ + public static void setTextToAnyType(AnyType smooksModel, String text) { + cleanTextToSmooksType(smooksModel); + appendTextToSmooksType(smooksModel, text); + } + + /** + * @deprecated + * @param smooksModel + * @param text + */ + public static void setCDATAToAnyType(AnyType smooksModel, String text) { + cleanCDATAToSmooksType(smooksModel); + appendCDATAToSmooksType(smooksModel, text); + } + + public static void cleanTextToSmooksType(AnyType smooksModel) { + Object obj = smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); + if (obj instanceof List) { + ((List) obj).clear(); + } + } + + public static void cleanCDATAToSmooksType(AnyType smooksModel) { + Object obj = smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); + if (obj instanceof List) { + ((List) obj).clear(); + } + } + + public static CommandParameter createTextCommandParamter(Object owner, String value) { + return createChildParameter(owner, XMLTypePackage.Literals.ANY_TYPE__MIXED, FeatureMapUtil.createEntry( + XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, value)); + } + + public static CommandParameter createChildParameter(Object owner, Object feature, Object child) { + return new CommandParameter(owner, feature, child); + } + + // public static String getInputPath(InputType input) { + // List<org.jboss.tools.smooks.model.graphics.ext.ParamType> list = + // input.getParam(); + // if (INPUT_TYPE_JAVA.equals(input.getType()) || + // INPUT_TYPE_XML.equals(input.getType()) + // || INPUT_TYPE_XSD.equals(input.getType()) || + // INPUT_TYPE_JSON_1_1.equals(input.getType()) + // || INPUT_TYPE_JSON_1_2.equals(input.getType()) || + // INPUT_TYPE_CSV.equals(input.getType()) + // || INPUT_TYPE_EDI_1_1.equals(input.getType()) || + // INPUT_TYPE_EDI_1_2.equals(input.getType()) + // || INPUT_TYPE_CSV_1_2.equals(input.getType())) { + // for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + // org.jboss.tools.smooks.model.graphics.ext.ParamType paramType = + // (org.jboss.tools.smooks.model.graphics.ext.ParamType) iterator + // .next(); + // if ("path".equals(paramType.getName())) { + // String value = paramType.getValue(); + // if (value != null) + // value = value.trim(); + // return value; + // } + // } + // } + // return null; + // } + + public static List<ConditionType> collectConditionType(SmooksResourceListType resourceList) { + ConditionsType conditions = resourceList.getConditions(); + if (conditions != null) { + return conditions.getCondition(); + } + return Collections.emptyList(); + } + + public static List<org.jboss.tools.smooks.model.smooks.ParamType> getParams(AnyType model) { + if (model == null) + return Collections.emptyList(); + List<org.jboss.tools.smooks.model.smooks.ParamType> obj = model.getMixed().list( + org.jboss.tools.smooks.model.smooks.SmooksPackage.Literals.DOCUMENT_ROOT__PARAM); + return obj; + } + + public static void addParam(AnyType model, org.jboss.tools.smooks.model.smooks.ParamType param) { + if (model == null) + return; + model.getMixed().add( + XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry( + org.jboss.tools.smooks.model.smooks.SmooksPackage.Literals.DOCUMENT_ROOT__PARAM, param)); + } + + public static char getFreemarkerCSVSeperator(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_SEPERATOR); + if (typeParam != null) { + String value = typeParam.getStringValue(); + if (value != null && value.length() == 1) { + return value.toCharArray()[0]; + } + } + return 0; + } + + public static char getFreemarkerCSVQuote(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_QUOTE); + if (typeParam != null) { + String value = typeParam.getStringValue(); + if (value != null && value.length() == 1) { + return value.toCharArray()[0]; + } + } + return 0; + } + + public static boolean getFreemarkerCSVIncludeFieldNames(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_INCLUDE_FIELD_NAMES); + if (typeParam != null) { + String value = typeParam.getStringValue(); + if (value != null) { + return value.equals("true"); //$NON-NLS-1$ + } + } + + return false; + } + + public static String getFreemarkerXMLFileType(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_FILE_TYPE); + if (typeParam != null) { + String value = typeParam.getStringValue(); + return value; + } + return null; + } + + public static String getFreemarkerXMLFilePath(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_FILE_PATH); + if (typeParam != null) { + String value = typeParam.getStringValue(); + return value; + } + return null; + } + + public static String getFreemarkerXMLRootName(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_ROOT_NAME); + if (typeParam != null) { + String value = typeParam.getStringValue(); + return value; + } + return null; + } + + public static String getTemplateType(Freemarker freemarker) { + if (freemarker == null) + return null; + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_TEMPLATE_TYPE); + if (typeParam != null) { + return typeParam.getStringValue(); + } + return null; + } + + public static String[] getFreemarkerCSVFileds(Freemarker freemarker) { + org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_FIELDS); + if (typeParam != null) { + String value = typeParam.getStringValue(); + if (value != null) { + value = value.trim(); + if (!"".equals(value)) { //$NON-NLS-1$ + return value.split(","); //$NON-NLS-1$ + } + } + } + return null; + } + + public static org.jboss.tools.smooks.model.smooks.ParamType getParam(AnyType model, String paramName) { + List<org.jboss.tools.smooks.model.smooks.ParamType> params = getParams(model); + for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { + org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator + .next(); + if (paramName.equals(paramType.getName())) { + return paramType; + } + } + return null; + } + + public static org.jboss.tools.smooks.model.smooks.ParamType getParam( + List<org.jboss.tools.smooks.model.smooks.ParamType> params, String paramName) { + for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { + org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator + .next(); + if (paramName.equals(paramType.getName())) { + return paramType; + } + } + return null; + } + + public static String getParamValue(AnyType model, String paramName) { + List<org.jboss.tools.smooks.model.smooks.ParamType> params = getParams(model); + for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { + org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator + .next(); + if (paramName.equals(paramType.getName())) { + return paramType.getStringValue(); + } + } + return null; + } + + public static String getParamValue(List<org.jboss.tools.smooks.model.smooks.ParamType> params, String paramName) { + for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { + org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator + .next(); + if (paramName.equals(paramType.getName())) { + return paramType.getStringValue(); + } + } + return null; + } + + public static String generateTaskID(SmooksResourceListType resourceList, Class<?> modelClass, String baseID) { + List<AbstractResourceConfig> configList = resourceList.getAbstractResourceConfig(); + int index = 0; + List<AbstractResourceConfig> modelList = new ArrayList<AbstractResourceConfig>(); + for (Iterator<?> iterator = configList.iterator(); iterator.hasNext();) { + AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); + if (modelClass.isInstance(abstractResourceConfig)) { + modelList.add(abstractResourceConfig); + // index++; + } + } + String id = baseID + String.valueOf(index); + int i = 0; + for (i = 0; i < modelList.size(); i++) { + AbstractResourceConfig abstractResourceConfig = modelList.get(i); + String idref = null; + if (abstractResourceConfig instanceof Freemarker) { + idref = SmooksModelUtils.getParamValue(((Freemarker) abstractResourceConfig).getParam(), + SmooksModelUtils.KEY_OBJECT_ID); + } + if (idref == null) { + idref = SmooksModelUtils.getParamValue(abstractResourceConfig, SmooksModelUtils.KEY_OBJECT_ID); + } + if (id.equals(idref)) { + index++; + id = baseID + String.valueOf(index); + i = 0; + continue; + } + } + return id; + + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/SmooksModelUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/impl/AbstractAnyTypeImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/impl/AbstractAnyTypeImpl.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/impl/AbstractAnyTypeImpl.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.model.common.AbstractAnyType; import org.jboss.tools.smooks.model.common.CommonPackage; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * <!-- begin-user-doc --> An implementation of the model object ' Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -1,762 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks10.model.smooks.util; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.emf.common.command.Command; -import org.eclipse.emf.common.command.CompoundCommand; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.util.ExtendedMetaData; -import org.eclipse.emf.ecore.util.FeatureMapUtil; -import org.eclipse.emf.ecore.xml.type.AnyType; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.emf.edit.command.AddCommand; -import org.eclipse.emf.edit.command.CommandParameter; -import org.eclipse.emf.edit.command.RemoveCommand; -import org.eclipse.emf.edit.domain.EditingDomain; -import org.jboss.tools.smooks.core.SmooksInputType; -import org.jboss.tools.smooks.model.freemarker.Freemarker; -import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; -import org.jboss.tools.smooks.model.smooks.ConditionType; -import org.jboss.tools.smooks.model.smooks.ConditionsType; -import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; - -/** - * @author Dart Peng - * - */ - -public class SmooksModelUtils { - - public static final String KEY_TEMPLATE_TYPE = "messageType"; //$NON-NLS-1$ - - public static final String TEMPLATE_DATA_PROVIDER_PARAM_NAME = "templateDataProvider"; //$NON-NLS-1$ - - public static final String FREEMARKER_TEMPLATE_TYPE_CSV = "CSV"; //$NON-NLS-1$ - - public static final String FREEMARKER_TEMPLATE_TYPE_XML = "XML"; //$NON-NLS-1$ - - public static final String KEY_CSV_FIELDS = "csvFields"; //$NON-NLS-1$ - - public static final String KEY_INCLUDE_FIELD_NAMES = "includeFieldNames"; //$NON-NLS-1$ - - public static final String KEY_TASK_ID_REF = "idref"; //$NON-NLS-1$ - - public static final String KEY_OBJECT_ID = "id"; //$NON-NLS-1$ - - public static final String KEY_XML_FILE_TYPE = "modelSrcType"; //$NON-NLS-1$ - - public static final String KEY_XML_FILE_PATH = "modelSrc"; //$NON-NLS-1$ - - public static final String KEY_XML_ROOT_NAME = "rootElementName"; //$NON-NLS-1$ - - public static final String KEY_XML_FILE_TYPE_XSD = "XSD"; //$NON-NLS-1$ - - public static final String KEY_XML_FILE_TYPE_XML = "XML"; //$NON-NLS-1$ - - public static final String KEY_CSV_SEPERATOR = "seperator"; //$NON-NLS-1$ - - public static final String KEY_CSV_QUOTE = "quote"; //$NON-NLS-1$ - - public static final String INPUT_TYPE_JAVA = SmooksInputType.INPUT_TYPE_JAVA; - - public static final String INPUT_TYPE = "inputType"; //$NON-NLS-1$ - - public static final String INPUT_TYPE_CUSTOME = SmooksInputType.INPUT_TYPE_CUSTOM; - - public static final String INPUT_TYPE_JSON_1_1 = SmooksInputType.INPUT_TYPE_JSON; - - public static final String INPUT_TYPE_CSV = SmooksInputType.INPUT_TYPE_CSV; - - public static final String INPUT_ACTIVE_TYPE = "input.type.actived"; //$NON-NLS-1$ - - public static final String INPUT_DEACTIVE_TYPE = "input.type.deactived"; //$NON-NLS-1$ - - public static final String INPUT_TYPE_CSV_1_2 = SmooksInputType.INPUT_TYPE_CSV; - - public static final String PARAM_NAME_CLASS = "class"; //$NON-NLS-1$ - - public static final String PARAM_NAME_PATH = "path"; //$NON-NLS-1$ - - public static final String PARAM_NAME_ACTIVED = "actived"; //$NON-NLS-1$ - - public static final String INPUT_TYPE_XML = SmooksInputType.INPUT_TYPE_XML; - - public static final String INPUT_TYPE_XSD = SmooksInputType.INPUT_TYPE_XSD; - - public static final String TYPE_XSL = "xsl"; //$NON-NLS-1$ - - public static final String[] TEMPLATE_TYPES = new String[] { "xsl", "ftl" }; //$NON-NLS-1$ //$NON-NLS-2$ - - public static final String BEAN_CLASS = "beanClass"; //$NON-NLS-1$ - - public static final String BEAN_ID = "beanId"; //$NON-NLS-1$ - - public static final String BINDINGS = "bindings"; //$NON-NLS-1$ - - public static final String INPUT_TYPE_EDI_1_1 = SmooksInputType.INPUT_TYPE_EDI; - - public static final String INPUT_TYPE_EDI_1_2 = SmooksInputType.INPUT_TYPE_EDI; - - public static final String INPUT_TYPE_JSON_1_2 = SmooksInputType.INPUT_TYPE_JSON; - - public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE.demandFeature(null, "property", //$NON-NLS-1$ - false); - - public static EStructuralFeature ATTRIBUTE_SELECTOR = ExtendedMetaData.INSTANCE.demandFeature(null, "selector", //$NON-NLS-1$ - false); - - public static EStructuralFeature ATTRIBUTE_TYPE = ExtendedMetaData.INSTANCE.demandFeature(null, "type", false); //$NON-NLS-1$ - - public static EStructuralFeature ELEMENT_BINDING = ExtendedMetaData.INSTANCE.demandFeature( - "http://www.milyn.org/xsd/smooks-1.0.xsd", "binding", true); //$NON-NLS-1$ //$NON-NLS-2$ - - // public static AnyType addBindingTypeToParamType(ParamType param, String - // property, String selector, String type, - // String uri) { - // AnyType binding = createBindingType(property, selector, type, uri); - // param.getMixed().add(ELEMENT_BINDING, binding); - // return binding; - // } - // - // public static List<Object> - // getBindingListFromResourceConfigType(ResourceConfigType resourceConfig) { - // List<ParamType> paramList = resourceConfig.getParam(); - // for (Iterator<ParamType> iterator = paramList.iterator(); - // iterator.hasNext();) { - // ParamType param = iterator.next(); - // if ("bindings".equals(param.getName())) { - // if (param.eContents().isEmpty()) - // continue; - // List<Object> bindingList = (List<Object>) - // param.getMixed().list(SmooksModelUtils.ELEMENT_BINDING); - // return bindingList; - // } - // } - // return Collections.emptyList(); - // } - // - // public static boolean isBeanPopulatorResource(ResourceConfigType type) { - // ResourceType resource = type.getResource(); - // if (resource == null) - // return false; - // String value = resource.getStringValue(); - // if (value != null) - // value = value.trim(); - // if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { - // return true; - // } - // return false; - // } - - public static void setPropertyValueToAnyType(Object value, EStructuralFeature attribute, AnyType anyType) { - anyType.getAnyAttribute().set(attribute, value); - } - - // public static AnyType getBindingViaProperty(ResourceConfigType - // resourceConfig, String property) { - // List bindingList = getBindingListFromResourceConfigType(resourceConfig); - // for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) { - // AnyType binding = (AnyType) iterator.next(); - // String pro = getAttributeValueFromAnyType(binding, ATTRIBUTE_PROPERTY); - // if (pro != null) - // pro = pro.trim(); - // if (property.equals(pro)) { - // return binding; - // } - // } - // return null; - // } - // - // public static boolean isInnerFileContents(ResourceConfigType - // resourceConfig) { - // ResourceType resource = resourceConfig.getResource(); - // if (resource == null) - // return false; - // String type = resource.getType(); - // if (type != null) - // type = type.trim(); - // for (int i = 0; i < TEMPLATE_TYPES.length; i++) { - // String type1 = TEMPLATE_TYPES[i]; - // if (type1.equalsIgnoreCase(type)) - // return true; - // } - // return false; - // } - // - // public static boolean isDateTypeSelector(ResourceConfigType type) { - // ResourceType resource = type.getResource(); - // if (resource == null) - // return false; - // String value = resource.getStringValue(); - // if (value != null) - // value = value.trim(); - // for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { - // String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; - // if (decoderClass.equals(value)) { - // return true; - // } - // } - // return false; - // } - // - // public static String getTransformType(ResourceConfigType resourceConfig) - // { - // ParamType typeParam = null; - // if (resourceConfig == null) - // return ""; - // if (isTransformTypeResourceConfig(resourceConfig)) { - // List paramList = resourceConfig.getParam(); - // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { - // ParamType param = (ParamType) iterator.next(); - // String name = param.getName(); - // if (name != null) - // name = name.trim(); - // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(name)) { - // typeParam = param; - // break; - // } - // } - // if (typeParam != null) { - // return SmooksModelUtils.getAnyTypeText(typeParam); - // } - // } - // return ""; - // } - // - // public static void setTransformType(ResourceConfigType resourceConfig, - // String type) { - // if (type == null) - // type = ""; - // if (isTransformTypeResourceConfig(resourceConfig)) { - // List paramList = resourceConfig.getParam(); - // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { - // ParamType param = (ParamType) iterator.next(); - // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param.getName())) { - // cleanTextToSmooksType(param); - // setTextToAnyType(param, type); - // } - // } - // } - // } - // - // public static boolean isFilePathResourceConfig(ResourceConfigType - // resourceConfig) { - // ResourceType resource = resourceConfig.getResource(); - // if (resource != null) { - // String value = resource.getStringValue(); - // if (value != null) { - // if (value.startsWith("\\")) { - // return true; - // } - // if (value.startsWith("/")) { - // return true; - // } - // } - // } - // return false; - // } - // - // public static boolean isTransformTypeResourceConfig(ResourceConfigType - // resourceConfig) { - // String selector = resourceConfig.getSelector(); - // if (selector != null) - // selector = selector.trim(); - // if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { - // return false; - // } - // - // if (resourceConfig.getParam().isEmpty()) { - // return false; - // } else { - // List paramList = resourceConfig.getParam(); - // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { - // ParamType p = (ParamType) iterator.next(); - // String paramName = p.getName(); - // if (paramName != null) - // paramName = paramName.trim(); - // if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(paramName)) { - // return true; - // } - // } - // return false; - // } - // } - // - // public static void setParamText(String paramName, String value, - // ResourceConfigType resourceConfigType) { - // List<ParamType> list = resourceConfigType.getParam(); - // ParamType param = null; - // for (Iterator<ParamType> iterator = list.iterator(); iterator.hasNext();) - // { - // ParamType paramType = (ParamType) iterator.next(); - // String n = paramType.getName(); - // if (n == null) - // continue; - // n = n.trim(); - // if (n.equalsIgnoreCase(paramName)) { - // param = paramType; - // break; - // } - // } - // if (param == null) { - // param = SmooksFactory.eINSTANCE.createParamType(); - // param.setName(paramName); - // resourceConfigType.getParam().add(param); - // } - // setTextToAnyType(param, value); - // } - // - // public static String getParmaText(String paramName, ResourceConfigType - // resourceConfigType) { - // List plist = resourceConfigType.getParam(); - // for (Iterator iterator = plist.iterator(); iterator.hasNext();) { - // ParamType p = (ParamType) iterator.next(); - // String n = p.getName(); - // if (n == null) - // continue; - // n = n.trim(); - // if (paramName.equalsIgnoreCase(n)) { - // return getAnyTypeText(p); - // } - // } - // return null; - // } - - public static String getAttributeValueFromAnyType(AnyType anyType, EStructuralFeature attribute) { - String value = (String) anyType.getAnyAttribute().get(attribute, false); - return value; - } - - public static String getAnyTypeText(AnyType anyType) { - Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); - if (value != null) { - if (value instanceof List && !((List<?>) value).isEmpty()) { - Object v = ((List<?>) value).get(0); - if (v != null) { - return v.toString().trim(); - } - } - // return value.toString(); - } - return null; - } - - public static String getAnyTypeCDATA(AnyType anyType) { - Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); - if (value != null) { - if (value instanceof List && !((List) value).isEmpty()) { - Object v = ((List) value).get(0); - if (v != null) { - return v.toString().trim(); - } - } - // return value.toString(); - } - return null; - } - - public static String getAnyTypeComment(AnyType anyType) { - EList<Object> value = anyType.getMixed().list(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT); - if (value != null && !value.isEmpty()) { - Object v = ((List<?>) value).get(0); - if (v != null) { - return v.toString().trim(); - } - // return value.toString(); - } - return null; - } - - // public static AnyType createBindingType(String property, String selector, - // String type, String uri) { - // if (uri == null) { - // uri = SmooksPackage.eNS_URI; - // } - // - // AnyType binding = (AnyType) - // EcoreUtil.create(XMLTypePackage.Literals.ANY_TYPE); - // if (property != null) { - // binding.getAnyAttribute().add(ATTRIBUTE_PROPERTY, property); - // } - // - // if (selector != null) { - // binding.getAnyAttribute().add(ATTRIBUTE_SELECTOR, selector); - // } - // if (type != null) { - // binding.getAnyAttribute().add(ATTRIBUTE_TYPE, false); - // } - // return binding; - // } - - public static void appendTextToSmooksType(AnyType smooksModel, String text) { - smooksModel.getMixed().add(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); - } - - public static void setTextToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String text) { - CompoundCommand ccommand = new CompoundCommand(); - Command addCommand = null; - if (text != null) { - addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text)); - } - Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true)); - if (removeValue != null && removeValue instanceof Collection<?>) { - List<Object> rList = new ArrayList<Object>(); - for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { - Object string = (Object) iterator.next(); - rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, string)); - } - Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); - if (cc != null && cc.canExecute()) { - ccommand.append(cc); - } - } - if (addCommand != null && addCommand.canExecute()) { - ccommand.append(addCommand); - } - if (smooksModel.eContainer() == null) { - ccommand.execute(); - } else { - editingDomain.getCommandStack().execute(ccommand); - } - } - - public static void setCommentToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String comment) { - CompoundCommand ccommand = new CompoundCommand(); - Command addCommand = null; - if (comment != null) { - addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, comment)); - } - Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, true)); - if (removeValue != null && removeValue instanceof Collection<?>) { - List<Object> rList = new ArrayList<Object>(); - for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { - Object string = (Object) iterator.next(); - rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, string)); - } - Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); - if (cc != null && cc.canExecute()) { - ccommand.append(cc); - } - } - if (addCommand != null && addCommand.canExecute()) { - ccommand.append(addCommand); - } - if (smooksModel.eContainer() == null) { - ccommand.execute(); - } else { - editingDomain.getCommandStack().execute(ccommand); - } - } - - public static void setCDATAToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String cdata) { - CompoundCommand ccommand = new CompoundCommand(); - Command addCommand = null; - if (cdata != null) { - addCommand = AddCommand.create(editingDomain, smooksModel, XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, cdata)); - } - Object removeValue = (smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true)); - if (removeValue != null && removeValue instanceof Collection<?>) { - List<Object> rList = new ArrayList<Object>(); - for (Iterator<?> iterator = ((Collection<?>) removeValue).iterator(); iterator.hasNext();) { - Object string = (Object) iterator.next(); - rList.add(FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, string)); - } - Command cc = RemoveCommand.create(editingDomain, smooksModel, null, rList); - if (cc != null && cc.canExecute()) { - ccommand.append(cc); - } - } - if (addCommand != null && addCommand.canExecute()) { - ccommand.append(addCommand); - } - if (smooksModel.eContainer() == null) { - ccommand.execute(); - } else { - editingDomain.getCommandStack().execute(ccommand); - } - } - - public static void appendCDATAToSmooksType(AnyType smooksModel, String text) { - smooksModel.getMixed().add(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, text); - } - - /** - * @deprecated - * @param smooksModel - * @param text - */ - public static void setTextToAnyType(AnyType smooksModel, String text) { - cleanTextToSmooksType(smooksModel); - appendTextToSmooksType(smooksModel, text); - } - - /** - * @deprecated - * @param smooksModel - * @param text - */ - public static void setCDATAToAnyType(AnyType smooksModel, String text) { - cleanCDATAToSmooksType(smooksModel); - appendCDATAToSmooksType(smooksModel, text); - } - - public static void cleanTextToSmooksType(AnyType smooksModel) { - Object obj = smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); - if (obj instanceof List) { - ((List) obj).clear(); - } - } - - public static void cleanCDATAToSmooksType(AnyType smooksModel) { - Object obj = smooksModel.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); - if (obj instanceof List) { - ((List) obj).clear(); - } - } - - public static CommandParameter createTextCommandParamter(Object owner, String value) { - return createChildParameter(owner, XMLTypePackage.Literals.ANY_TYPE__MIXED, FeatureMapUtil.createEntry( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, value)); - } - - public static CommandParameter createChildParameter(Object owner, Object feature, Object child) { - return new CommandParameter(owner, feature, child); - } - - // public static String getInputPath(InputType input) { - // List<org.jboss.tools.smooks.model.graphics.ext.ParamType> list = - // input.getParam(); - // if (INPUT_TYPE_JAVA.equals(input.getType()) || - // INPUT_TYPE_XML.equals(input.getType()) - // || INPUT_TYPE_XSD.equals(input.getType()) || - // INPUT_TYPE_JSON_1_1.equals(input.getType()) - // || INPUT_TYPE_JSON_1_2.equals(input.getType()) || - // INPUT_TYPE_CSV.equals(input.getType()) - // || INPUT_TYPE_EDI_1_1.equals(input.getType()) || - // INPUT_TYPE_EDI_1_2.equals(input.getType()) - // || INPUT_TYPE_CSV_1_2.equals(input.getType())) { - // for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { - // org.jboss.tools.smooks.model.graphics.ext.ParamType paramType = - // (org.jboss.tools.smooks.model.graphics.ext.ParamType) iterator - // .next(); - // if ("path".equals(paramType.getName())) { - // String value = paramType.getValue(); - // if (value != null) - // value = value.trim(); - // return value; - // } - // } - // } - // return null; - // } - - public static List<ConditionType> collectConditionType(SmooksResourceListType resourceList) { - ConditionsType conditions = resourceList.getConditions(); - if (conditions != null) { - return conditions.getCondition(); - } - return Collections.emptyList(); - } - - public static List<org.jboss.tools.smooks.model.smooks.ParamType> getParams(AnyType model) { - if (model == null) - return Collections.emptyList(); - List<org.jboss.tools.smooks.model.smooks.ParamType> obj = model.getMixed().list( - org.jboss.tools.smooks.model.smooks.SmooksPackage.Literals.DOCUMENT_ROOT__PARAM); - return obj; - } - - public static void addParam(AnyType model, org.jboss.tools.smooks.model.smooks.ParamType param) { - if (model == null) - return; - model.getMixed().add( - XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry( - org.jboss.tools.smooks.model.smooks.SmooksPackage.Literals.DOCUMENT_ROOT__PARAM, param)); - } - - public static char getFreemarkerCSVSeperator(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_SEPERATOR); - if (typeParam != null) { - String value = typeParam.getStringValue(); - if (value != null && value.length() == 1) { - return value.toCharArray()[0]; - } - } - return 0; - } - - public static char getFreemarkerCSVQuote(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_QUOTE); - if (typeParam != null) { - String value = typeParam.getStringValue(); - if (value != null && value.length() == 1) { - return value.toCharArray()[0]; - } - } - return 0; - } - - public static boolean getFreemarkerCSVIncludeFieldNames(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_INCLUDE_FIELD_NAMES); - if (typeParam != null) { - String value = typeParam.getStringValue(); - if (value != null) { - return value.equals("true"); //$NON-NLS-1$ - } - } - - return false; - } - - public static String getFreemarkerXMLFileType(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_FILE_TYPE); - if (typeParam != null) { - String value = typeParam.getStringValue(); - return value; - } - return null; - } - - public static String getFreemarkerXMLFilePath(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_FILE_PATH); - if (typeParam != null) { - String value = typeParam.getStringValue(); - return value; - } - return null; - } - - public static String getFreemarkerXMLRootName(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_ROOT_NAME); - if (typeParam != null) { - String value = typeParam.getStringValue(); - return value; - } - return null; - } - - public static String getTemplateType(Freemarker freemarker) { - if (freemarker == null) - return null; - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_TEMPLATE_TYPE); - if (typeParam != null) { - return typeParam.getStringValue(); - } - return null; - } - - public static String[] getFreemarkerCSVFileds(Freemarker freemarker) { - org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_CSV_FIELDS); - if (typeParam != null) { - String value = typeParam.getStringValue(); - if (value != null) { - value = value.trim(); - if (!"".equals(value)) { //$NON-NLS-1$ - return value.split(","); //$NON-NLS-1$ - } - } - } - return null; - } - - public static org.jboss.tools.smooks.model.smooks.ParamType getParam(AnyType model, String paramName) { - List<org.jboss.tools.smooks.model.smooks.ParamType> params = getParams(model); - for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { - org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator - .next(); - if (paramName.equals(paramType.getName())) { - return paramType; - } - } - return null; - } - - public static org.jboss.tools.smooks.model.smooks.ParamType getParam( - List<org.jboss.tools.smooks.model.smooks.ParamType> params, String paramName) { - for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { - org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator - .next(); - if (paramName.equals(paramType.getName())) { - return paramType; - } - } - return null; - } - - public static String getParamValue(AnyType model, String paramName) { - List<org.jboss.tools.smooks.model.smooks.ParamType> params = getParams(model); - for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { - org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator - .next(); - if (paramName.equals(paramType.getName())) { - return paramType.getStringValue(); - } - } - return null; - } - - public static String getParamValue(List<org.jboss.tools.smooks.model.smooks.ParamType> params, String paramName) { - for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { - org.jboss.tools.smooks.model.smooks.ParamType paramType = (org.jboss.tools.smooks.model.smooks.ParamType) iterator - .next(); - if (paramName.equals(paramType.getName())) { - return paramType.getStringValue(); - } - } - return null; - } - - public static String generateTaskID(SmooksResourceListType resourceList, Class<?> modelClass, String baseID) { - List<AbstractResourceConfig> configList = resourceList.getAbstractResourceConfig(); - int index = 0; - List<AbstractResourceConfig> modelList = new ArrayList<AbstractResourceConfig>(); - for (Iterator<?> iterator = configList.iterator(); iterator.hasNext();) { - AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); - if (modelClass.isInstance(abstractResourceConfig)) { - modelList.add(abstractResourceConfig); - // index++; - } - } - String id = baseID + String.valueOf(index); - int i = 0; - for (i = 0; i < modelList.size(); i++) { - AbstractResourceConfig abstractResourceConfig = modelList.get(i); - String idref = null; - if (abstractResourceConfig instanceof Freemarker) { - idref = SmooksModelUtils.getParamValue(((Freemarker) abstractResourceConfig).getParam(), - SmooksModelUtils.KEY_OBJECT_ID); - } - if (idref == null) { - idref = SmooksModelUtils.getParamValue(abstractResourceConfig, SmooksModelUtils.KEY_OBJECT_ID); - } - if (id.equals(idref)) { - index++; - id = baseID + String.valueOf(index); - i = 0; - continue; - } - } - return id; - - } - -} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -32,8 +32,8 @@ import javax.xml.transform.stream.StreamSource; import org.eclipse.core.resources.IResource; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.milyn.Smooks; import org.milyn.SmooksException; import org.milyn.container.ExecutionContext; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -34,9 +34,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author DartPeng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -16,10 +16,10 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.input.InputParameter; import org.jboss.tools.smooks.configuration.editors.input.InputType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart (dpeng(a)redhat.com) Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -10,8 +10,8 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author DartPeng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -64,6 +64,7 @@ import org.eclipse.ui.forms.events.IHyperlinkListener; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Hyperlink; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.csv12.CSVDataParser; import org.jboss.tools.smooks.configuration.editors.edireader12.EDIDataParser; import org.jboss.tools.smooks.configuration.editors.input.InputParameter; @@ -80,7 +81,6 @@ import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.milyn.Smooks; import org.milyn.payload.JavaSource; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -93,6 +93,7 @@ import org.eclipse.ui.forms.widgets.ScrolledPageBook; import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.ide.IDE; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.input.InputType; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard; @@ -115,7 +116,6 @@ import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.milyn.SmooksException; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -20,6 +20,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.csv12.CSV12DataConfigurationWizardPage.FieldString; import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser; @@ -30,7 +31,6 @@ import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @deprecated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIDataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIDataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -22,6 +22,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.edireader12.EDIDataParser; import org.jboss.tools.smooks.configuration.editors.edireader12.EDIMappingDataPathWizardPage; @@ -29,7 +30,6 @@ import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanStrucutredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanStrucutredDataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanStrucutredDataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -28,10 +28,10 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.javabean12.Messages; import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -25,6 +25,7 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.json12.Json12DataConfiguraitonWizardPage.KeyValueModel; import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser; @@ -37,7 +38,6 @@ import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @deprecated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -121,6 +121,7 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.configuration.actions.AddSmooksResourceAction; @@ -172,7 +173,6 @@ import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @@ -3243,6 +3243,9 @@ if (model instanceof Freemarker) { return FreemarkerPackage.Literals.DOCUMENT_ROOT__FREEMARKER; } + if (model instanceof ResourceConfigType) { + return SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE_CONFIG; + } return null; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TextTypeSwicher.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TextTypeSwicher.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TextTypeSwicher.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart (dpeng(a)redhat.com) Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.configuration.editors.csv12.CSV12InputDataWizard; import org.jboss.tools.smooks.configuration.editors.edireader12.EDIDataWizard; @@ -27,7 +28,6 @@ import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataLabelProvider; import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataWizard; import org.jboss.tools.smooks.configuration.editors.xml.XSDStructuredDataWizard; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -12,8 +12,8 @@ import java.util.Properties; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -37,10 +37,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.xsd.XSDElementDeclaration; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.templating.model.ModelBuilderException; import org.jboss.tools.smooks.templating.model.xml.XSDModelBuilder; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.xml.sax.SAXException; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -12,8 +12,8 @@ import java.util.Properties; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart (dpeng(a)redhat.com) Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -65,6 +65,7 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.RuntimeDependency; import org.jboss.tools.smooks.configuration.RuntimeMetadata; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; @@ -89,7 +90,6 @@ import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory; import org.jboss.tools.smooks.model.smooks.util.SmooksResourceFactoryImpl; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -24,6 +24,7 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerCSVNodeEditPart; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerCSVNodeGraphicalModel; @@ -31,7 +32,6 @@ import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.smooks.ParamType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -15,12 +15,14 @@ import java.util.Map; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.ecore.util.FeatureMapUtil; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; @@ -28,14 +30,17 @@ import org.jboss.tools.smooks.graphical.editors.process.TaskType; import org.jboss.tools.smooks.graphical.wizard.TemplateMessageTypeWizard; import org.jboss.tools.smooks.graphical.wizard.freemarker.FreemarkerTemplateParametersProvider; +import org.jboss.tools.smooks.model.ModelFilter; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.freemarker.FreemarkerFactory; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; import org.jboss.tools.smooks.model.smooks.ParamType; +import org.jboss.tools.smooks.model.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.smooks.ResourceType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; +import org.milyn.delivery.DomModelCreator; /** * @author Dart @@ -91,12 +96,21 @@ param.setStringValue(parentTask.getId()); freemarker.getParam().add(param); - Command addFreemarkerCommand = AddCommand.create(this.provider.getEditingDomain(), resourceList, + CompoundCommand compoundCommand = new CompoundCommand(); + compoundCommand.append(AddCommand.create(this.provider.getEditingDomain(), resourceList, SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(FreemarkerPackage.Literals.DOCUMENT_ROOT__FREEMARKER, freemarker)); + .createEntry(FreemarkerPackage.Literals.DOCUMENT_ROOT__FREEMARKER, freemarker))); + + // If the template is connected from the input, create a + // DomNodeModel configuration, if one doesn't already exist... + if(TaskTypeManager.TASK_ID_INPUT.equals(parentTask.getId().trim())) { + if(ModelFilter.DomModelCreator.execute(resourceList).isEmpty()) { + compoundCommand.append(createDomNodeModelConfig(resourceList)); + } + } - if (addFreemarkerCommand.canExecute()) { - provider.getEditingDomain().getCommandStack().execute(addFreemarkerCommand); + if (compoundCommand.canExecute()) { + provider.getEditingDomain().getCommandStack().execute(compoundCommand); TaskType childTask = ProcessFactory.eINSTANCE.createTaskType(); childTask.setId(getTaskID()); @@ -107,6 +121,19 @@ } } + private Command createDomNodeModelConfig(SmooksResourceListType resourceList) { + ResourceConfigType resourceConfig = SmooksFactory.eINSTANCE.createResourceConfigType(); + ResourceType resource = SmooksFactory.eINSTANCE.createResourceType(); + + resourceConfig.setSelector("#document"); + resource.setValue(DomModelCreator.class.getName()); + resourceConfig.setResource(resource); + + return AddCommand.create(this.provider.getEditingDomain(), resourceList, + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE_CONFIG, resourceConfig)); + } + @Override public void run() { super.run(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/DeleteTaskNodeAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/DeleteTaskNodeAction.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/DeleteTaskNodeAction.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -81,7 +81,7 @@ if (listType != null) { for (Iterator<?> iterator = allTask.iterator(); iterator.hasNext();) { TaskType taskType = (TaskType) iterator.next(); - List<Object> elements = TaskTypeManager.getAssociatedSmooksElements(taskType, listType); + List<Object> elements = TaskTypeManager.getAssociatedResourceDeletes(taskType, listType); if (elements != null && !elements.isEmpty()) { associatedElements.addAll(elements); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ProcessAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ProcessAnalyzer.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ProcessAnalyzer.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.graphical.editors.process.ProcessFactory; import org.jboss.tools.smooks.graphical.editors.process.ProcessType; @@ -27,7 +28,6 @@ import org.jboss.tools.smooks.model.smooks.ParamType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -76,6 +76,7 @@ import org.eclipse.zest.core.widgets.ZestStyles; import org.eclipse.zest.layouts.LayoutStyles; import org.eclipse.zest.layouts.algorithms.HorizontalTreeLayoutAlgorithm; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.configuration.editors.IFieldMarker; import org.jboss.tools.smooks.configuration.editors.SelectorCreationDialog; @@ -106,7 +107,6 @@ import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -14,8 +14,11 @@ import java.util.Iterator; import java.util.List; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.graphical.editors.process.TaskType; +import org.jboss.tools.smooks.model.ModelFilter; +import org.jboss.tools.smooks.model.filters.FreemarkerFilter; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.javabean12.BeanType; import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; @@ -122,16 +125,27 @@ * @param smooksResourceList * @return */ - public static List<Object> getAssociatedSmooksElements(TaskType taskType, SmooksResourceListType smooksResourceList) { + public static List<Object> getAssociatedResourceDeletes(TaskType taskType, SmooksResourceListType smooksResourceList) { List<Object> elementTypes = getAssociatedSmooksElementsType(taskType.getId()); List<AbstractResourceConfig> resourceConfigList = smooksResourceList.getAbstractResourceConfig(); List<Object> associatedElements = new ArrayList<Object>(); - for (Iterator<?> iterator = resourceConfigList.iterator(); iterator.hasNext();) { - AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); + + for (AbstractResourceConfig abstractResourceConfig : resourceConfigList) { if (isSameType(abstractResourceConfig, elementTypes) && canRemove(abstractResourceConfig, taskType)) { associatedElements.add(abstractResourceConfig); } } + + if(TASK_ID_FREEMARKER_XML_TEMPLATE.equals(taskType.getId()) || TASK_ID_FREEMARKER_CSV_TEMPLATE.equals(taskType.getId())) { + Freemarker resource = (Freemarker) taskType.getTaskResources().get(0); + FreemarkerFilter ftlFilter = new FreemarkerFilter().addExclude(resource); + + if(ftlFilter.execute(smooksResourceList).isEmpty()) { + // If there's no other Freemarker resources... remove any DomModelCreator resources too... + associatedElements.addAll(ModelFilter.DomModelCreator.execute(smooksResourceList)); + } + } + return associatedElements; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/CreateFreemarkerTemplateModelCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/CreateFreemarkerTemplateModelCommand.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/CreateFreemarkerTemplateModelCommand.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -36,20 +36,6 @@ @Override public void execute() { -// if (firstTime) { -// XSLTemplateCreationWizard wizard = new XSLTemplateCreationWizard(provider, null); -// final WizardDialog dialog = new WizardDialog(editorPart.getSite().getShell(), wizard); -// if(dialog.open() == Dialog.OK){ -// if (collections instanceof FeatureMap.Entry) { -// collections = FeatureMapUtil.createEntry(((FeatureMap.Entry) collections) -// .getEStructuralFeature(), wizard.getXslModel()); -// } -// emfCommand = AddCommand.create(domain, owner, feature, collections); -// }else{ -// throw new IgnoreException(); -// } -// firstTime = false; -// } super.execute(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -21,6 +21,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.editor.ISmooksModelProvider; @@ -29,7 +30,6 @@ import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.gef.common.RootModel; @@ -23,7 +24,6 @@ import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.javabean12.BeanType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.templating.model.ModelBuilderException; import org.jboss.tools.smooks.templating.model.csv.CSVModelBuilder; import org.jboss.tools.smooks.templating.template.csv.CSVFreeMarkerTemplateBuilder; @@ -27,7 +28,6 @@ import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanGraphModel; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.javabean12.BeanType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -16,6 +16,7 @@ import org.eclipse.emf.edit.domain.IEditingDomainProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject; import org.jboss.tools.smooks.configuration.editors.xml.TagObject; @@ -26,7 +27,6 @@ import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.smooks.ParamType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Element; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerContentProvider.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerContentProvider.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -16,12 +16,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataContentProvider; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.freemarker.Template; import org.jboss.tools.smooks.model.smooks.ParamType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.editor.ISmooksModelProvider; @@ -32,7 +33,6 @@ import org.jboss.tools.smooks.templating.model.ModelBuilderException; import org.jboss.tools.smooks.templating.template.TemplateBuilder; import org.jboss.tools.smooks.templating.template.exception.TemplateBuilderException; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -18,6 +18,7 @@ import org.eclipse.emf.edit.domain.IEditingDomainProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.xml.TagObject; import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject; @@ -35,7 +36,6 @@ import org.jboss.tools.smooks.templating.template.ValueMapping; import org.jboss.tools.smooks.templating.template.TemplateBuilder; import org.jboss.tools.smooks.templating.template.exception.InvalidMappingException; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -14,6 +14,7 @@ import java.util.List; import org.eclipse.emf.common.util.EList; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.graphical.editors.ProcessAnalyzer; import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; import org.jboss.tools.smooks.model.freemarker.Freemarker; @@ -22,7 +23,6 @@ import org.jboss.tools.smooks.model.smooks.ElementVisitor; import org.jboss.tools.smooks.model.smooks.ParamType; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject; import org.jboss.tools.smooks.configuration.editors.xml.TagObject; @@ -40,7 +41,6 @@ import org.jboss.tools.smooks.templating.template.Mapping; import org.jboss.tools.smooks.templating.template.ValueMapping; import org.jboss.tools.smooks.templating.template.TemplateBuilder; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Node; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -20,6 +20,7 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.xml.TagList; @@ -42,7 +43,6 @@ import org.jboss.tools.smooks.templating.template.csv.CSVFreeMarkerTemplateBuilder; import org.jboss.tools.smooks.templating.template.exception.TemplateBuilderException; import org.jboss.tools.smooks.templating.template.xml.XMLFreeMarkerTemplateBuilder; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Document; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; @@ -29,7 +30,6 @@ import org.jboss.tools.smooks.graphical.editors.process.TaskType; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.javabean12.BeanType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerCSVTemplateGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerCSVTemplateGraphicalEditor.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerCSVTemplateGraphicalEditor.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -17,6 +17,7 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; @@ -27,7 +28,6 @@ import org.jboss.tools.smooks.graphical.editors.process.TaskType; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.smooks.ParamType; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; @@ -31,7 +32,6 @@ import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.templating.model.ModelBuilder; import org.jboss.tools.smooks.templating.template.TemplateBuilder; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.wizard.freemarker; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; +import org.jboss.tools.smooks.SmooksModelUtils; /** * @author Dart Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerXMLTemplateCreationWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerXMLTemplateCreationWizard.java 2010-09-03 23:40:14 UTC (rev 24722) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerXMLTemplateCreationWizard.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -10,8 +10,8 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.wizard.freemarker; +import org.jboss.tools.smooks.SmooksModelUtils; import org.jboss.tools.smooks.configuration.editors.xml.XMLTemplateCreationWizardPage; -import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ModelFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ModelFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ModelFilter.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.model; + +import org.jboss.tools.smooks.model.filters.FreemarkerFilter; +import org.jboss.tools.smooks.model.filters.ResourceConfigFilter; +import org.milyn.delivery.DomModelCreator; + +/** + * Model Filters. + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public class ModelFilter { + + public static final ResourceConfigFilter DomModelCreator = new ResourceConfigFilter().selector("#document").resource(DomModelCreator.class); + public static final FreemarkerFilter Freemarker = new FreemarkerFilter(); + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ModelFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ResourceFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ResourceFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ResourceFilter.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.model; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; + +import org.eclipse.emf.common.util.EList; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; +import org.jboss.tools.smooks.model.smooks.ParamType; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; + +/** + * Model resource filter. + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public abstract class ResourceFilter<T extends AbstractResourceConfig> { + + private Class<T> filterResourceType; + + public ResourceFilter(Class<T> filterResourceType) { + if(filterResourceType == null) { + throw new IllegalArgumentException("arg 'filterResourceType' is null."); + } + this.filterResourceType = filterResourceType; + } + + /** + * Add the supplied resource to the result set returned by the + * {@link #execute(SmooksResourceListType)} method. + * + * @param resource The resource. + * @return True if the resource is to be added, otherwise false. + */ + public abstract boolean accept(T resource); + + /** + * Execute the filter. + * @param resourceList The resource list. + * @return The filtered resource result set. + */ + public List<T> execute(SmooksResourceListType resourceList) { + List<T> resultSet = new ArrayList<T>(); + + for(AbstractResourceConfig abstractResourceConfig : resourceList.getAbstractResourceConfig()) { + if(filterResourceType.isInstance(abstractResourceConfig)) { + T resourceInstance = filterResourceType.cast(abstractResourceConfig); + if(accept(resourceInstance)) { + resultSet.add(resourceInstance); + } + } + } + + return resultSet; + } + + protected boolean hasParams(EList<ParamType> paramList, Map<String, String> requiredParams) { + Set<Entry<String, String>> paramsEntries = requiredParams.entrySet(); + + for(Entry<String, String> param : paramsEntries) { + if(!hasParam(paramList, param.getKey(), param.getValue())) { + return false; + } + } + + return true; + } + + protected boolean hasParam(EList<ParamType> paramList, String name, String value) { + for(ParamType param : paramList) { + if(param.getName().equals(name) && param.getStringValue().equals(value)) { + return true; + } + } + + return false; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/ResourceFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/FreemarkerFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/FreemarkerFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/FreemarkerFilter.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.model.filters; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.smooks.model.ResourceFilter; +import org.jboss.tools.smooks.model.freemarker.Freemarker; + +/** + * Filter for {@link Freemarker} resources. + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public class FreemarkerFilter extends ResourceFilter<Freemarker> { + + private List<Freemarker> excludes; + + public FreemarkerFilter() { + super(Freemarker.class); + } + + public FreemarkerFilter addExclude(Freemarker exclude) { + if(excludes == null) { + excludes = new ArrayList<Freemarker>(); + } + excludes.add(exclude); + return this; + } + + @Override + public boolean accept(Freemarker resource) { + if(excludes != null) { + for(Freemarker exclude : excludes) { + if(resource == exclude) { + return false; + } + } + } + return true; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/FreemarkerFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ResourceConfigFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ResourceConfigFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ResourceConfigFilter.java 2010-09-04 14:00:24 UTC (rev 24723) @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.model.filters; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.jboss.tools.smooks.model.ResourceFilter; +import org.jboss.tools.smooks.model.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.smooks.ResourceType; + +/** + * Filter for {@link ResourceConfigType} resources. + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public class ResourceConfigFilter extends ResourceFilter<ResourceConfigType> { + + private String selector; + private String resource; + private Map<String, String> params; + + public ResourceConfigFilter() { + super(ResourceConfigType.class); + } + + public ResourceConfigFilter selector(String selector) { + this.selector = selector; + return this; + } + + public ResourceConfigFilter resource(String resource) { + this.resource = resource; + return this; + } + + public ResourceConfigFilter resource(Class<?> resource) { + this.resource = resource.getName(); + return this; + } + + public ResourceConfigFilter param(String name, String value) { + if(params == null) { + params = new LinkedHashMap<String, String>(); + } + params.put(name, value); + return this; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks10.model.smooks.util.ResourceFilter#accept(org.jboss.tools.smooks.model.smooks.AbstractResourceConfig) + */ + @Override + public boolean accept(ResourceConfigType resourceType) { + if(selector != null && !selector.equals(resourceType.getSelector())) { + return false; + } + if(resource != null) { + ResourceType resourceObj = resourceType.getResource(); + if(resourceObj == null || !resourceObj.getValue().equals(resource)) { + return false; + } + } + if(params != null) { + if(!hasParams(resourceType.getParam(), params)) { + return false; + } + } + + return true; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/model/filters/ResourceConfigFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF