Author: tfennelly Date: 2011-06-21 13:32:00 -0400 (Tue, 21 Jun 2011) New Revision: 32261 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBeanSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/messages.properties Log: JBDS-1440: Smooks Java-To-XML FreeMarker Fails in ESB https://issues.jboss.org/browse/JBDS-1440 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2011-06-21 17:23:00 UTC (rev 32260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2011-06-21 17:32:00 UTC (rev 32261) @@ -59,7 +59,9 @@ splitTokens[1] = null; // no formatting } - if(splitTokens[0].endsWith("!")) { //$NON-NLS-1$ + if(splitTokens[0].endsWith("[0]!")) { //$NON-NLS-1$ + splitTokens[0] = splitTokens[0].substring(0, splitTokens[0].length() - 4); + } else if(splitTokens[0].endsWith("!")) { //$NON-NLS-1$ splitTokens[0] = splitTokens[0].substring(0, splitTokens[0].length() - 1); } } else { @@ -136,7 +138,7 @@ } builder.append(tokens[i]); } - builder.append("\"]"); + builder.append("\"][0]!"); } return builder.toString(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBeanSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBeanSelectionWizardPage.java 2011-06-21 17:23:00 UTC (rev 32260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBeanSelectionWizardPage.java 2011-06-21 17:32:00 UTC (rev 32261) @@ -259,6 +259,8 @@ } protected void refreshJavaBeanModel() { + String error = null; + if (beanClass == null || "".equals(beanClass.trim())) { //$NON-NLS-1$ } else { try { @@ -290,8 +292,14 @@ } } catch (JavaModelException e1) { } catch (ClassNotFoundException e1) { + error = Messages.JavaBeanSelectionWizardPage_CantFindClass1 + beanClass + Messages.JavaBeanSelectionWizardPage_QuoteChar; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + } catch (UnsupportedClassVersionError e) { + error = Messages.JavaBeanSelectionWizardPage_UnsupportedClassVersionError; } } + + this.setErrorMessage(error); + this.setPageComplete(error == null); } private void createBeanClassControls(Composite mainComposite) { @@ -403,6 +411,8 @@ e.printStackTrace(); } catch (ClassNotFoundException e) { error = Messages.JavaBeanSelectionWizardPage_CantFindClass1 + beanClass + Messages.JavaBeanSelectionWizardPage_QuoteChar; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + } catch (UnsupportedClassVersionError e) { + error = Messages.JavaBeanSelectionWizardPage_UnsupportedClassVersionError; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Messages.java 2011-06-21 17:23:00 UTC (rev 32260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Messages.java 2011-06-21 17:32:00 UTC (rev 32261) @@ -21,6 +21,7 @@ public static String JavaBeanSelectionWizardPage_CantFindClass1; public static String JavaBeanSelectionWizardPage_CollectionClassLabel; public static String JavaBeanSelectionWizardPage_CollectionComponentClassEmptyErrorMessage; + public static String JavaBeanSelectionWizardPage_UnsupportedClassVersionError; public static String JavaBeanSelectionWizardPage_CollectionLabel; public static String JavaBeanSelectionWizardPage_QuoteChar; public static String JavaBeanSelectionWizardPage_WizardDes; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/messages.properties 2011-06-21 17:23:00 UTC (rev 32260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/messages.properties 2011-06-21 17:32:00 UTC (rev 32261) @@ -15,6 +15,7 @@ JavaBeanSelectionWizardPage_CantFindClass1=Can't find the class " JavaBeanSelectionWizardPage_CollectionClassLabel=Collection Class : JavaBeanSelectionWizardPage_CollectionComponentClassEmptyErrorMessage=Colletion component class is empty +JavaBeanSelectionWizardPage_UnsupportedClassVersionError=Class compile version not supported by Java Environment JavaBeanSelectionWizardPage_CollectionLabel=Collection JavaBeanSelectionWizardPage_QuoteChar=" JavaBeanSelectionWizardPage_WizardDes=Specify the incoming Java Class sample for this configuration.