Author: DartPeng Date: 2009-12-08 02:30:50 -0500 (Tue, 08 Dec 2009) New Revision: 19095 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigFileHandle.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/input/InputType.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/xml/XMLUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java Log: JBIDE-5377 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigFileHandle.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigFileHandle.java 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigFileHandle.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -53,9 +53,9 @@ protected String[] createSupportURI() { return new String[] { org.jboss.tools.smooks.model.smooks.SmooksPackage.eNS_URI, - XslPackage.eNS_URI, FreemarkerPackage.eNS_URI, GroovyPackage.eNS_URI, CalcPackage.eNS_URI, - DatasourcePackage.eNS_URI, FileRoutingPackage.eNS_URI, IoroutingPackage.eNS_URI, - JmsroutingPackage.eNS_URI }; + "http://www.milyn.org/xsd/smooks-1.0.xsd", XslPackage.eNS_URI, FreemarkerPackage.eNS_URI, + GroovyPackage.eNS_URI, CalcPackage.eNS_URI, DatasourcePackage.eNS_URI, FileRoutingPackage.eNS_URI, + IoroutingPackage.eNS_URI, JmsroutingPackage.eNS_URI }; } private final SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, @@ -121,9 +121,9 @@ } private boolean unSupportUIR(String uri) { -// if (EdiPackage.eNS_URI.equals(uri)) { -// return true; -// } + // if (EdiPackage.eNS_URI.equals(uri)) { + // return true; + // } return false; } 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 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -148,7 +148,9 @@ while (command2 instanceof CommandWrapper) { command2 = ((CommandWrapper) command2).getCommand(); } - handleInputParamChange(command2); + if (handleInputParamChange(command2)) { + break; + } } } else { handleInputParamChange(rawCommand); @@ -156,7 +158,6 @@ } } }); - } private CheckboxTableViewer inputDataViewer; @@ -306,7 +307,7 @@ } } - protected void handleInputParamChange(Command command) { + protected boolean handleInputParamChange(Command command) { Collection<?> affectedObjects = command.getAffectedObjects(); boolean refreshInputModel = false; for (Iterator<?> iterator2 = affectedObjects.iterator(); iterator2.hasNext();) { @@ -350,6 +351,8 @@ if (refreshInputModel) { refreshInputModelView(); } + + return refreshInputModel; } private void handleCommandStack(CommandStack commandStack) { @@ -857,7 +860,8 @@ getEditingDomain().getCommandStack().execute(c); } } - this.inputTypeChanged(); + // if (command == null) + // this.inputTypeChanged(); // SmooksGraphicsExtType ext = getSmooksGraphicsExtType(); // if (ext != null) { // List<ISmooksGraphChangeListener> listeners = ((SmooksGraphicsExtType) @@ -1128,7 +1132,7 @@ } protected void showInputDataWizard() { - + CompoundCommand compoundCommand = new CompoundCommand(); // SmooksGraphicsExtType extType = getSmooksGraphicsExtType(); String inputType = getSmooksModelProvider().getInputType(); List<InputType> inputTypes = null; @@ -1145,7 +1149,7 @@ String path = dialog.getPath(); Properties pros = dialog.getProperties(); inputTypes = SmooksUIUtils.recordInputDataInfomation(getEditingDomain(), getSmooksConfigResourceList() - .getParams(), type, path, pros); + .getParams(), type, path, pros, compoundCommand); } } else { IStructuredDataSelectionWizard wizard = ViewerInitorStore.getInstance().getStructuredDataCreationWizard( @@ -1156,7 +1160,7 @@ String path = wizard.getStructuredDataSourcePath(); Properties pros = wizard.getProperties(); inputTypes = SmooksUIUtils.recordInputDataInfomation(getEditingDomain(), getSmooksConfigResourceList() - .getParams(), inputType, path, pros); + .getParams(), inputType, path, pros, compoundCommand); } } @@ -1167,13 +1171,26 @@ ((List) obj).add(addedInputType); } - deactiveAllInputFile(null); + deactiveAllInputFile(compoundCommand); if (inputType.equals(SmooksModelUtils.INPUT_TYPE_CUSTOME)) { // don't active the input file } else { - setInputDataActiveStatus(true, addedInputType, null); + addedInputType.setActived(true); + ParamType param = addedInputType.getRelatedParameter(); + if (param != null) { + String value = SmooksModelUtils.INPUT_ACTIVE_TYPE; + Command c = SetCommand.create(this.getEditingDomain(), param, + SmooksPackage.Literals.PARAM_TYPE__TYPE, value); + if (c.canExecute()) { + compoundCommand.append(c); + } + } } - inputTypeChanged(); + if (!compoundCommand.isEmpty()) { + getSmooksModelProvider().getEditingDomain().getCommandStack().execute(compoundCommand); + } + if (inputDataViewer != null) + inputDataViewer.refresh(); } } @@ -1194,11 +1211,13 @@ Throwable t = SelectorCreationDialog.getCurrentException(); if (t != null) { if (this.getManagedForm() != null) { - if(t instanceof SmooksException && t.getCause() != null) { + if (t instanceof SmooksException && t.getCause() != null) { t = t.getCause(); } - this.getManagedForm().getMessageManager().addMessage("input error", - "Check Reader Configuration. Error creating Input Model from Input Data.\nError: " + t.getMessage(), null, IMessageProvider.ERROR); + this.getManagedForm().getMessageManager().addMessage( + "input error", + "Check Reader Configuration. Error creating Input Model from Input Data. Error: \"" + + t.getMessage() + "\"", null, IMessageProvider.ERROR); } } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/input/InputType.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/input/InputType.java 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/input/InputType.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -3,10 +3,14 @@ import java.util.ArrayList; import java.util.List; +import org.jboss.tools.smooks.model.smooks.ParamType; + public class InputType { private String path; private String type; private boolean actived = false; + + private ParamType relatedParameter = null; private List<InputParameter> parameters = null; @@ -19,8 +23,26 @@ } return parameters; } + /** + * @return the relatedParameter + */ + public ParamType getRelatedParameter() { + return relatedParameter; + } + + + /** + * @param relatedParameter the relatedParameter to set + */ + public void setRelatedParameter(ParamType relatedParameter) { + this.relatedParameter = relatedParameter; + } + + + + /** * @return the path */ public String getPath() { 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-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -35,6 +35,7 @@ import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; @@ -195,7 +196,7 @@ Csv12Package.eNS_URI, Edi12Package.eNS_URI, Jmsrouting12Package.eNS_URI, Json12Package.eNS_URI, Persistence12Package.eNS_URI, Rules10Package.eNS_URI, Validation10Package.eNS_URI }; - public static String[] SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES = new String[] { }; + public static String[] SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES = new String[] {}; public static final String FILE_PRIX = "File:/"; //$NON-NLS-1$ @@ -336,20 +337,23 @@ return beanIdList; } -// public static List<BindingsType> getBindingsTypeList(SmooksResourceListType resourceList) { -// if (resourceList == null) { -// return null; -// } -// List<AbstractResourceConfig> rlist = resourceList.getAbstractResourceConfig(); -// List<BindingsType> beanIdList = new ArrayList<BindingsType>(); -// for (Iterator<?> iterator = rlist.iterator(); iterator.hasNext();) { -// AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); -// if (abstractResourceConfig instanceof BindingsType) { -// beanIdList.add((BindingsType) abstractResourceConfig); -// } -// } -// return beanIdList; -// } + // public static List<BindingsType> + // getBindingsTypeList(SmooksResourceListType resourceList) { + // if (resourceList == null) { + // return null; + // } + // List<AbstractResourceConfig> rlist = + // resourceList.getAbstractResourceConfig(); + // List<BindingsType> beanIdList = new ArrayList<BindingsType>(); + // for (Iterator<?> iterator = rlist.iterator(); iterator.hasNext();) { + // AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) + // iterator.next(); + // if (abstractResourceConfig instanceof BindingsType) { + // beanIdList.add((BindingsType) abstractResourceConfig); + // } + // } + // return beanIdList; + // } public static List<BeanType> getBeanTypeList(SmooksResourceListType resourceList) { if (resourceList == null) { @@ -1305,13 +1309,17 @@ return null; } -// public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(BindingsType container, Composite parent, -// FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, -// final EObject model) { -// String classString = ((BindingsType) container).getClass_(); -// return createJavaMethodSearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, -// buttonName, model); -// } + // public static AttributeFieldEditPart + // createJavaMethodSearchFieldEditor(BindingsType container, Composite + // parent, + // FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, + // String buttonName, + // final EObject model) { + // String classString = ((BindingsType) container).getClass_(); + // return createJavaMethodSearchFieldEditor(classString, container, parent, + // toolkit, propertyDescriptor, + // buttonName, model); + // } public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(String classString, EObject container, Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, @@ -1574,13 +1582,17 @@ return editPart; } -// public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, -// FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, -// final EObject model) { -// String classString = ((BindingsType) container).getClass_(); -// return createJavaPropertySearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, -// buttonName, model); -// } + // public static AttributeFieldEditPart + // createJavaPropertySearchFieldEditor(BindingsType container, Composite + // parent, + // FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, + // String buttonName, + // final EObject model) { + // String classString = ((BindingsType) container).getClass_(); + // return createJavaPropertySearchFieldEditor(classString, container, + // parent, toolkit, propertyDescriptor, + // buttonName, model); + // } public static Object getEditValue(IItemPropertyDescriptor propertyDescriptor, Object model) { Object value = propertyDescriptor.getPropertyValue(model); @@ -2571,7 +2583,7 @@ } public static List<InputType> recordInputDataInfomation(EditingDomain domain, ParamsType paramsType, String type, - String path, Properties properties) { + String path, Properties properties, CompoundCommand compoundCommand) { List<InputType> inputTypeList = new ArrayList<InputType>(); if (type != null && path != null && domain != null) { String[] values = path.split(";"); //$NON-NLS-1$ @@ -2591,6 +2603,7 @@ inputParam.setName(type); inputParam.setStringValue(path); + input.setRelatedParameter(inputParam); List<ParamType> params = generateExtParams(type, path, properties); for (Iterator<?> iterator = params.iterator(); iterator.hasNext();) { ParamType paramType2 = (ParamType) iterator.next(); @@ -2598,33 +2611,30 @@ p.setName(getInputParameterName(input.getType(), paramType2.getName())); p.setValue(paramType2.getStringValue()); input.getParameters().add(p); + // input.setRelatedParameter(paramType2); } params.add(inputParam); Command command = AddCommand.create(domain, paramsType, SmooksPackage.Literals.PARAMS_TYPE__PARAM, params); if (command.canExecute()) { - domain.getCommandStack().execute(command); + if (compoundCommand != null) { + compoundCommand.append(command); + } else { + domain.getCommandStack().execute(command); + } + input.setRelatedParameter(inputParam); inputTypeList.add(input); } } - // try { - // extType.eResource().save(Collections.emptyMap()); - // List<ISmooksGraphChangeListener> listeners = - // extType.getChangeListeners(); - // for (Iterator<?> iterator = listeners.iterator(); - // iterator.hasNext();) { - // ISmooksGraphChangeListener smooksGraphChangeListener = - // (ISmooksGraphChangeListener) iterator.next(); - // smooksGraphChangeListener.inputTypeChanged(extType); - // } - // } catch (IOException e) { - // SmooksConfigurationActivator.getDefault().log(e); - // } } - return inputTypeList; } + public static List<InputType> recordInputDataInfomation(EditingDomain domain, ParamsType paramsType, String type, + String path, Properties properties) { + return recordInputDataInfomation(domain, paramsType, type, path, properties, null); + } + public static void expandGraphTree(List<?> expandNodes, TreeNodeEditPart rootEditPart) { for (Iterator<?> iterator = expandNodes.iterator(); iterator.hasNext();) { Object obj = iterator.next(); @@ -2733,9 +2743,9 @@ return true; } -// if (feature == JavabeanPackage.Literals.BINDINGS_TYPE__BEAN_ID) { -// return true; -// } + // if (feature == JavabeanPackage.Literals.BINDINGS_TYPE__BEAN_ID) { + // return true; + // } if (feature == Javabean12Package.Literals.BEAN_TYPE__BEAN_ID) { return true; @@ -2748,17 +2758,18 @@ if (Jmsrouting12Package.Literals.JMS12_ROUTER__BEAN_ID == feature) { return true; } -// if (JavabeanPackage.Literals.WIRING_TYPE__BEAN_ID_REF == feature) { -// return true; -// } + // if (JavabeanPackage.Literals.WIRING_TYPE__BEAN_ID_REF == feature) { + // return true; + // } if (Javabean12Package.Literals.WIRING_TYPE__BEAN_ID_REF == feature) { return true; } // for selector : -// if (JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT == feature) { -// return true; -// } + // if (JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT == + // feature) { + // return true; + // } if (CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT == feature) { return true; } @@ -2789,15 +2800,17 @@ if (SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR == feature) { return true; } -// if (JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT == feature) { -// return true; -// } -// if (JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT == feature) { -// return true; -// } -// if (JavabeanPackage.Literals.VALUE_TYPE__DATA == feature) { -// return true; -// } + // if (JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT == feature) + // { + // return true; + // } + // if (JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT == + // feature) { + // return true; + // } + // if (JavabeanPackage.Literals.VALUE_TYPE__DATA == feature) { + // return true; + // } if (Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT == feature) { return true; } @@ -2845,19 +2858,19 @@ } return false; } - - public static EStructuralFeature getClassFeature(EObject model){ - if(model == null){ + + public static EStructuralFeature getClassFeature(EObject model) { + if (model == null) { return null; } - -// if( model instanceof BindingsType){ -// return JavabeanPackage.Literals.BINDINGS_TYPE__CLASS; -// } - if(model instanceof BeanType){ + + // if( model instanceof BindingsType){ + // return JavabeanPackage.Literals.BINDINGS_TYPE__CLASS; + // } + if (model instanceof BeanType) { return Javabean12Package.Literals.BEAN_TYPE__CLASS; } - + return null; } @@ -2872,9 +2885,9 @@ return XslPackage.Literals.BIND_TO__ID; } -// if (model instanceof BindingsType) { -// return JavabeanPackage.Literals.BINDINGS_TYPE__BEAN_ID; -// } + // if (model instanceof BindingsType) { + // return JavabeanPackage.Literals.BINDINGS_TYPE__BEAN_ID; + // } if (model instanceof BeanType) { return Javabean12Package.Literals.BEAN_TYPE__BEAN_ID; @@ -2893,9 +2906,9 @@ if (model instanceof JMS12Router) { return Jmsrouting12Package.Literals.JMS12_ROUTER__BEAN_ID; } -// if (model instanceof WiringType) { -// return JavabeanPackage.Literals.WIRING_TYPE__BEAN_ID_REF; -// } + // if (model instanceof WiringType) { + // return JavabeanPackage.Literals.WIRING_TYPE__BEAN_ID_REF; + // } if (model instanceof org.jboss.tools.smooks.model.javabean12.WiringType) { return Javabean12Package.Literals.WIRING_TYPE__BEAN_ID_REF; @@ -2906,9 +2919,9 @@ public static EStructuralFeature getSelectorFeature(EObject model) { if (model == null) return null; -// if (model instanceof BindingsType) { -// return JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT; -// } + // if (model instanceof BindingsType) { + // return JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT; + // } if (model instanceof Counter) { return CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT; } @@ -2942,15 +2955,15 @@ return SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR; } -// if (model instanceof WiringType) { -// return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; -// } -// if (model instanceof ExpressionType) { -// return JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT; -// } -// if (model instanceof ValueType) { -// return JavabeanPackage.Literals.VALUE_TYPE__DATA; -// } + // if (model instanceof WiringType) { + // return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; + // } + // if (model instanceof ExpressionType) { + // return JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT; + // } + // if (model instanceof ValueType) { + // return JavabeanPackage.Literals.VALUE_TYPE__DATA; + // } if (model instanceof BeanType) { return Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT; @@ -2978,12 +2991,13 @@ } public static boolean isSmooks1_1PlatformConflictXMLNS(String ns) { -// for (int i = 0; i < SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES.length; i++) { -// String n = SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES[i]; -// if (n.equals(ns)) { -// return true; -// } -// } + // for (int i = 0; i < SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES.length; + // i++) { + // String n = SMOOKS_PLATFORM_1_1_CONFLICT_NAMESPACES[i]; + // if (n.equals(ns)) { + // return true; + // } + // } return false; } @@ -2991,11 +3005,11 @@ if (version == null || element == null) return false; String ns = element.eClass().getEPackage().getNsURI(); -// if (SmooksConstants.VERSION_1_1.equals(version)) { -// if (isSmooks1_2PlatformSpecialXMLNS(ns)) { -// return true; -// } -// } + // if (SmooksConstants.VERSION_1_1.equals(version)) { + // if (isSmooks1_2PlatformSpecialXMLNS(ns)) { + // return true; + // } + // } if (SmooksConstants.VERSION_1_2.equals(version)) { if (isSmooks1_1PlatformConflictXMLNS(ns)) { @@ -3007,17 +3021,20 @@ } public static String judgeSmooksPlatformVersion(EObject smooksModel) { -// if (smooksModel instanceof org.jboss.tools.smooks.model.smooks.DocumentRoot) { -// EMap<String, String> nsMap = ((org.jboss.tools.smooks.model.smooks.DocumentRoot) smooksModel) -// .getXMLNSPrefixMap(); -// for (Iterator<String> iterator = nsMap.values().iterator(); iterator.hasNext();) { -// String ns = iterator.next(); -// if (isSmooks1_2PlatformSpecialXMLNS(ns)) { -// return SmooksConstants.VERSION_1_2; -// } -// } -//// return SmooksConstants.VERSION_1_1; -// } + // if (smooksModel instanceof + // org.jboss.tools.smooks.model.smooks.DocumentRoot) { + // EMap<String, String> nsMap = + // ((org.jboss.tools.smooks.model.smooks.DocumentRoot) smooksModel) + // .getXMLNSPrefixMap(); + // for (Iterator<String> iterator = nsMap.values().iterator(); + // iterator.hasNext();) { + // String ns = iterator.next(); + // if (isSmooks1_2PlatformSpecialXMLNS(ns)) { + // return SmooksConstants.VERSION_1_2; + // } + // } + // // return SmooksConstants.VERSION_1_1; + // } return SmooksConstants.VERSION_1_2; } @@ -3129,13 +3146,13 @@ } } else { AbstractReader reader = rlist.getAbstractReader().get(0); - if ( CSV12Reader.class.isInstance(reader)) { + if (CSV12Reader.class.isInstance(reader)) { inputType = SmooksModelUtils.INPUT_TYPE_CSV; } - if ( EDI12Reader.class.isInstance(reader)) { + if (EDI12Reader.class.isInstance(reader)) { inputType = SmooksModelUtils.INPUT_TYPE_EDI_1_1; } - if ( Json12Reader.class.isInstance(reader)) { + if (Json12Reader.class.isInstance(reader)) { inputType = SmooksModelUtils.INPUT_TYPE_JSON_1_1; } if (ReaderType.class.isInstance(reader)) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLUtils.java 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLUtils.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -27,10 +27,12 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.xml.serialize.XMLSerializer; +import org.w3c.dom.DOMConfiguration; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSOutput; import org.w3c.dom.ls.LSSerializer; /** @@ -148,9 +150,32 @@ public static void outDOMNode(Node node, OutputStream os) throws TransformerConfigurationException, TransformerException { - Transformer transformer = XMLUtils.getTransformer(); - Source source = new DOMSource(node); - Result result = new StreamResult(os); - transformer.transform(source, result); + + Document document = null; + if (node instanceof Document) { + document = (Document) node; + } else { + document = node.getOwnerDocument(); + } + Object ls = null; + if (document != null) { + ls = document.getImplementation().getFeature("LS", "3.0"); + } + if (ls != null && ls instanceof DOMImplementationLS) { + LSSerializer lss = ((DOMImplementationLS) ls).createLSSerializer(); + DOMConfiguration domConfiguration = lss.getDomConfig(); + if (domConfiguration.canSetParameter("format-pretty-print", Boolean.TRUE)) { + lss.getDomConfig().setParameter("format-pretty-print", Boolean.TRUE); + } + LSOutput lsoutput = ((DOMImplementationLS) ls).createLSOutput(); + lsoutput.setByteStream(os); + lss.write(node, lsoutput); + } else { + Transformer transformer = XMLUtils.getTransformer(); + Source source = new DOMSource(node); + Result result = new StreamResult(os); + transformer.transform(source, result); + } + } } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -1147,7 +1147,7 @@ } public boolean autoLayout(boolean animation) { - GraphAnimation graphAnimation = new GraphAnimation(); + final GraphAnimation graphAnimation = new GraphAnimation(); HashMap<Object, Node> nodeMap = new HashMap<Object, Node>(); DirectedGraph directedGraph = collectionGraphInformation(nodeMap); IAutoLayout layout = getAutoLayout(); @@ -1155,7 +1155,7 @@ layout.visit(directedGraph); Iterator<?> it = nodeMap.keySet().iterator(); Map<IMoveableModel, Point> map = new HashMap<IMoveableModel, Point>(); - List<GraphicalEditPart> figureList = new ArrayList<GraphicalEditPart>(); + final List<GraphicalEditPart> figureList = new ArrayList<GraphicalEditPart>(); while (it.hasNext()) { GraphicalEditPart part = (GraphicalEditPart) it.next(); Node node = (Node) nodeMap.get(part); @@ -1165,8 +1165,25 @@ map.put(graphicalModel, new Point(node.x, node.y)); graphAnimation.recordFinal(part, new Rectangle(node.x, node.y, 0, 0)); } + IEditorSite editorSite = getEditorSite(); + if (animation) { - graphAnimation.start(figureList); + if (editorSite != null) { + editorSite.getShell().getDisplay().syncExec(new Runnable() { + + /* + * (non-Javadoc) + * + * @see java.lang.Runnable#run() + */ + public void run() { + graphAnimation.start(figureList); + } + + }); + } else { +// graphAnimation.start(figureList); + } } Iterator<IMoveableModel> it1 = map.keySet().iterator(); while (it1.hasNext()) { 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 2009-12-08 07:30:47 UTC (rev 19094) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-12-08 07:30:50 UTC (rev 19095) @@ -923,66 +923,79 @@ return; if (model == null) pageBook.showEmptyPage(); - FormToolkit toolkit = ((AbstractSmooksFormEditor) this.smooksModelProvider).getToolkit(); - if (model instanceof TaskType) { - String id = ((TaskType) model).getId(); - if (!isSingltonEditor(id)) { - String idref = generateTaskSpecailID((TaskType) model); - if (idref != null) { - // idref = id + "_" + idref; - if (getRegisteTaskPage(idref) == null) { - IEditorPart editor = createEditorPart(id); - this.registeTaskDetailsPage(editor, idref); + final Object finalModel = model; + pageBook.getShell().getDisplay().syncExec(new Runnable() { + + /* + * (non-Javadoc) + * + * @see java.lang.Runnable#run() + */ + public void run() { + FormToolkit toolkit = ((AbstractSmooksFormEditor) smooksModelProvider).getToolkit(); + if (finalModel instanceof TaskType) { + String id = ((TaskType) finalModel).getId(); + if (!isSingltonEditor(id)) { + String idref = generateTaskSpecailID((TaskType) finalModel); + if (idref != null) { + // idref = id + "_" + idref; + if (getRegisteTaskPage(idref) == null) { + IEditorPart editor = createEditorPart(id); + registeTaskDetailsPage(editor, idref); + } + id = idref; + } else { + id = id + "_unknown"; //$NON-NLS-1$ + } } - id = idref; - } else { - id = id + "_unknown"; //$NON-NLS-1$ - } - } - if (id != null) { - if (!pageBook.hasPage(id)) { - Composite parent = pageBook.createPage(id); - Object page = getRegisteTaskPage(id); - if (page != null && page instanceof IEditorPart) { - try { - parent.setLayout(new FillLayout()); + if (id != null) { + if (!pageBook.hasPage(id)) { + Composite parent = pageBook.createPage(id); + Object page = getRegisteTaskPage(id); + if (page != null && page instanceof IEditorPart) { + try { + parent.setLayout(new FillLayout()); + ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page) + .getAdapter(ITaskNodeProvider.class); + if (nodeProvider != null) { + nodeProvider.setTaskType((TaskType) finalModel); + } + createTaskPage((IEditorPart) page, parent); + pageBook.showPage(id); + parent.setData(page); + + } catch (Throwable e) { + e.printStackTrace(); + pageBook.removePage(id); + pageBook.showPage(emptyKey); + } + } else { + Control control = createTaskPanel(parent, toolkit, id); + if (control != null) { + pageBook.showPage(id); + } else { + pageBook.removePage(id); + pageBook.showPage(emptyKey); + } + } + } else { + Object page = getRegisteTaskPage(id); ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page) .getAdapter(ITaskNodeProvider.class); if (nodeProvider != null) { - nodeProvider.setTaskType((TaskType) model); + nodeProvider.setTaskType((TaskType) finalModel); } - createTaskPage((IEditorPart) page, parent); pageBook.showPage(id); - parent.setData(page); - - } catch (Throwable e) { - e.printStackTrace(); - pageBook.removePage(id); - pageBook.showPage(emptyKey); } - } else { - Control control = createTaskPanel(parent, toolkit, id); - if (control != null) { - pageBook.showPage(id); - } else { - pageBook.removePage(id); - pageBook.showPage(emptyKey); - } } } else { - Object page = getRegisteTaskPage(id); - ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page) - .getAdapter(ITaskNodeProvider.class); - if (nodeProvider != null) { - nodeProvider.setTaskType((TaskType) model); - } - pageBook.showPage(id); + // pageBook.showEmptyPage(); } } - } else { - // pageBook.showEmptyPage(); - } + + }); + } protected IEditorSite createSite(IEditorPart editor) {