[jbosstools-commits] JBoss Tools SVN: r15147 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/dbrouting/impl and 8 other directories.

Author: DartPeng Date: 2009-05-11 04:45:42 -0400 (Mon, 11 May 2009) New Revision: 15147 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CounterImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/dbrouting/impl/ResultSetImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/InlineImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/groovy/impl/GroovyImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/MessageImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/SessionImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/InlineImpl.java 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.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java Log: JBIDE-4300 1.When user input "null" text , unset the attribute value. 2.When user select blank option of combo box , unset the attribute value Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CounterImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CounterImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CounterImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -195,10 +195,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getDirection() - * @generated + * @generated not * @ordered */ - protected static final CountDirection DIRECTION_EDEFAULT = CountDirection.INCREMENT; + protected static final CountDirection DIRECTION_EDEFAULT = null;// CountDirection.INCREMENT; /** * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/dbrouting/impl/ResultSetImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/dbrouting/impl/ResultSetImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/dbrouting/impl/ResultSetImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -58,10 +58,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getScope() - * @generated + * @generated not * @ordered */ - protected static final ResultSetScopeType SCOPE_EDEFAULT = ResultSetScopeType.EXECUTION; + protected static final ResultSetScopeType SCOPE_EDEFAULT = null;// ResultSetScopeType.EXECUTION; /** * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/InlineImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/InlineImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/InlineImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -37,10 +37,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getDirective() - * @generated + * @generated not * @ordered */ - protected static final InlineDirective DIRECTIVE_EDEFAULT = InlineDirective.ADDTO; + protected static final InlineDirective DIRECTIVE_EDEFAULT = null;// InlineDirective.ADDTO; /** * The cached value of the '{@link #getDirective() <em>Directive</em>}' attribute. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/groovy/impl/GroovyImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/groovy/impl/GroovyImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/groovy/impl/GroovyImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -157,6 +157,7 @@ */ protected GroovyImpl() { super(); + this.setExecuteBefore(false); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/MessageImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/MessageImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/MessageImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -61,10 +61,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getDeliveryMode() - * @generated + * @generated not * @ordered */ - protected static final DeliveryMode DELIVERY_MODE_EDEFAULT = DeliveryMode.PERSISTENT; + protected static final DeliveryMode DELIVERY_MODE_EDEFAULT = null;//DeliveryMode.PERSISTENT; /** * The cached value of the '{@link #getDeliveryMode() <em>Delivery Mode</em>}' attribute. @@ -148,10 +148,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getType() - * @generated + * @generated not * @ordered */ - protected static final MessageType TYPE_EDEFAULT = MessageType.TEXT_MESSAGE; + protected static final MessageType TYPE_EDEFAULT = null;//MessageType.TEXT_MESSAGE; /** * The cached value of the '{@link #getType() <em>Type</em>}' attribute. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/SessionImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/SessionImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/SessionImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -37,10 +37,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getAcknowledgeMode() - * @generated + * @generated not * @ordered */ - protected static final AcknowledgeMode ACKNOWLEDGE_MODE_EDEFAULT = AcknowledgeMode.AUTOACKNOWLEDGE; + protected static final AcknowledgeMode ACKNOWLEDGE_MODE_EDEFAULT = null;// AcknowledgeMode.AUTOACKNOWLEDGE; /** * The cached value of the '{@link #getAcknowledgeMode() <em>Acknowledge Mode</em>}' attribute. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -38,6 +38,8 @@ import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; import org.jboss.tools.smooks.model.freemarker.FreemarkerFactory; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; +import org.jboss.tools.smooks.model.groovy.GroovyFactory; +import org.jboss.tools.smooks.model.groovy.GroovyPackage; import org.jboss.tools.smooks.model.iorouting.IoroutingFactory; import org.jboss.tools.smooks.model.iorouting.IoroutingPackage; import org.jboss.tools.smooks.model.javabean.JavabeanFactory; @@ -280,6 +282,11 @@ // for calc newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil .createEntry(CalcPackage.Literals.CALC_DOCUMENT_ROOT__COUNTER, CalcFactory.eINSTANCE.createCounter()))); + + // for groovy + + newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(GroovyPackage.Literals.DOCUMENT_ROOT__GROOVY, GroovyFactory.eINSTANCE.createGroovy()))); // for datasource newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/InlineImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/InlineImpl.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/InlineImpl.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -37,10 +37,10 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getDirective() - * @generated + * @generated not * @ordered */ - protected static final InlineDirective DIRECTIVE_EDEFAULT = InlineDirective.ADDTO; + protected static final InlineDirective DIRECTIVE_EDEFAULT = null;// InlineDirective.ADDTO; /** * The cached value of the '{@link #getDirective() <em>Directive</em>}' attribute. Modified: 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 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -67,34 +67,32 @@ public static final String BINDINGS = "bindings"; - public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE.demandFeature( - null, "property", false); + public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE.demandFeature(null, "property", + false); - public static EStructuralFeature ATTRIBUTE_SELECTOR = ExtendedMetaData.INSTANCE.demandFeature( - null, "selector", false); + public static EStructuralFeature ATTRIBUTE_SELECTOR = ExtendedMetaData.INSTANCE.demandFeature(null, "selector", + false); - public static EStructuralFeature ATTRIBUTE_TYPE = ExtendedMetaData.INSTANCE.demandFeature(null, - "type", false); + public static EStructuralFeature ATTRIBUTE_TYPE = ExtendedMetaData.INSTANCE.demandFeature(null, "type", false); public static EStructuralFeature ELEMENT_BINDING = ExtendedMetaData.INSTANCE.demandFeature( - "http://www.milyn.org/xsd/smooks-1.0.xsd", "binding", true); + "http://www.milyn.org/xsd/smooks-1.0.xsd", "binding", true); - public static AnyType addBindingTypeToParamType(ParamType param, String property, - String selector, String type, String uri) { + 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) { + 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().get( - SmooksModelUtils.ELEMENT_BINDING, false); + if (param.eContents().isEmpty()) + continue; + List<Object> bindingList = (List<Object>) param.getMixed().get(SmooksModelUtils.ELEMENT_BINDING, false); return bindingList; } } @@ -103,17 +101,18 @@ public static boolean isBeanPopulatorResource(ResourceConfigType type) { ResourceType resource = type.getResource(); - if (resource == null) return false; + if (resource == null) + return false; String value = resource.getStringValue(); - if (value != null) value = value.trim(); + 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) { + public static void setPropertyValueToAnyType(Object value, EStructuralFeature attribute, AnyType anyType) { anyType.getAnyAttribute().set(attribute, value); } @@ -122,7 +121,8 @@ 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 (pro != null) + pro = pro.trim(); if (property.equals(pro)) { return binding; } @@ -132,21 +132,26 @@ public static boolean isInnerFileContents(ResourceConfigType resourceConfig) { ResourceType resource = resourceConfig.getResource(); - if (resource == null) return false; + if (resource == null) + return false; String type = resource.getType(); - if (type != null) type = type.trim(); + 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; + if (type1.equalsIgnoreCase(type)) + return true; } return false; } public static boolean isDateTypeSelector(ResourceConfigType type) { ResourceType resource = type.getResource(); - if (resource == null) return false; + if (resource == null) + return false; String value = resource.getStringValue(); - if (value != null) value = value.trim(); + 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)) { @@ -158,13 +163,15 @@ public static String getTransformType(ResourceConfigType resourceConfig) { ParamType typeParam = null; - if (resourceConfig == null) return ""; + 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 (name != null) + name = name.trim(); if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(name)) { typeParam = param; break; @@ -178,7 +185,8 @@ } public static void setTransformType(ResourceConfigType resourceConfig, String type) { - if (type == null) type = ""; + if (type == null) + type = ""; if (isTransformTypeResourceConfig(resourceConfig)) { List paramList = resourceConfig.getParam(); for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { @@ -209,7 +217,8 @@ public static boolean isTransformTypeResourceConfig(ResourceConfigType resourceConfig) { String selector = resourceConfig.getSelector(); - if (selector != null) selector = selector.trim(); + if (selector != null) + selector = selector.trim(); if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { return false; } @@ -221,7 +230,8 @@ for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType p = (ParamType) iterator.next(); String paramName = p.getName(); - if (paramName != null) paramName = paramName.trim(); + if (paramName != null) + paramName = paramName.trim(); if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(paramName)) { return true; } @@ -230,14 +240,14 @@ } } - public static void setParamText(String paramName, String value, - ResourceConfigType resourceConfigType) { + 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; + if (n == null) + continue; n = n.trim(); if (n.equalsIgnoreCase(paramName)) { param = paramType; @@ -257,7 +267,8 @@ for (Iterator iterator = plist.iterator(); iterator.hasNext();) { ParamType p = (ParamType) iterator.next(); String n = p.getName(); - if (n == null) continue; + if (n == null) + continue; n = n.trim(); if (paramName.equalsIgnoreCase(n)) { return getAnyTypeText(p); @@ -272,8 +283,7 @@ } public static String getAnyTypeText(AnyType anyType) { - Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, - true); + Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); if (value != null) { if (value instanceof List && !((List) value).isEmpty()) { return ((List) value).get(0).toString().trim(); @@ -284,8 +294,7 @@ } public static String getAnyTypeCDATA(AnyType anyType) { - Object value = anyType.getMixed().get( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); + Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); if (value != null) { if (value instanceof List && !((List) value).isEmpty()) { return ((List) value).get(0).toString().trim(); @@ -296,8 +305,7 @@ } public static String getAnyTypeComment(AnyType anyType) { - Object value = anyType.getMixed().get( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, true); + Object value = anyType.getMixed().get(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, true); if (value != null) { if (value instanceof List && !((List) value).isEmpty()) { return ((List) value).get(0).toString().trim(); @@ -307,8 +315,7 @@ return null; } - public static AnyType createBindingType(String property, String selector, String type, - String uri) { + public static AnyType createBindingType(String property, String selector, String type, String uri) { if (uri == null) { uri = SmooksPackage.eNS_URI; } @@ -331,23 +338,19 @@ smooksModel.getMixed().add(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); } - public static void setTextToSmooksType(EditingDomain editingDomain, AnyType smooksModel, - String text) { + public static void setTextToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String text) { CompoundCommand ccommand = new CompoundCommand(); - List<String> listValue = new ArrayList<String>(); - listValue.add(text); - Command 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)); + 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();) { + 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)); + 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()) { @@ -359,24 +362,20 @@ } editingDomain.getCommandStack().execute(ccommand); } - - public static void setCommentToSmooksType(EditingDomain editingDomain, AnyType smooksModel, - String cdata) { + + public static void setCommentToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String comment) { CompoundCommand ccommand = new CompoundCommand(); - List<String> listValue = new ArrayList<String>(); - listValue.add(cdata); - Command addCommand = AddCommand.create(editingDomain, smooksModel, - XMLTypePackage.Literals.ANY_TYPE__MIXED, FeatureMapUtil.createEntry( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, cdata)); - Object removeValue = (smooksModel.getMixed().get( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, true)); + 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();) { + 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)); + 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()) { @@ -389,23 +388,19 @@ editingDomain.getCommandStack().execute(ccommand); } - public static void setCDATAToSmooksType(EditingDomain editingDomain, AnyType smooksModel, - String cdata) { + public static void setCDATAToSmooksType(EditingDomain editingDomain, AnyType smooksModel, String cdata) { CompoundCommand ccommand = new CompoundCommand(); - List<String> listValue = new ArrayList<String>(); - listValue.add(cdata); - Command 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)); + 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();) { + 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)); + 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()) { @@ -433,24 +428,22 @@ } public static void cleanTextToSmooksType(AnyType smooksModel) { - Object obj = smooksModel.getMixed().get( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); + 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); + 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)); + 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) { @@ -460,8 +453,7 @@ public static void addJavaInput(SmooksGraphicsExtType ext, String className) { InputType javaInput = SmooksGraphicsExtFactory.eINSTANCE.createInputType(); javaInput.setType(INPUT_TYPE_JAVA); - org.jboss.tools.smooks.model.graphics.ext.ParamType p = SmooksGraphicsExtFactory.eINSTANCE - .createParamType(); + org.jboss.tools.smooks.model.graphics.ext.ParamType p = SmooksGraphicsExtFactory.eINSTANCE.createParamType(); p.setName(PARAM_NAME_CLASS); p.setValue(className); javaInput.getParam().add(p); @@ -471,23 +463,24 @@ 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_XSD.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(); + .next(); if ("path".equals(paramType.getName())) { String value = paramType.getValue(); - if (value != null) value = value.trim(); + if (value != null) + value = value.trim(); return value; } } } return null; } - - public static List<ConditionType> collectConditionType(SmooksResourceListType resourceList){ + + public static List<ConditionType> collectConditionType(SmooksResourceListType resourceList) { ConditionsType conditions = resourceList.getConditions(); - if(conditions != null){ + if (conditions != null) { return conditions.getCondition(); } return Collections.emptyList(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -61,7 +61,7 @@ import org.jboss.tools.smooks.model.dbrouting.ResultSetRowSelector; import org.jboss.tools.smooks.model.fileRouting.OutputStream; import org.jboss.tools.smooks.model.freemarker.Freemarker; -import org.jboss.tools.smooks.model.groovy.ScriptType; +import org.jboss.tools.smooks.model.groovy.Groovy; import org.jboss.tools.smooks.model.iorouting.IORouter; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; @@ -669,6 +669,7 @@ boolean added = false; AddSmooksResourceAction action = (AddSmooksResourceAction) iterator.next(); Object descriptor = action.getDescriptor(); + if (isReader(descriptor)) { readers.add(action); added = true; @@ -722,7 +723,7 @@ if(descriptor instanceof CommandParameter){ CommandParameter parameter = (CommandParameter)descriptor; if(parameter.getValue() != null){ - if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof ScriptType){ + if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Groovy){ return true; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -135,11 +135,10 @@ protected void createSmooksTreeViewer(FormToolkit tool, final IManagedForm managedForm, Composite rootMainControl) { - configurationSection = tool.createSection(rootMainControl, Section.TITLE_BAR - | Section.DESCRIPTION); + configurationSection = tool.createSection(rootMainControl, Section.TITLE_BAR); configurationSection .setDescription("Define Smooks elements for configuration file in the following section."); - configurationSection.setText("Smooks elements"); + configurationSection.setText("Message Filtering Resources"); sectionPart = new SectionPart(configurationSection); managedForm.addPart(sectionPart); GridData gd = new GridData(GridData.FILL_HORIZONTAL); 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 2009-05-11 05:24:57 UTC (rev 15146) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-11 08:45:42 UTC (rev 15147) @@ -164,7 +164,7 @@ labelComposite.setLayout(layout); GridData gd = new GridData(GridData.FILL_HORIZONTAL); Control labelControl = null; - + if (!isLink) { Label label = formToolKit.createLabel(labelComposite, displayName + " :"); label.setForeground(formToolKit.getColors().getColor(IFormColors.TITLE)); @@ -183,7 +183,7 @@ gd.horizontalAlignment = GridData.BEGINNING; gd.verticalAlignment = GridData.BEGINNING; notificationComposite.setLayoutData(gd); - + wrapper.setLabelControl(labelControl); wrapper.setMarker(notificationComposite); return wrapper; @@ -473,8 +473,12 @@ return; } String text = SmooksModelUtils.getAnyTypeText((AnyType) fm); - if (!valueText.getText().equals(text)) { - SmooksModelUtils.setTextToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + if (valueText.getText() == null || valueText.getText().length() == 0) { + SmooksModelUtils.setTextToSmooksType(fEditingDomain, (AnyType) fm, null); + } else { + if (!valueText.getText().equals(text)) { + SmooksModelUtils.setTextToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + } } } }); @@ -486,8 +490,12 @@ return; } String text = SmooksModelUtils.getAnyTypeComment((AnyType) fm); - if (!valueText.getText().equals(text)) { - SmooksModelUtils.setCommentToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + if (valueText.getText() == null || valueText.getText().length() == 0) { + SmooksModelUtils.setCommentToSmooksType(fEditingDomain, (AnyType) fm, null); + } else { + if (!valueText.getText().equals(text)) { + SmooksModelUtils.setCommentToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + } } } }); @@ -499,8 +507,12 @@ return; } String text = SmooksModelUtils.getAnyTypeCDATA((AnyType) fm); - if (!valueText.getText().equals(text)) { - SmooksModelUtils.setCDATAToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + if (valueText.getText() == null || valueText.getText().length() == 0) { + SmooksModelUtils.setCDATAToSmooksType(fEditingDomain, (AnyType) fm, null); + } else { + if (!valueText.getText().equals(text)) { + SmooksModelUtils.setCDATAToSmooksType(fEditingDomain, (AnyType) fm, valueText.getText()); + } } } }); @@ -511,8 +523,12 @@ public void modifyText(ModifyEvent e) { Object editValue = getEditValue(itemPropertyDescriptor, fm); if (editValue != null) { - if (!editValue.equals(valueText.getText())) { - itemPropertyDescriptor.setPropertyValue(fm, valueText.getText()); + if (valueText.getText() == null || valueText.getText().length() == 0) { + itemPropertyDescriptor.setPropertyValue(fm, null); + } else { + if (!editValue.equals(valueText.getText())) { + itemPropertyDescriptor.setPropertyValue(fm, valueText.getText()); + } } } else { itemPropertyDescriptor.setPropertyValue(fm, valueText.getText()); @@ -614,6 +630,11 @@ Object value = propertyDescriptor.getPropertyValue(model); if (value != null && value instanceof PropertyValueWrapper) { Object editValue = ((PropertyValueWrapper) value).getEditableValue(model); + if (searchComposite.getText().getText() == null + || searchComposite.getText().getText().length() == 0) { + propertyDescriptor.setPropertyValue(model, null); + return; + } if (editValue != null) { if (!editValue.equals(searchComposite.getText().getText())) { propertyDescriptor.setPropertyValue(model, searchComposite.getText().getText()); @@ -825,11 +846,12 @@ style = style | SWT.READ_ONLY; } final Combo combo = new Combo(parent, style); + combo.add(""); if (items != null) { for (int i = 0; i < items.length; i++) { combo.add(items[i]); if (items[i].equals(editValue)) { - currentSelect = i; + currentSelect = i + 1; } } } @@ -844,6 +866,10 @@ combo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { String text = combo.getText(); + if (text == null || text.length() == 0) { + fipd.setPropertyValue(fm, null); + return; + } Object setValue = text; if (fp != null) { setValue = fp.wrapValue(text); @@ -916,13 +942,17 @@ searchComposite.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { Object editValue = getEditValue(propertyDescriptor, model); - Object value = searchComposite.getText().getText(); - if (editValue != null) { - if (!editValue.equals(value)) { + String value = searchComposite.getText().getText(); + if (value == null || value.length() == 0) { + propertyDescriptor.setPropertyValue(model, null); + } else { + if (editValue != null) { + if (!editValue.equals(value)) { + propertyDescriptor.setPropertyValue(model, value); + } + } else { propertyDescriptor.setPropertyValue(model, value); } - } else { - propertyDescriptor.setPropertyValue(model, value); } } });