[jbosstools-commits] JBoss Tools SVN: r20088 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: configuration/editors and 15 other directories.

Author: DartPeng Date: 2010-02-03 03:21:54 -0500 (Wed, 03 Feb 2010) New Revision: 20088 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/messages.properties Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/UnSetFeatureCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CSVInputDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaPropertiesSelectionDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/serialize/ObjectSerializer.java Log: JBIDE-5774 done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -5,6 +5,7 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.configuration.command.messages"; //$NON-NLS-1$ public static String UnSetFeatureCommand_commandlabel; + public static String UnSetFeatureCommand_QuoteChar; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/UnSetFeatureCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/UnSetFeatureCommand.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/UnSetFeatureCommand.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -32,7 +32,7 @@ super(); this.model = model; this.attribute = attribute; - this.setLabel(Messages.UnSetFeatureCommand_commandlabel + this.attribute.getName() + "\""); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + this.setLabel(Messages.UnSetFeatureCommand_commandlabel + this.attribute.getName() + Messages.UnSetFeatureCommand_QuoteChar); } public UnSetFeatureCommand(String label, String description) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1 +1,2 @@ UnSetFeatureCommand_commandlabel=UnSet attribute " +UnSetFeatureCommand_QuoteChar=" Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -44,7 +44,7 @@ public FileSelectionWizard() { super(); - this.setWindowTitle("File Selection"); + this.setWindowTitle(Messages.FileSelectionWizard_WizardTitle); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -7,6 +7,7 @@ public static String ChildrenSelectionWizardPage_selectchilderror; public static String ChildrenSelectionWizardPage_wizardtitle; public static String FileSelectionWizard_WizardPageName; + public static String FileSelectionWizard_WizardTitle; public static String FileSelectionWizardPage_PageDescription; public static String FileSelectionWizardPage_PageTitle; public static String ModelChildrenTablePanelCreator_DownButtonLable; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -37,7 +37,7 @@ * Apr 12, 2009 */ public class SmooksResourceChangeListener implements IResourceChangeListener { - public static final String SMOOKS_CONTENTTYPE_ID = "org.jboss.tools.smooks.ui.smooks.contentType"; + public static final String SMOOKS_CONTENTTYPE_ID = "org.jboss.tools.smooks.ui.smooks.contentType"; //$NON-NLS-1$ private IEditorPart currentEditPart = null; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CSVInputDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CSVInputDataWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CSVInputDataWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -53,7 +53,7 @@ // } if (pathPage == null) { - pathPage = new CSVDataPathWizardPage(Messages.CSVInputDataWizard_WizardPageText, new String[] {"csv"},configPage); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + pathPage = new CSVDataPathWizardPage(Messages.CSVInputDataWizard_WizardPageText, new String[] {Messages.CSVInputDataWizard_ExtensionName},configPage); if(folder != null){ pathPage.setInitSelections(new Object[]{folder}); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -8,6 +8,7 @@ public static String CSVDataPathWizardPage_ErrorPathErrorMessage; public static String CSVDataPathWizardPage_WizardDes; public static String CSVDataPathWizardPage_WizardTitle; + public static String CSVInputDataWizard_ExtensionName; public static String CSVInputDataWizard_WizardPageText; public static String CSVInputDataWizard_WizardTitle; public static String CsvReaderUICreator_AddButtonLabel; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -2,6 +2,7 @@ CSVDataPathWizardPage_ErrorPathErrorMessage=Error file path CSVDataPathWizardPage_WizardDes=Select a CSV data file CSVDataPathWizardPage_WizardTitle=CSV file selection +CSVInputDataWizard_ExtensionName=csv CSVInputDataWizard_WizardPageText=CSV Path Page CSVInputDataWizard_WizardTitle=CSV Input Data Wizard CsvReaderUICreator_AddButtonLabel=Add Field Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -62,7 +62,7 @@ // } if (pathPage == null) { - pathPage = new CSV12DataPathWizardPage(Messages.CSV12InputDataWizard_1, new String[] { "csv" }, configPage); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + pathPage = new CSV12DataPathWizardPage(Messages.CSV12InputDataWizard_1, new String[] { Messages.CSV12InputDataWizard_ExtensionName }, configPage); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ } this.addPage(pathPage); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -199,11 +199,11 @@ editPart.getFieldMarker().clean(); String error = null; if (fields == null) { - error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + error = ""; //$NON-NLS-1$ } else { fields = fields.trim(); if ("".equals(fields)) { //$NON-NLS-1$ - error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + error = ""; //$NON-NLS-1$ } else { char[] chars = fields.toCharArray(); for (int i = 0; i < chars.length; i++) { @@ -214,20 +214,20 @@ if (Character.isLetterOrDigit(c)) { } else { - error = Messages.FreemarkerCSVCreationWizardPage_Error_Incorrect + c - + Messages.FreemarkerCSVCreationWizardPage_Error_Incorrect2; + error = "" + c //$NON-NLS-1$ + + ""; //$NON-NLS-1$ break; } } String[] fieldsArray = fields.split(","); //$NON-NLS-1$ if (fieldsArray.length == 0) { - error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + error = ""; //$NON-NLS-1$ } for (int i = 0; i < fieldsArray.length; i++) { String f = fieldsArray[i]; if (f == null || "".equals(f.trim())) { //$NON-NLS-1$ - error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + error = ""; //$NON-NLS-1$ break; } } @@ -280,21 +280,21 @@ EStructuralFeature feature = ((CommandParameter) element).getEStructuralFeature(); if (v instanceof MapBinding) { if (feature == Csv12Package.Literals.CSV12_READER__MAP_BINDING) { - return "Map MapBinding"; + return org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_MapBinding; } if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) { - return "Single MapBinding"; + return org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_SingleMapBinding; } if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) { - return "List MapBinding"; + return org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_ListMapBinding; } } if (v instanceof Binding) { if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) { - return "Single Binding"; + return org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_SingleBinding; } if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) { - return "List Binding"; + return org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_ListBinding; } } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -10,19 +10,22 @@ public static String CSV12DataPathWizardPage_WizardTitle; public static String CSV12InputDataWizard_0; public static String CSV12InputDataWizard_1; + public static String CSV12InputDataWizard_ExtensionName; public static String Csv12ReaderUICreator_0; // public static String Csv12ReaderUICreator_1; // public static String Csv12ReaderUICreator_7; // public static String Csv12ReaderUICreator_8; // public static String Csv12ReaderUICreator_9; public static String Csv12ReaderUICreator_Fields; + public static String Csv12ReaderUICreator_ListBinding; + public static String Csv12ReaderUICreator_ListMapBinding; + public static String Csv12ReaderUICreator_MapBinding; public static String Csv12ReaderUICreator_Quote_Char; public static String Csv12ReaderUICreator_Record_Name; public static String Csv12ReaderUICreator_Root_Name; public static String Csv12ReaderUICreator_Separator_Char; - public static String FreemarkerCSVCreationWizardPage_Error_Fields_Empty; - public static String FreemarkerCSVCreationWizardPage_Error_Incorrect; - public static String FreemarkerCSVCreationWizardPage_Error_Incorrect2; + public static String Csv12ReaderUICreator_SingleBinding; + public static String Csv12ReaderUICreator_SingleMapBinding; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -4,13 +4,19 @@ CSV12DataPathWizardPage_WizardTitle=CSV file selection CSV12InputDataWizard_0=CSV Input Data Wizard CSV12InputDataWizard_1=CSV Path Page +CSV12InputDataWizard_ExtensionName=csv Csv12ReaderUICreator_0=Features #Csv12ReaderUICreator_1=Fields #Csv12ReaderUICreator_7=Add Field #Csv12ReaderUICreator_8=Remove #Csv12ReaderUICreator_9=field Csv12ReaderUICreator_Fields=Fields +Csv12ReaderUICreator_ListBinding=List Binding +Csv12ReaderUICreator_ListMapBinding=List MapBinding +Csv12ReaderUICreator_MapBinding=Map MapBinding Csv12ReaderUICreator_Quote_Char=Quote Character Csv12ReaderUICreator_Record_Name=Record Name Csv12ReaderUICreator_Root_Name=Root Name Csv12ReaderUICreator_Separator_Char=Separator Character +Csv12ReaderUICreator_SingleBinding=Single Binding +Csv12ReaderUICreator_SingleMapBinding=Single MapBinding Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -48,12 +48,12 @@ public EDIDataWizard() { super(); - this.setWindowTitle("EDI File Selection"); + this.setWindowTitle(Messages.EDIDataWizard_WizardTitle); } @Override public void addPages() { - ediFilePage = new EDIDataPathWizardPage(Messages.EDIDataWizard_0, new String[] { "edi" }); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + ediFilePage = new EDIDataPathWizardPage(Messages.EDIDataWizard_0, new String[] { Messages.EDIDataWizard_2 }); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ this.addPage(ediFilePage); if (folder != null) { ediFilePage.setInitSelections(new Object[] { folder }); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -8,6 +8,8 @@ public static String EDIDataPathWizardPage_Page_Description_EDI_File_Select; public static String EDIDataPathWizardPage_Page_Title_EDI_File_Select; public static String EDIDataWizard_0; + public static String EDIDataWizard_2; + public static String EDIDataWizard_WizardTitle; public static String EDIMappingDataPathWizardPage_Button_Create_New_Reader; public static String EDIMappingDataPathWizardPage_Button_Create_Readers; public static String EDIMappingDataPathWizardPage_Button_Use_Existing_Reader; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -2,6 +2,8 @@ EDIDataPathWizardPage_Page_Description_EDI_File_Select=Select a EDI data file EDIDataPathWizardPage_Page_Title_EDI_File_Select=EDI file selection EDIDataWizard_0=EDI Data Page +EDIDataWizard_2=edi +EDIDataWizard_WizardTitle=EDI File Selection EDIMappingDataPathWizardPage_Button_Create_New_Reader=Create New EDI Reader EDIMappingDataPathWizardPage_Button_Create_Readers=Create new EDI reader configurations EDIMappingDataPathWizardPage_Button_Use_Existing_Reader=Use available EDI reader configurations Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -401,7 +401,7 @@ } catch (JavaModelException e) { e.printStackTrace(); } catch (ClassNotFoundException e) { - error = Messages.JavaBeanSelectionWizardPage_CantFindClass1 + beanClass + "\""; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + 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$ } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaPropertiesSelectionDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaPropertiesSelectionDialog.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaPropertiesSelectionDialog.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -87,8 +87,8 @@ } catch (ClassNotFoundException e) { errorMessage = "'" + className + "' can't be found."; //$NON-NLS-1$ //$NON-NLS-2$ } - MessageDialog.openInformation(shell, Messages.JavaPropertiesSelectionDialog_CantOpenDialogTitle, Messages.JavaPropertiesSelectionDialog_CantOpenDialogErrorMessage1 + className + "'.\n" //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ - + errorMessage); + MessageDialog.openInformation(shell, Messages.JavaPropertiesSelectionDialog_CantOpenDialogTitle, + Messages.JavaPropertiesSelectionDialog_CantOpenDialogErrorMessage1 + className + "'.\n" + errorMessage); //$NON-NLS-1$ return null; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -17,6 +17,7 @@ public static String JavaBeanSelectionWizardPage_CollectionClassLabel; public static String JavaBeanSelectionWizardPage_CollectionComponentClassEmptyErrorMessage; public static String JavaBeanSelectionWizardPage_CollectionLabel; + public static String JavaBeanSelectionWizardPage_QuoteChar; public static String JavaBeanSelectionWizardPage_WizardDes; public static String JavaBeanSelectionWizardPage_WizardTitle; /* public static String JavabeanExpressionUICreator_ExecuteOngroupname; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -11,6 +11,7 @@ JavaBeanSelectionWizardPage_CollectionClassLabel=Collection Class : JavaBeanSelectionWizardPage_CollectionComponentClassEmptyErrorMessage=Colletion component class is empty JavaBeanSelectionWizardPage_CollectionLabel=Collection +JavaBeanSelectionWizardPage_QuoteChar=" JavaBeanSelectionWizardPage_WizardDes=Specify the incoming Java Class sample for this configuration. JavaBeanSelectionWizardPage_WizardTitle=Input Java Class #JavabeanExpressionUICreator_ExecuteOngroupname=Execute On Element Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -73,7 +73,7 @@ public void addPages() { super.addPages(); if (pathPage == null) { - pathPage = new JsonDataPathWizardPage(Messages.JsonDataWizard_PageText, new String[] { "jsn" }); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + pathPage = new JsonDataPathWizardPage(Messages.JsonDataWizard_PageText, new String[] { "jsn" }); //$NON-NLS-1$ if (folder != null) { pathPage.setInitSelections(new Object[] { folder }); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1,6 +1,7 @@ ChildrenSelectionWizardPage_selectchilderror=Please choose a child type ChildrenSelectionWizardPage_wizardtitle=Select a Child's Type FileSelectionWizard_WizardPageName=File Selection +FileSelectionWizard_WizardTitle=File Selection FileSelectionWizardPage_PageDescription=Select the file from workspace or from file system. FileSelectionWizardPage_PageTitle=File Selection ModelChildrenTablePanelCreator_DownButtonLable=Down Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -9,9 +9,28 @@ public static String JavaTypeFieldDialog_SearchDialogTitle; public static String SelectorContentProposalProvider_3; public static String SmooksUIUtils_AltTooltip; + public static String SmooksUIUtils_BigDecimal; + public static String SmooksUIUtils_BigInteger; + public static String SmooksUIUtils_Boolean; public static String SmooksUIUtils_BrowseButtonLabel; + public static String SmooksUIUtils_Byte; + public static String SmooksUIUtils_Calendar; public static String SmooksUIUtils_CantFindTypeErrorDialogTitle; + public static String SmooksUIUtils_Char; + public static String SmooksUIUtils_Charset; + public static String SmooksUIUtils_Class; public static String SmooksUIUtils_CtrlSpaceTooltip; + public static String SmooksUIUtils_Date; + public static String SmooksUIUtils_Double; + public static String SmooksUIUtils_Enum; + public static String SmooksUIUtils_Float; + public static String SmooksUIUtils_Integer; + public static String SmooksUIUtils_Long; + public static String SmooksUIUtils_Short; + public static String SmooksUIUtils_SqlDate; + public static String SmooksUIUtils_SqlTiem; + public static String SmooksUIUtils_URI; + public static String SmooksUIUtils_URL; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -484,64 +484,64 @@ if(field != null){ Class<?> fieldType = field.getType(); if(fieldType.isEnum()){ - return "Enum"; + return Messages.SmooksUIUtils_Enum; } if(fieldType == Integer.class || fieldType == int.class){ - return "Integer"; + return Messages.SmooksUIUtils_Integer; } if(fieldType == Float.class || fieldType == float.class){ - return "Float"; + return Messages.SmooksUIUtils_Float; } if(fieldType == Double.class || fieldType == double.class){ - return "Double"; + return Messages.SmooksUIUtils_Double; } if(fieldType == BigInteger.class ){ - return "BigInteger"; + return Messages.SmooksUIUtils_BigInteger; } if(fieldType == BigDecimal.class ){ - return "BigDecimal"; + return Messages.SmooksUIUtils_BigDecimal; } if(fieldType == Long.class || fieldType == long.class){ - return "Long"; + return Messages.SmooksUIUtils_Long; } if(fieldType == Boolean.class|| fieldType == boolean.class){ - return "Boolean"; + return Messages.SmooksUIUtils_Boolean; } if(fieldType == Short.class|| fieldType == short.class){ - return "Short"; + return Messages.SmooksUIUtils_Short; } if(fieldType == Byte.class|| fieldType == byte.class){ - return "Byte"; + return Messages.SmooksUIUtils_Byte; } if(fieldType == Short.class|| fieldType == short.class){ - return "Short"; + return Messages.SmooksUIUtils_Short; } if(Calendar.class.isAssignableFrom(fieldType)){ - return "Calendar"; + return Messages.SmooksUIUtils_Calendar; } if(fieldType == Class.class){ - return "Class"; + return Messages.SmooksUIUtils_Class; } if(fieldType == Date.class){ - return "Date"; + return Messages.SmooksUIUtils_Date; } if(fieldType == Character.class){ - return "Character"; + return Messages.SmooksUIUtils_Char; } if(Charset.class.isAssignableFrom(fieldType)){ - return "Charset"; + return Messages.SmooksUIUtils_Charset; } if(fieldType == java.sql.Date.class){ - return "SqlDate"; + return Messages.SmooksUIUtils_SqlDate; } if(fieldType == java.sql.Time.class){ - return "SqlTime"; + return Messages.SmooksUIUtils_SqlTiem; } if(fieldType == URI.class){ - return "URI"; + return Messages.SmooksUIUtils_URI; } if(fieldType == URL.class){ - return "URL"; + return Messages.SmooksUIUtils_URL; } } } catch (Throwable e) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -3,6 +3,25 @@ JavaTypeFieldDialog_SearchDialogTitle=Search Java Type SelectorContentProposalProvider_3=/ SmooksUIUtils_AltTooltip=Content Assist Available (Alt + /) +SmooksUIUtils_BigDecimal=BigDecimal +SmooksUIUtils_BigInteger=BigInteger +SmooksUIUtils_Boolean=Boolean SmooksUIUtils_BrowseButtonLabel=Browse +SmooksUIUtils_Byte=Byte +SmooksUIUtils_Calendar=Calendar SmooksUIUtils_CantFindTypeErrorDialogTitle=Can't find type +SmooksUIUtils_Char=Character +SmooksUIUtils_Charset=Charset +SmooksUIUtils_Class=Class SmooksUIUtils_CtrlSpaceTooltip=Content Assist Available (Ctrl + space) +SmooksUIUtils_Date=Date +SmooksUIUtils_Double=Double +SmooksUIUtils_Enum=Enum +SmooksUIUtils_Float=Float +SmooksUIUtils_Integer=Integer +SmooksUIUtils_Long=Long +SmooksUIUtils_Short=Short +SmooksUIUtils_SqlDate=SqlDate +SmooksUIUtils_SqlTiem=SqlTime +SmooksUIUtils_URI=URI +SmooksUIUtils_URL=URL Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -194,7 +194,7 @@ changeWizardPageStatus(); // don't show the error message when first open the dialog this.setErrorMessage(null); - parent.getShell().setText("Select File"); + parent.getShell().setText(Messages.AbstractFileSelectionWizardPage_WizardTitle); } protected void hookFileTextModifyListener() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -4,14 +4,20 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.configuration.editors.xml.messages"; //$NON-NLS-1$ + public static String AbstractFileSelectionWizardPage_WizardTitle; public static String XMLStructuredDataWizard_Window_Title; public static String XSDStructuredDataWizard_WizardTitle; public static String XMLTemplateCreationWizardPage_Button_Load; public static String XMLTemplateCreationWizardPage_Error_Must_Click_Load; public static String XMLTemplateCreationWizardPage_Error_Must_Select_Root; + public static String XMLTemplateCreationWizardPage_FileLabel; public static String XMLTemplateCreationWizardPage_Label_Select_Root; public static String XMLTemplateCreationWizardPage_page_description; public static String XMLTemplateCreationWizardPage_Page_Title; + public static String XMLTemplateCreationWizardPage_XMLSampleType; + public static String XMLTemplateCreationWizardPage_XMLTemplateLoadError; + public static String XMLTemplateCreationWizardPage_XSDParsingError1; + public static String XMLTemplateCreationWizardPage_XSDType; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -196,7 +196,7 @@ try { list = loadElement(fileText.getText()); if (list == null || list.isEmpty()) { - setErrorMessage("Can't get the elements in the XSD file."); + setErrorMessage(Messages.XMLTemplateCreationWizardPage_XSDParsingError1); } else { tableViewer.setInput(list); reasourceLoaded = true; @@ -256,7 +256,7 @@ mainComposite.setLayoutData(gd); Label fileTypeLabel = new Label(mainComposite, SWT.NONE); - fileTypeLabel.setText("Create Template From:"); + fileTypeLabel.setText(Messages.XMLTemplateCreationWizardPage_FileLabel); createFromDropdown = new Combo(mainComposite, SWT.READ_ONLY | SWT.BORDER); gd = new GridData(GridData.FILL_HORIZONTAL); @@ -332,7 +332,7 @@ templateSourceType = TemplateSourceType.xml; break; default : - throw new IllegalStateException("Unexpected XML Template source selection. Code must be updated to accomodate new source type."); + throw new IllegalStateException(Messages.XMLTemplateCreationWizardPage_XMLTemplateLoadError); } // Table should only be visible for XSD template sources... @@ -345,8 +345,8 @@ } private void initCombo(Combo combo2) { - combo2.add("XSD"); - combo2.add("Sample XML"); + combo2.add(Messages.XMLTemplateCreationWizardPage_XSDType); + combo2.add(Messages.XMLTemplateCreationWizardPage_XMLSampleType); } public String getInputType(){ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1,3 +1,4 @@ +AbstractFileSelectionWizardPage_WizardTitle=Select File XMLStructuredDataWizard_Window_Title=XML File Input Data Wizard XSDStructuredDataWizard_WizardTitle=Apply XML Template XMLTemplateCreationWizardPage_Button_Load=Load @@ -3,5 +4,10 @@ XMLTemplateCreationWizardPage_Error_Must_Click_Load=Press 'Load' button to load XSD root element names. XMLTemplateCreationWizardPage_Error_Must_Select_Root=Must select a root element. +XMLTemplateCreationWizardPage_FileLabel=Create Template From: XMLTemplateCreationWizardPage_Label_Select_Root=Select root element XMLTemplateCreationWizardPage_page_description=Select template generation source XMLTemplateCreationWizardPage_Page_Title=Apply XML Template +XMLTemplateCreationWizardPage_XMLSampleType=Sample XML +XMLTemplateCreationWizardPage_XMLTemplateLoadError=Unexpected XML Template source selection. Code must be updated to accomodate new source type. +XMLTemplateCreationWizardPage_XSDParsingError1=Can't get the elements in the XSD file. +XMLTemplateCreationWizardPage_XSDType=XSD Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -52,7 +52,8 @@ return classLoader; } IResource resource = SmooksUIUtils.getResource(obj); - if(resource == null) return null; + if (resource == null) + return null; try { classLoader = new ProjectClassLoader(JavaCore.create(resource.getProject())); } catch (JavaModelException e) { @@ -73,7 +74,7 @@ target2.setFeature(Csv12Package.Literals.BINDING__CLASS); target2.setTarget(Binding.class); validationTargetList.add(target2); - + ClassValidationTarget target3 = new ClassValidationTarget(); target3.setFeature(Rules10Package.Literals.RULE_BASE__PROVIDER); target3.setTarget(RuleBase.class); @@ -124,23 +125,27 @@ } String message = null; if (clazz1 == null) { - message = Messages.ClassFieldEditorValidator_Warning_Cannot_Find_Class + classString + "\""; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ - }else{ - if(Modifier.isAbstract(clazz1.getModifiers())){ + message = Messages.ClassFieldEditorValidator_Warning_Cannot_Find_Class + classString + "\""; //$NON-NLS-1$ + } else { + if (Modifier.isAbstract(clazz1.getModifiers())) { message = Messages.ClassFieldEditorValidator_Warning_Abstract_Class; - }else{ + } else { try { Constructor<?> constructor = clazz1.getConstructor(null); } catch (SecurityException e) { - message = Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced+classString+Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced2; + message = Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced + + classString + + Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced2; } catch (NoSuchMethodException e) { - message = Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced+classString+Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced2; + message = Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced + + classString + + Messages.ClassFieldEditorValidator_Warning_Class_Cannot_Be_Instanced2; } } - + } - if(message != null){ - list.add(newWaringDiagnostic(message, object,(EAttribute) feature)); + if (message != null) { + list.add(newWaringDiagnostic(message, object, (EAttribute) feature)); } break; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -17,6 +17,8 @@ public static String ValidationSection_Button_Delete_Rule; public static String ValidationSection_Button_New_Rule; public static String ValidationSection_Section_Validation; + public static String ValueDecodeParamSection_DecoderLabel; + public static String ValueDecodeParamSection_DecoderParamLabel; public static String ValueDecodeParamSection_DeleteButtonText; public static String ValueDecodeParamSection_NewParamButtonText; public static String ValueDecodeParamSection_NullText; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -83,13 +83,13 @@ static { Map<Class, Class<? extends DataDecoder>> map = DataDecoder.Factory.getInstalledDecoders(); Collection<Class<? extends DataDecoder>> decoders = map.values(); - DECODERS.add(""); + DECODERS.add(""); //$NON-NLS-1$ for (Iterator<Class<? extends DataDecoder>> iterator = decoders.iterator(); iterator.hasNext();) { Class<? extends DataDecoder> dataDecoderClass = iterator.next(); if (dataDecoderClass != null) { String name = dataDecoderClass.getSimpleName(); - if (name.endsWith("Decoder")) { - name = name.substring(0, name.length() - "Decoder".length()); + if (name.endsWith("Decoder")) { //$NON-NLS-1$ + name = name.substring(0, name.length() - "Decoder".length()); //$NON-NLS-1$ } if (!DECODERS.contains(name)) { DECODERS.add(name); @@ -130,7 +130,7 @@ } private void createDecoderCombo(TabbedPropertySheetWidgetFactory factory, Composite parent) { - factory.createLabel(controlComposite, "Decoder :").setForeground(factory.getColors().getColor(IFormColors.TITLE)); + factory.createLabel(controlComposite, Messages.ValueDecodeParamSection_DecoderLabel).setForeground(factory.getColors().getColor(IFormColors.TITLE)); decoderCombo = factory.createCCombo(parent, SWT.READ_ONLY); // decoderCombo.setEditable(false); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -194,7 +194,7 @@ gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; - Label label = factory.createLabel(sashForm, "Decoder Parameters :"); + Label label = factory.createLabel(sashForm, Messages.ValueDecodeParamSection_DecoderParamLabel); label.setLayoutData(gd); label.setForeground(factory.getColors().getColor(IFormColors.TITLE)); @@ -261,8 +261,8 @@ DataDecoder decoder = DataDecoder.Factory.create(targetPropertyType); if(decoder.getClass().getPackage() == IntegerDecoder.class.getPackage()) { String decoderName = decoder.getClass().getSimpleName(); - if(decoderName.endsWith("Decoder")) { - decoderAlias = decoderName.substring(0, decoderName.length() - "Decoder".length()); + if(decoderName.endsWith("Decoder")) { //$NON-NLS-1$ + decoderAlias = decoderName.substring(0, decoderName.length() - "Decoder".length()); //$NON-NLS-1$ int index = DECODERS.indexOf(decoderAlias); decoderCombo.select(index); } @@ -273,7 +273,7 @@ } private void initDecodeParamViewer() { - paramterViewer.setInput("NULL"); + paramterViewer.setInput("NULL"); //$NON-NLS-1$ TreeNodeConnection lineModel = (TreeNodeConnection) getPresentSelectedGraphModel(); AbstractSmooksGraphicalModel targetNode = lineModel.getTargetNode(); @@ -349,7 +349,7 @@ for(Entry<Object, Object> param : paramSet) { String paramName = param.getKey().toString(); - if(!paramName.equals("enumType")) { + if(!paramName.equals("enumType")) { //$NON-NLS-1$ DecodeParam p = new DecodeParam(); p.setName(paramName); p.setValue(param.getValue().toString()); @@ -565,10 +565,10 @@ String pname = ((DecodeParam) currentElement).getName(); DecodeParamType paramType = findDecodeParamType(pname, (ValueType) model); Command command = null; - if (!isEnumTarget && property.equals("value")) { + if (!isEnumTarget && property.equals("value")) { //$NON-NLS-1$ if (value != null) { String svalue = ((String) value).trim(); - if ("".equals(svalue)) { + if ("".equals(svalue)) { //$NON-NLS-1$ if (paramType != null) { command = RemoveCommand.create(editingDomain, paramType); } @@ -590,10 +590,10 @@ ((DecodeParam) currentElement).setValue((String) value); paramterViewer.update(currentElement, new String[] { property }); } - } else if (isEnumTarget && property.equals("name")) { + } else if (isEnumTarget && property.equals("name")) { //$NON-NLS-1$ if (value != null) { String svalue = ((String) value).trim(); - if ("".equals(svalue)) { + if ("".equals(svalue)) { //$NON-NLS-1$ // Can't blank it for an enum... ignore... } else { command = SetCommand.create(editingDomain, paramType, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -11,6 +11,8 @@ ValidationSection_Button_Delete_Rule=Delete Rule ValidationSection_Button_New_Rule=New Rule ValidationSection_Section_Validation=Validation Rules Setting +ValueDecodeParamSection_DecoderLabel=Decoder : +ValueDecodeParamSection_DecoderParamLabel=Decoder Parameters : ValueDecodeParamSection_DeleteButtonText=Delete ValueDecodeParamSection_NewParamButtonText=New Parameter ValueDecodeParamSection_NullText=<null> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -17,6 +17,7 @@ public static String SmooksJavaMappingGraphicalEditor_NodeMustLinkWithJavaBean; public static String SmooksJavaMappingGraphicalEditor_NodeMustLinkWithSource; public static String SmooksJavaMappingGraphicalEditor_NullLabel; + public static String SmooksJavaMappingGraphicalEditor_WarningMessage1; public static String SmooksProcessGraphicalEditor_4; public static String SmooksProcessGraphicalEditor_AddTaskActionText; public static String SmooksProcessGraphicalEditor_FormText; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -108,7 +108,7 @@ } if (decoder != null) { if (!decoder.equals(defaultDecoder)) { - connection.addMessage("Decoder should be '" + defaultDecoder + "'."); + connection.addMessage(Messages.SmooksJavaMappingGraphicalEditor_WarningMessage1 + defaultDecoder + "'."); //$NON-NLS-1$ connection.setSeverity(IFieldMarker.TYPE_WARINING); changed = true; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -96,14 +96,14 @@ String taskId = task.getId(); if (taskId != null) { if (taskId.equals(TASK_ID_FREEMARKER_CSV_TEMPLATE)) { - String messageType = ""; + String messageType = ""; //$NON-NLS-1$ if (task instanceof TemplateAppyTaskNode) { messageType = ((TemplateAppyTaskNode) task).getType(); } if (messageType == null) - messageType = ""; + messageType = ""; //$NON-NLS-1$ if (messageType.length() > 0){ - return Messages.TaskTypeManager_ApplyTemplateTaskLabel + " (" + messageType +")"; + return Messages.TaskTypeManager_ApplyTemplateTaskLabel + " (" + messageType +")"; //$NON-NLS-1$ //$NON-NLS-2$ }else{ return Messages.TaskTypeManager_ApplyTemplateTaskLabel; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -11,6 +11,7 @@ SmooksJavaMappingGraphicalEditor_NodeMustLinkWithJavaBean=The node must link to another Java Bean SmooksJavaMappingGraphicalEditor_NodeMustLinkWithSource=The node must be linked with input source SmooksJavaMappingGraphicalEditor_NullLabel=<NULL> +SmooksJavaMappingGraphicalEditor_WarningMessage1=Decoder should be ' SmooksProcessGraphicalEditor_4=No java mapping has been specified in the Java Mapping task. SmooksProcessGraphicalEditor_ValidationError_MultipleTemplate=Doesn't support multiple template task. SmooksProcessGraphicalEditor_AddTaskActionText=Add Task Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -287,7 +287,7 @@ Class<?> targetType = getJavaType(); if(targetType.isEnum()) { if(dataDecoder == null) { - dataDecoder = "Enum"; + dataDecoder = "Enum"; //$NON-NLS-1$ } compoundCommand.append(_newEnumDecodeParamSet(targetType, (ValueType) model)); } @@ -320,7 +320,7 @@ CompoundCommand compoundCommand = new CompoundCommand(); Field[] enumFields = enumType.getDeclaredFields(); - compoundCommand.append(addDecodeParam("enumType", enumType.getName(), valueType)); + compoundCommand.append(addDecodeParam("enumType", enumType.getName(), valueType)); //$NON-NLS-1$ for(Field enumField : enumFields) { if(enumField.isEnumConstant()) { compoundCommand.append(addDecodeParam(enumField.getName(), enumField.getName(), valueType)); @@ -454,7 +454,7 @@ } } - throw new IllegalStateException("Unexpected error. GraphModel data expected to implement WrapperItemProvider."); + throw new IllegalStateException(Messages.JavaBeanChildGraphModel_Error); } public BeanType getParentBean() { @@ -463,7 +463,7 @@ return (BeanType) sourceData.getOwner(); } - throw new IllegalStateException("Unexpected error. GraphModel data expected to implement WrapperItemProvider."); + throw new IllegalStateException(Messages.JavaBeanChildGraphModel_Error); } public Object getBindingTypeObj() { @@ -472,7 +472,7 @@ return ((ContainmentUpdatingFeatureMapEntry) sourceData.getValue()).getValue(); } - throw new IllegalStateException("Unexpected error. GraphModel data expected to implement WrapperItemProvider."); + throw new IllegalStateException(Messages.JavaBeanChildGraphModel_Error); } /* (non-Javadoc) @@ -499,12 +499,12 @@ ProjectClassLoader classLoader = new ProjectClassLoader(project); Class<?> beanClass = classLoader.loadClass(bean.getClass_()); - if(targetProperty != null && !targetProperty.trim().equals("")) { + if(targetProperty != null && !targetProperty.trim().equals("")) { //$NON-NLS-1$ StringBuilder getterNameBuilder = new StringBuilder(); getterNameBuilder.append(targetProperty); getterNameBuilder.setCharAt(0, Character.toUpperCase(targetProperty.charAt(0))); - getterNameBuilder.insert(0, "get"); + getterNameBuilder.insert(0, "get"); //$NON-NLS-1$ try { Method getterMethod = beanClass.getMethod(getterNameBuilder.toString(), new Class[] {}); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -6,6 +6,7 @@ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.graphical.editors.model.javamapping.messages"; //$NON-NLS-1$ public static String JavaBeanChildGraphModel_Array_Entry; public static String JavaBeanChildGraphModel_Collection_Entry; + public static String JavaBeanChildGraphModel_Error; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1,2 +1,3 @@ JavaBeanChildGraphModel_Array_Entry=Array Entry JavaBeanChildGraphModel_Collection_Entry=Collection Entry +JavaBeanChildGraphModel_Error=Unexpected error. GraphModel data expected to implement WrapperItemProvider. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -155,7 +155,7 @@ } else if (SmooksModelUtils.KEY_XML_FILE_TYPE_XML.equals(fileType)) { builder = new XMLSampleModelBuilder(URI.createFileURI(newFilePath)); } else { - throw new IOException("Unable to process XML template type '" + fileType + "'."); + throw new IOException(Messages.FreemarkerTemplateContentGraphModelProviderImpl_IOExceptionMessage + fileType + "'."); //$NON-NLS-1$ } try { Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/Messages.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.graphical.editors.template; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.smooks.graphical.editors.template.messages"; //$NON-NLS-1$ + public static String FreemarkerTemplateContentGraphModelProviderImpl_IOExceptionMessage; + public static String SmooksFreemarkerTemplateGraphicalEditor_WarningMessage1; + public static String SmooksFreemarkerTemplateGraphicalEditor_WarningMessage2; + public static String SmooksFreemarkerTemplateGraphicalEditor_WarningMessage3; + public static String SmooksFreemarkerTemplateGraphicalEditor_WarningMessage4; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/Messages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -98,16 +98,16 @@ AbstractSmooksGraphicalModel requiredCollectionLinkParent = parentIsRequriedCollectionNode(abstractSmooksGraphicalModel); if (requiredCollectionLinkParent != null && enforceCollectionSubMappingRules(abstractSmooksGraphicalModel)) { AbstractXMLObject parentNode = (AbstractXMLObject) requiredCollectionLinkParent.getData(); - abstractSmooksGraphicalModel.addMessage("Its parent node '" + parentNode.getName() - + "' should be connected first."); + abstractSmooksGraphicalModel.addMessage(Messages.SmooksFreemarkerTemplateGraphicalEditor_WarningMessage1 + parentNode.getName() + + Messages.SmooksFreemarkerTemplateGraphicalEditor_WarningMessage2); abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR); } if (isRequiredNode(abstractSmooksGraphicalModel)) { - abstractSmooksGraphicalModel.addMessage("This node must be linked to a Source data node"); + abstractSmooksGraphicalModel.addMessage(Messages.SmooksFreemarkerTemplateGraphicalEditor_WarningMessage3); abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR); } if (isRequiredCollectionNode(abstractSmooksGraphicalModel)) { - abstractSmooksGraphicalModel.addMessage("This node must be linked to a Source Collection node"); + abstractSmooksGraphicalModel.addMessage(Messages.SmooksFreemarkerTemplateGraphicalEditor_WarningMessage4); abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR); } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/messages.properties (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -0,0 +1,5 @@ +FreemarkerTemplateContentGraphModelProviderImpl_IOExceptionMessage=Unable to process XML template type ' +SmooksFreemarkerTemplateGraphicalEditor_WarningMessage1=Its parent node ' +SmooksFreemarkerTemplateGraphicalEditor_WarningMessage2=' should be connected first. +SmooksFreemarkerTemplateGraphicalEditor_WarningMessage3=This node must be linked to a Source data node +SmooksFreemarkerTemplateGraphicalEditor_WarningMessage4=This node must be linked to a Source Collection node Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizard.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizard.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -38,7 +38,7 @@ public JavaBeanCreationWizard(ISmooksModelProvider modelProvider, Object model) { super(modelProvider, model); - this.setWindowTitle("New Java Class Model"); + this.setWindowTitle(Messages.JavaBeanCreationWizard_WizardTitle); } public Object[] getBindings() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -4,6 +4,7 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.graphical.wizards.messages"; //$NON-NLS-1$ + public static String JavaBeanCreationWizard_WizardTitle; public static String JavaBeanCreationWizardPage_27; public static String JavaBeanCreationWizardPage_ArrayButtonText; public static String JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1,3 +1,4 @@ +JavaBeanCreationWizard_WizardTitle=New Java Class Model JavaBeanCreationWizardPage_27=" JavaBeanCreationWizardPage_ArrayButtonText=Array JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage=Java Class must be configured Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -5,6 +5,7 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.launch.messages"; //$NON-NLS-1$ public static String ExceptionHandler_Exception_Msg; + public static String SmooksLaunchConfigurationDelegate_11; public static String SmooksLaunchConfigurationDelegate_Error_Copying_Smooks_Launcher; public static String SmooksLaunchConfigurationDelegate_Error_launching; public static String SmooksLaunchConfigurationDelegate_Error_missing_artifact; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -88,7 +88,7 @@ for(RuntimeDependency dependency : dependencies) { if(!dependency.isOnProjectClasspath(projectClassLoader)) { - displayError(smooksConfigName, Messages.SmooksLaunchConfigurationDelegate_Error_missing_artifact + dependency.getGroupId() + ":" + dependency.getArtifactId() + Messages.SmooksLaunchConfigurationDelegate_Error_missing_artifact2); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + displayError(smooksConfigName, Messages.SmooksLaunchConfigurationDelegate_Error_missing_artifact + dependency.getGroupId() + ":" + dependency.getArtifactId() + Messages.SmooksLaunchConfigurationDelegate_Error_missing_artifact2); //$NON-NLS-1$ return; } } @@ -116,7 +116,7 @@ display.syncExec(new Runnable() { public void run(){ Shell shell = display.getActiveShell(); - ErrorDialog.openError(shell, Messages.SmooksLaunchConfigurationDelegate_Error_Title, Messages.SmooksLaunchConfigurationDelegate_Error_launching + smooksConfigName + "'.", new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, errorMessage, new Exception())); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + ErrorDialog.openError(shell, Messages.SmooksLaunchConfigurationDelegate_Error_Title, Messages.SmooksLaunchConfigurationDelegate_Error_launching + smooksConfigName + "'.", new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, errorMessage, new Exception())); //$NON-NLS-1$ } }); } @@ -161,16 +161,16 @@ // Need to send the localized message strings to the launcher... Properties localizedMessages = new Properties(); - localizedMessages.setProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs", Messages.SmooksLauncher_Error_Do_Not_Support_Java_Inputs); - localizedMessages.setProperty("SmooksLauncher_Error_Expected_Four_Args", Messages.SmooksLauncher_Error_Expected_Four_Args); - localizedMessages.setProperty("SmooksLauncher_Java_Mapping_Results", Messages.SmooksLauncher_Java_Mapping_Results); - localizedMessages.setProperty("SmooksLauncher_Templating_To_StreamResult", Messages.SmooksLauncher_Templating_To_StreamResult); - localizedMessages.setProperty("SmooksLauncher_Nothing_To_Display", Messages.SmooksLauncher_Nothing_To_Display); + localizedMessages.setProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs", Messages.SmooksLauncher_Error_Do_Not_Support_Java_Inputs); //$NON-NLS-1$ + localizedMessages.setProperty("SmooksLauncher_Error_Expected_Four_Args", Messages.SmooksLauncher_Error_Expected_Four_Args); //$NON-NLS-1$ + localizedMessages.setProperty("SmooksLauncher_Java_Mapping_Results", Messages.SmooksLauncher_Java_Mapping_Results); //$NON-NLS-1$ + localizedMessages.setProperty("SmooksLauncher_Templating_To_StreamResult", Messages.SmooksLauncher_Templating_To_StreamResult); //$NON-NLS-1$ + localizedMessages.setProperty("SmooksLauncher_Nothing_To_Display", Messages.SmooksLauncher_Nothing_To_Display); //$NON-NLS-1$ try { FileOutputStream messagesOutStream = getFilesysOutStream(SmooksLauncher.LOCALIZED_FILE_NAME, SmooksLauncher.class, wsTempClasses); try { - localizedMessages.store(messagesOutStream, "Localized messages..."); + localizedMessages.store(messagesOutStream, "Localized messages..."); //$NON-NLS-1$ } finally { messagesOutStream.close(); } @@ -187,8 +187,8 @@ } private void writeResourceToFilesys(String resource, Class<?> refClass, File toDir) { - String packagePath = refClass.getPackage().getName().replace(".", "/"); - String resourcePath = "/" + packagePath + "/" + resource; + String packagePath = refClass.getPackage().getName().replace(".", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + String resourcePath = "/" + packagePath + Messages.SmooksLaunchConfigurationDelegate_11 + resource; //$NON-NLS-1$ URL resourceURI = refClass.getResource(resourcePath); if(resourceURI != null) { @@ -233,8 +233,8 @@ } private FileOutputStream getFilesysOutStream(String resource, Class<?> refClass, File toDir) throws FileNotFoundException { - String packagePath = refClass.getPackage().getName().replace(".", "/"); - String resourcePath = "/" + packagePath + "/" + resource; + String packagePath = refClass.getPackage().getName().replace(".", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + String resourcePath = "/" + packagePath + "/" + resource; //$NON-NLS-1$ //$NON-NLS-2$ File resourceOutFile = new File(toDir, resourcePath); File resourcePackage = resourceOutFile.getParentFile(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -47,7 +47,7 @@ */ public class SmooksLauncher { - public static final String LOCALIZED_FILE_NAME = "localizedMessage.properties"; + public static final String LOCALIZED_FILE_NAME = "localizedMessage.properties"; //$NON-NLS-1$ /** * Launcher Main. @@ -57,11 +57,11 @@ Properties localizedMessages = loadLocalizedMessages(); if(args.length != 4) { - throw new RuntimeException(localizedMessages.getProperty("SmooksLauncher_Error_Expected_Four_Args")); + throw new RuntimeException(localizedMessages.getProperty("SmooksLauncher_Error_Expected_Four_Args")); //$NON-NLS-1$ } if(args[1].equals(SmooksInputType.INPUT_TYPE_JAVA)) { - System.out.println(localizedMessages.getProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs")); + System.out.println(localizedMessages.getProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs")); //$NON-NLS-1$ } else { File smooksConfig = new File(args[0]); File input = new File(args[2]); @@ -79,7 +79,7 @@ StringResult stringResult = new StringResult(); smooks.filterSource(new StreamSource(new FileInputStream(input)), stringResult, javaResult); - System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Templating_To_StreamResult") + " ...]"); //$NON-NLS-1$ + System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Templating_To_StreamResult") + " ...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ System.out.println(" |--"); //$NON-NLS-1$ System.out.println(indent(stringResult.toString())); System.out.println(" |--\n"); //$NON-NLS-1$ @@ -90,7 +90,7 @@ Collection<ObjectSerializer> serializedJavaResults = ObjectSerializer.serialize(javaResult); if(!serializedJavaResults.isEmpty()) { - System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Java_Mapping_Results") + "...]"); //$NON-NLS-1$ + 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$ @@ -101,7 +101,7 @@ } if(nothingDisplayed) { - System.out.println(localizedMessages.getProperty("SmooksLauncher_Nothing_To_Display")); + System.out.println(localizedMessages.getProperty("SmooksLauncher_Nothing_To_Display")); //$NON-NLS-1$ } } finally { smooks.close(); @@ -117,14 +117,14 @@ try { messages.load(messageStream); } catch (IOException e) { - System.out.println("Unexpected IOException reading classpath resource stream for '" + LOCALIZED_FILE_NAME + "'. " + e.getMessage()); + System.out.println("Unexpected IOException reading classpath resource stream for '" + LOCALIZED_FILE_NAME + "'. " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ e.printStackTrace(); } } finally { try { messageStream.close(); } catch (IOException e) { - System.out.println("Unexpected IOException closing classpath resource stream for '" + LOCALIZED_FILE_NAME + "'."); + System.out.println("Unexpected IOException closing classpath resource stream for '" + LOCALIZED_FILE_NAME + "'."); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -365,13 +365,13 @@ IStatus status= ResourcesPlugin.getWorkspace().validatePath(IPath.SEPARATOR + projectName, IResource.PROJECT); if (!status.isOK() || !Path.ROOT.isValidSegment(projectName)) { - setErrorMessage(Messages.SmooksRunTab_Error_Invalid_Project_Name + projectName + "'."); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + setErrorMessage(Messages.SmooksRunTab_Error_Invalid_Project_Name + projectName + "'."); //$NON-NLS-1$ return; } IProject project= getWorkspaceRoot().getProject(projectName); if (!project.exists()) { - setErrorMessage(Messages.SmooksRunTab_Error_Unknown_Project_Name + projectName + "'."); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ + setErrorMessage(Messages.SmooksRunTab_Error_Unknown_Project_Name + projectName + "'."); //$NON-NLS-1$ return; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-02-03 08:21:54 UTC (rev 20088) @@ -1,4 +1,5 @@ ExceptionHandler_Exception_Msg=An exception has occurred. Please check the log for details. +SmooksLaunchConfigurationDelegate_11=/ SmooksLaunchConfigurationDelegate_Error_Copying_Smooks_Launcher=Error copying SmooksLauncher to classpath. SmooksLaunchConfigurationDelegate_Error_launching=Error Launching Smooks Configuration ' SmooksLaunchConfigurationDelegate_Error_missing_artifact=This configuration depends on the ' Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/serialize/ObjectSerializer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/serialize/ObjectSerializer.java 2010-02-03 04:45:50 UTC (rev 20087) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/serialize/ObjectSerializer.java 2010-02-03 08:21:54 UTC (rev 20088) @@ -53,9 +53,9 @@ private StringWriter writer; public ObjectSerializer(Object object, String beanId, Map<String, Object> beanMap) { - assertNotNull(object, "object"); - assertNotNull(beanId, "beanId"); - assertNotNull(beanMap, "beanMap"); + assertNotNull(object, "object"); //$NON-NLS-1$ + assertNotNull(beanId, "beanId"); //$NON-NLS-1$ + assertNotNull(beanMap, "beanMap"); //$NON-NLS-1$ this.rootObject = object; this.rootBeanId = beanId; this.beanContext = beanMap; @@ -129,15 +129,15 @@ @Override public void startNode(String name, Class clazz) { if(writeNL) { - writer.write("\n"); + writer.write("\n"); //$NON-NLS-1$ } if(indent == 0) { // Root object... - writer.write("> " + rootBeanId); + writer.write("> " + rootBeanId); //$NON-NLS-1$ } else { writeIndent(indent); - writer.write("> " + name); + writer.write("> " + name); //$NON-NLS-1$ } writeNL = true; @@ -150,7 +150,7 @@ String beanId = getBeanId(item, true); if(beanId != null) { - writer.write(" (beanId = \"" + beanId + "\")"); + writer.write(" (beanId = \"" + beanId + "\")"); //$NON-NLS-1$ //$NON-NLS-2$ if(!beanId.equals(rootBeanId)) { referencedBeans.add(beanId); } @@ -209,19 +209,19 @@ Object currentItem = items.get(items.size() - 1); if((currentItem instanceof String || containsNonNumeric(text)) && !(currentItem instanceof Number)) { - writer.write(" = \"" + text + "\""); + writer.write(" = \"" + text + "\""); //$NON-NLS-1$ //$NON-NLS-2$ } else if(currentItem instanceof Number) { Class<? extends Object> itemClass = currentItem.getClass(); if(itemClass.getPackage() == Integer.class.getPackage()) { - writer.write(" = " + text + itemClass.getSimpleName().charAt(0)); + writer.write(" = " + text + itemClass.getSimpleName().charAt(0)); //$NON-NLS-1$ } else { - writer.write(" = " + text); + writer.write(" = " + text); //$NON-NLS-1$ } } else { - writer.write(" = " + text); + writer.write(" = " + text); //$NON-NLS-1$ } - writer.write("\n"); + writer.write("\n"); //$NON-NLS-1$ writeNL = false; } @@ -275,7 +275,7 @@ private void assertNotNull(Object object, String name) { if(object == null) { - throw new IllegalArgumentException("ObjectSerializer argument '" + name + "' is null."); + throw new IllegalArgumentException("ObjectSerializer argument '" + name + "' is null."); //$NON-NLS-1$ //$NON-NLS-2$ } } }