From jbosstools-commits at lists.jboss.org Thu May 5 14:56:06 2011 Content-Type: multipart/mixed; boundary="===============9133362868331258534==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r31111 - in branches/jbosstools-3.2.x/smooks: plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration and 3 other directories. Date: Thu, 05 May 2011 14:56:05 -0400 Message-ID: <201105051856.p45Iu52n030834@svn01.web.mwc.hst.phx2.redhat.com> --===============9133362868331258534== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: tfennelly Date: 2011-05-05 14:56:04 -0400 (Thu, 05 May 2011) New Revision: 31111 Added: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/launch/JavaGraphBuilder.java Modified: branches/jbosstools-3.2.x/smooks/ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/configuration/RuntimeMetadata.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/configuration/editors/javabean12/PropertiesAndSetterM= ethodSearchFieldEditorCreator.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/launch/SmooksLaunchShortcut.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/o= rg/jboss/tools/smooks/launch/SmooksLauncher.java Log: https://issues.jboss.org/browse/JBIDE-7509 Launch Configuration doesn't work for Java Sources Property changes on: branches/jbosstools-3.2.x/smooks ___________________________________________________________________ Added: svn:mergeinfo + /trunk/smooks:29129-29130,29167-29168 Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2011-05-05 17:10:= 17 UTC (rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2011-05-05 18:56:= 04 UTC (rev 31111) @@ -50,7 +50,7 @@ * @author tom.fennelly(a)jbos= s.com */ public class RuntimeMetadata { - + private String inputClassName =3D null; private Smooks metadataExtractor; private boolean isSmooksConfig; private boolean isValidSmooksConfig; @@ -70,7 +70,21 @@ // Build dependency map... RuntimeDependency.addDependencyChecklist(metadataExtractor); } + = + = = + public String getInputClassName() { + return inputClassName; + } + + + + public void setInputClassName(String inputClassName) { + this.inputClassName =3D inputClassName; + } + + + public boolean isSmooksConfig() { return isSmooksConfig; } @@ -188,19 +202,24 @@ if (inputType !=3D null) { String inputPath =3D inputParams.getProperty(inputType); if (inputPath !=3D null) { - String resolvedFilePath; + String resolvedFilePath =3D null; try { resolvedFilePath =3D SmooksUIUtils.parseFilePath(inputPath.trim()); } catch (Exception e) { // It's not a valid config... inputFile =3D new File(inputPath.trim()); - return; +// return; } - - inputFile =3D new File(resolvedFilePath); - if (SmooksModelUtils.INPUT_TYPE_JAVA.equals(inputType) || (inputFile.= exists() && inputFile.isFile())) { + if(resolvedFilePath !=3D null){ + inputFile =3D new File(resolvedFilePath); + } + if (SmooksModelUtils.INPUT_TYPE_JAVA.equals(inputType)){ isValidSmooksConfig =3D true; + setInputClassName(inputPath); } + if ((inputFile.exists() && inputFile.isFile())) { + isValidSmooksConfig =3D true; + } } } } catch (Exception e) { Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java 20= 11-05-05 17:10:17 UTC (rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/editors/SelectorCreationDialog.java 20= 11-05-05 18:56:04 UTC (rev 31111) @@ -11,22 +11,10 @@ package org.jboss.tools.smooks.configuration.editors; = import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.lang.reflect.Array; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; = -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; @@ -35,8 +23,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; = -import org.w3c.dom.Document; - import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -70,8 +56,6 @@ import org.jboss.tools.smooks.configuration.editors.edireader12.EDIDataPar= ser; import org.jboss.tools.smooks.configuration.editors.input.InputParameter; import org.jboss.tools.smooks.configuration.editors.input.InputType; -import org.jboss.tools.smooks.configuration.editors.javabean12.JavaBeanMod= el; -import org.jboss.tools.smooks.configuration.editors.javabean12.JavaBeanMod= elFactory; import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataPar= ser; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.wizard.StructuredDataS= electionWizard; @@ -80,10 +64,12 @@ import org.jboss.tools.smooks.configuration.editors.xml.XMLObjectAnalyzer; import org.jboss.tools.smooks.configuration.editors.xml.XSDObjectAnalyzer; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.launch.JavaGraphBuilder; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.milyn.Smooks; import org.milyn.payload.JavaSource; +import org.w3c.dom.Document; = /** * @author Dart (dpeng(a)redhat.com) @@ -539,109 +525,6 @@ return super.close(); } = - public static class JavaGraphBuilder { - - public T buildGraph(Class messageType) { - try { - return buildObject(messageType); - } catch (Exception e) { - e.printStackTrace(); - throw new IllegalArgumentException("Unable to construct an in= stance of '" + messageType.getName() + "'", e); - } - } - - @SuppressWarnings("unchecked") - private T buildObject(Class objectType) throws IllegalAccessExcep= tion, InstantiationException, InvocationTargetException, NoSuchMethodExcept= ion { - - if(String.class.isAssignableFrom(objectType)) { - return objectType.cast("x"); - } else if(Number.class.isAssignableFrom(objectType)) { - return objectType.getConstructor(String.class).newInstance("1= "); - } else if(objectType.isPrimitive()) { - return (T) primitiveToObjectMap.get(objectType); - } else if(objectType =3D=3D Object.class) { - // don't construct raw Object types... leave them and just re= turn null... - return null; - } else if(objectType.isEnum()) { - return (T) EnumSet.allOf((Class)objectType).iterator().nex= t(); - } - - T messageInstance =3D objectType.newInstance(); - - // populate all the fields... - Method[] methods =3D objectType.getMethods(); - for(Method method : methods) { - if(method.getName().startsWith("set") && method.getParameterT= ypes().length =3D=3D 1) { - Class propertyType =3D method.getParameterTypes()[0]; - Object propertyInstance =3D null; - - if(Collection.class.isAssignableFrom(propertyType)) { - propertyInstance =3D buildCollection(method, property= Type); - } else if(propertyType.isArray()) { - propertyInstance =3D buildArray(method, propertyType); - } else { - propertyInstance =3D buildObject(propertyType); - } - - if(propertyInstance !=3D null) { - method.invoke(messageInstance, propertyInstance); - } - } - } - - return messageInstance; - } - - private Object buildArray(Method method, Class propertyType) throws A= rrayIndexOutOfBoundsException, IllegalArgumentException, IllegalAccessExcep= tion, InstantiationException, InvocationTargetException, NoSuchMethodExcept= ion { - Class arrayType =3D propertyType.getComponentType(); - Object[] arrayObj =3D (Object[]) Array.newInstance(arrayType, 1); - = - Array.set(arrayObj, 0, buildObject(arrayType)); - = - return arrayObj; - } - - private Object buildCollection(Method method, Class propertyType) thr= ows IllegalAccessException, InstantiationException, InvocationTargetExcepti= on, NoSuchMethodException { - Type genericType =3D method.getGenericParameterTypes()[0]; - - if(genericType instanceof ParameterizedType) { - ParameterizedType genericTypeClass =3D (ParameterizedType) genericT= ype; - Collection collection =3D null; - - if(!propertyType.isInterface()) { - // It's a concrete Collection type... just create an instance... - collection =3D (Collection) propertyType.newInstance(); - }else if(List.class.isAssignableFrom(propertyType)) { - collection =3D new ArrayList(); - } else if(Set.class.isAssignableFrom(propertyType)) { - collection =3D new LinkedHashSet(); - } - = - if(collection !=3D null) { - collection.add(buildObject((Class) genericTypeClass.getActual= TypeArguments()[0])); - return collection; - } - } - = - return null; - } - = - private static final Map primitiveToObjectMap; - - static { - primitiveToObjectMap =3D new HashMap(); - primitiveToObjectMap.put(int.class, 1); - primitiveToObjectMap.put(long.class, 1L); - primitiveToObjectMap.put(boolean.class, true); - primitiveToObjectMap.put(float.class, 1f); - primitiveToObjectMap.put(double.class, 1d); - primitiveToObjectMap.put(char.class, '1'); - primitiveToObjectMap.put(byte.class, Byte.parseByte("1")); - primitiveToObjectMap.put(short.class, 1); - } - - } - public static Document getModel(Class theModelClass) throws Exception { try { Object objectGraph =3D graphBuilder.buildGraph(theModelClass); Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/configuration/editors/javabean12/PropertiesAnd= SetterMethodSearchFieldEditorCreator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/editors/javabean12/PropertiesAndSetter= MethodSearchFieldEditorCreator.java 2011-05-05 17:10:17 UTC (rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/configuration/editors/javabean12/PropertiesAndSetter= MethodSearchFieldEditorCreator.java 2011-05-05 18:56:04 UTC (rev 31111) @@ -73,10 +73,10 @@ for (int i =3D 0; i < children.length; i++) { Control child =3D children[i]; if(child instanceof Button){ - child.setEnabled(false); +// child.setEnabled(false); } } - editPart.getContentControl().setEnabled(false); +// editPart.getContentControl().setEnabled(false); return editPart; } } Copied: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/= src/org/jboss/tools/smooks/launch/JavaGraphBuilder.java (from rev 29168, tr= unk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/lau= nch/JavaGraphBuilder.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/JavaGraphBuilder.java = (rev 0) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/JavaGraphBuilder.java 2011-05-05 18:56:04 UTC= (rev 31111) @@ -0,0 +1,131 @@ +package org.jboss.tools.smooks.launch; + +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.milyn.Smooks; +import org.milyn.payload.JavaSource; +import org.w3c.dom.Document; + +public class JavaGraphBuilder { + + public T buildGraph(Class messageType) { + try { + return buildObject(messageType); + } catch (Exception e) { + e.printStackTrace(); + throw new IllegalArgumentException("Unable to construct an ins= tance of '" + messageType.getName() + "'", e); + } + } + + @SuppressWarnings("unchecked") + private T buildObject(Class objectType) throws IllegalAccessExcept= ion, InstantiationException, InvocationTargetException, NoSuchMethodExcepti= on { + + if(String.class.isAssignableFrom(objectType)) { + return objectType.cast("x"); + } else if(Number.class.isAssignableFrom(objectType)) { + return objectType.getConstructor(String.class).newInstance("1"= ); + } else if(objectType.isPrimitive()) { + return (T) primitiveToObjectMap.get(objectType); + } else if(objectType =3D=3D Object.class) { + // don't construct raw Object types... leave them and just ret= urn null... + return null; + } else if(objectType.isEnum()) { + return (T) EnumSet.allOf((Class)objectType).iterator().next= (); + } + + T messageInstance =3D objectType.newInstance(); + + // populate all the fields... + Method[] methods =3D objectType.getMethods(); + for(Method method : methods) { + if(method.getName().startsWith("set") && method.getParameterTy= pes().length =3D=3D 1) { + Class propertyType =3D method.getParameterTypes()[0]; + Object propertyInstance =3D null; + + if(Collection.class.isAssignableFrom(propertyType)) { + propertyInstance =3D buildCollection(method, propertyT= ype); + } else if(propertyType.isArray()) { + propertyInstance =3D buildArray(method, propertyType); + } else { + propertyInstance =3D buildObject(propertyType); + } + + if(propertyInstance !=3D null) { + method.invoke(messageInstance, propertyInstance); + } + } + } + + return messageInstance; + } + + private Object buildArray(Method method, Class propertyType) throws Ar= rayIndexOutOfBoundsException, IllegalArgumentException, IllegalAccessExcept= ion, InstantiationException, InvocationTargetException, NoSuchMethodExcepti= on { + Class arrayType =3D propertyType.getComponentType(); + Object[] arrayObj =3D (Object[]) Array.newInstance(arrayType, 1); + = + Array.set(arrayObj, 0, buildObject(arrayType)); + = + return arrayObj; + } + + private Object buildCollection(Method method, Class propertyType) thro= ws IllegalAccessException, InstantiationException, InvocationTargetExceptio= n, NoSuchMethodException { + Type genericType =3D method.getGenericParameterTypes()[0]; + + if(genericType instanceof ParameterizedType) { + ParameterizedType genericTypeClass =3D (ParameterizedType) genericTy= pe; + Collection collection =3D null; + + if(!propertyType.isInterface()) { + // It's a concrete Collection type... just create an instance... + collection =3D (Collection) propertyType.newInstance(); + }else if(List.class.isAssignableFrom(propertyType)) { + collection =3D new ArrayList(); + } else if(Set.class.isAssignableFrom(propertyType)) { + collection =3D new LinkedHashSet(); + } + = + if(collection !=3D null) { + collection.add(buildObject((Class) genericTypeClass.getActualT= ypeArguments()[0])); + return collection; + } + } + = + return null; + } + = + private static final Map primitiveToObjectMap; + + static { + primitiveToObjectMap =3D new HashMap(); + primitiveToObjectMap.put(int.class, 1); + primitiveToObjectMap.put(long.class, 1L); + primitiveToObjectMap.put(boolean.class, true); + primitiveToObjectMap.put(float.class, 1f); + primitiveToObjectMap.put(double.class, 1d); + primitiveToObjectMap.put(char.class, '1'); + primitiveToObjectMap.put(byte.class, Byte.parseByte("1")); + primitiveToObjectMap.put(short.class, 1); + } + +} + Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2011-0= 5-05 17:10:17 UTC (rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2011-0= 5-05 18:56:04 UTC (rev 31111) @@ -80,8 +80,8 @@ launchMetadata.setSmooksConfig(project.findMember(smooksConfigName)); = if(SmooksInputType.INPUT_TYPE_JAVA.equals(launchMetadata.getInputType())= ) { - displayError(smooksConfigName, Messages.SmooksLaunchConfigurationDelega= te_Error_Java_Unsupported); - return; +// displayError(smooksConfigName, Messages.SmooksLaunchConfigurationDele= gate_Error_Java_Unsupported); +// return; } else if(!launchMetadata.isValidSmooksConfig()) { displayError(smooksConfigName, launchMetadata.getErrorMessage()); return; @@ -107,6 +107,9 @@ = String inputType =3D launchMetadata.getInputType(); String inputPath =3D launchMetadata.getInputFile().getAbsolutePath(); + if(SmooksInputType.INPUT_TYPE_JAVA.equals(launchMetadata.getInputType())= ) { + inputPath =3D launchMetadata.getInputClassName(); + } String nodeTypes =3D launchMetadata.getNodeTypesString(); = runConfig.setProgramArguments(new String[] {launchMetadata.getConfigFile= ().getAbsolutePath(), inputType, inputPath, nodeTypes}); @@ -155,6 +158,7 @@ File wsRootDir =3D ResourcesPlugin.getWorkspace().getRoot().getRawLocati= on().toFile(); File wsTempClasses =3D new File(wsRootDir, "temp/launcher/classes"); //$= NON-NLS-1$ = = + writeClassToFilesys(JavaGraphBuilder.class, wsTempClasses); writeClassToFilesys(SmooksLauncher.class, wsTempClasses); writeClassToFilesys(SmooksInputType.class, wsTempClasses); writeClassToFilesys(ProcessNodeType.class, wsTempClasses); Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java 2011-05-05 17:10:17= UTC (rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java 2011-05-05 18:56:04= UTC (rev 31111) @@ -106,8 +106,8 @@ RuntimeMetadata metadata =3D new RuntimeMetadata(); metadata.setSmooksConfig(elementToLaunch); if(SmooksInputType.INPUT_TYPE_JAVA.equals(metadata.getInputType())) { - MessageDialog.openError(getShell(), Messages.SmooksLaunchShortcut_Tit= le_Launch_Failed, Messages.SmooksLaunchConfigurationDelegate_Error_Java_Uns= upported); - return; +// MessageDialog.openError(getShell(), Messages.SmooksLaunchShortcut_T= itle_Launch_Failed, Messages.SmooksLaunchConfigurationDelegate_Error_Java_U= nsupported); +// return; } else if (!metadata.isValidSmooksConfig()) { MessageDialog.openError(getShell(), Messages.SmooksLaunchShortcut_Tit= le_Launch_Failed, metadata.getErrorMessage()); return; Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.u= i/src/org/jboss/tools/smooks/launch/SmooksLauncher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLauncher.java 2011-05-05 17:10:17 UTC (= rev 31110) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/= org/jboss/tools/smooks/launch/SmooksLauncher.java 2011-05-05 18:56:04 UTC (= rev 31111) @@ -30,6 +30,7 @@ import java.util.Properties; import java.util.Set; = +import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; = import org.jboss.tools.smooks.configuration.ProcessNodeType; @@ -37,6 +38,7 @@ import org.jboss.tools.smooks.launch.serialize.ObjectSerializer; import org.milyn.Smooks; import org.milyn.payload.JavaResult; +import org.milyn.payload.JavaSource; import org.milyn.payload.StringResult; import org.xml.sax.SAXException; = @@ -59,54 +61,64 @@ if(args.length !=3D 4) { throw new RuntimeException(localizedMessages.getProperty("SmooksLaunche= r_Error_Expected_Four_Args")); //$NON-NLS-1$ } - = + Source inputSource =3D null; if(args[1].equals(SmooksInputType.INPUT_TYPE_JAVA)) { - System.out.println(localizedMessages.getProperty("SmooksLauncher_Error_= Do_Not_Support_Java_Inputs")); //$NON-NLS-1$ + Class clazz; + try { + clazz =3D Class.forName(args[2]); + System.out.println(clazz); + JavaGraphBuilder graphBuilder =3D new JavaGraphBuilder(); + = + Object objectGraph =3D graphBuilder.buildGraph(clazz); + inputSource =3D new JavaSource(objectGraph); + } catch (ClassNotFoundException e) { + System.out.println("Class not found \n" + e.getLocalizedMessage()); + } } else { - File smooksConfig =3D new File(args[0]); File input =3D new File(args[2]); - = - assertFile(smooksConfig, "Smooks"); //$NON-NLS-1$ assertFile(input, "Input"); //$NON-NLS-1$ + inputSource =3D new StreamSource(new FileInputStream(input)); = + } = + = + File smooksConfig =3D new File(args[0]); + assertFile(smooksConfig, "Smooks"); //$NON-NLS-1$ + Smooks smooks =3D new Smooks(smooksConfig.toURI().getPath()); + try { + Set processNodeTypes =3D SmooksLauncher.fromNodeTypeSt= ring(args[3]); + JavaResult javaResult =3D new JavaResult(); + boolean nothingDisplayed =3D true; = - Smooks smooks =3D new Smooks(smooksConfig.toURI().getPath()); - try { - Set processNodeTypes =3D SmooksLauncher.fromNodeTypeS= tring(args[3]); - JavaResult javaResult =3D new JavaResult(); - boolean nothingDisplayed =3D true; + if(processNodeTypes.contains(ProcessNodeType.TEMPLATING)) { + StringResult stringResult =3D new StringResult(); = - if(processNodeTypes.contains(ProcessNodeType.TEMPLATING)) { - StringResult stringResult =3D new StringResult(); - = - smooks.filterSource(new StreamSource(new FileInputStream(input)), str= ingResult, javaResult); - System.out.println("[" + localizedMessages.getProperty("SmooksLaunche= r_Templating_To_StreamResult") + " ...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$N= ON-NLS-3$ + smooks.filterSource(inputSource, stringResult, javaResult); + System.out.println("[" + localizedMessages.getProperty("SmooksLauncher= _Templating_To_StreamResult") + " ...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ + System.out.println(" |--"); //$NON-NLS-1$ + System.out.println(indent(stringResult.toString())); + System.out.println(" |--\n"); //$NON-NLS-1$ + nothingDisplayed =3D false; + } else { + smooks.filterSource(inputSource, javaResult); + } + System.out.println("successfully"); + Collection serializedJavaResults =3D ObjectSerializer= .serialize(javaResult); + if(!serializedJavaResults.isEmpty()) { + System.out.println("[" + localizedMessages.getProperty("SmooksLauncher= _Java_Mapping_Results") + "...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + = + for(ObjectSerializer serializedJavaResult : serializedJavaResults) { System.out.println(" |--"); //$NON-NLS-1$ - System.out.println(indent(stringResult.toString())); - System.out.println(" |--\n"); //$NON-NLS-1$ - nothingDisplayed =3D false; - } else { - smooks.filterSource(new StreamSource(new FileInputStream(input)), jav= aResult); + System.out.println(indent(serializedJavaResult.getSerializedForm())); + System.out.println(" |--"); //$NON-NLS-1$ } - - Collection serializedJavaResults =3D ObjectSerialize= r.serialize(javaResult); - if(!serializedJavaResults.isEmpty()) { - System.out.println("[" + localizedMessages.getProperty("SmooksLaunche= r_Java_Mapping_Results") + "...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - = - for(ObjectSerializer serializedJavaResult : serializedJavaResults) { - System.out.println(" |--"); //$NON-NLS-1$ - System.out.println(indent(serializedJavaResult.getSerializedForm())); - System.out.println(" |--"); //$NON-NLS-1$ - } - nothingDisplayed =3D false; - } - = - if(nothingDisplayed) { - System.out.println(localizedMessages.getProperty("SmooksLauncher_Noth= ing_To_Display")); //$NON-NLS-1$ - } - } finally { - smooks.close(); + nothingDisplayed =3D false; } - } = + = + if(nothingDisplayed) { + System.out.println(localizedMessages.getProperty("SmooksLauncher_Nothi= ng_To_Display")); //$NON-NLS-1$ + } + } finally { + smooks.close(); + } } = private static Properties loadLocalizedMessages() { --===============9133362868331258534==--