Author: bfitzpat Date: 2009-12-14 13:46:03 -0500 (Mon, 14 Dec 2009) New Revision: 19261 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/editors/csv/CSVInputDataWizard.java 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/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/json/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/messages.properties 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/validate/ClassFieldEditorValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/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/SmooksProcessGraphicalEditor.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/process/ProcessGraphicalViewerLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskType.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskTypeImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties 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/SmooksLaunchConfigurationDelegate.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java Log: JBIDE-5215: Add a "Missing Input Model" warning on the Java Mappings Task Configuration pane https://jira.jboss.org/jira/browse/JBIDE-5215 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/command/UnSetFeatureCommand.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + 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$ } public UnSetFeatureCommand(String label, String description) { 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CSVInputDataWizard.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + 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$ if(folder != null){ pathPage.setInitSelections(new Object[]{folder}); } 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/CSV12InputDataWizard.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + 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$ } 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.csv12; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -20,32 +19,24 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TextCellEditor; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; import org.jboss.tools.smooks.configuration.editors.ModelMultiChildrenTabelPanelCreator; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.graphical.wizard.freemarker.Messages; import org.jboss.tools.smooks.model.csv12.CSV12Reader; import org.jboss.tools.smooks.model.csv12.Csv12Package; @@ -54,10 +45,6 @@ */ public class Csv12ReaderUICreator extends PropertyUICreator { - - private List<FieldText> fieldsList = new ArrayList<FieldText>(); - - /* * (non-Javadoc) * @@ -75,9 +62,18 @@ } @Override + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingDomain, + FormToolkit formToolkit, Composite detailsComposite, Object model, ISmooksModelProvider formEditor, + IEditorPart editorPart) { + createFiledsComposite(editingDomain, formToolkit, detailsComposite, model, formEditor); + return super.createExtendUIOnTop(editingDomain, formToolkit, detailsComposite, model, formEditor, editorPart); + } + + @Override public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart editorPart) { - createFiledsComposite(editingdomain, toolkit, parent, model, formEditor); + // createFiledsComposite(editingdomain, toolkit, parent, model, + // formEditor); createParametersGroup(parent, (CSV12Reader) model, toolkit, formEditor, editorPart); return super.createExtendUIOnBottom(editingdomain, toolkit, parent, model, formEditor, editorPart); } @@ -87,13 +83,25 @@ if (feature.equals(Csv12Package.Literals.CSV12_READER__FIELDS)) { return true; } + if (feature.equals(Csv12Package.Literals.CSV12_READER__QUOTE)) { + return true; + } + if (feature.equals(Csv12Package.Literals.CSV12_READER__SEPARATOR)) { + return true; + } + if (feature.equals(Csv12Package.Literals.CSV12_READER__RECORD_ELEMENT_NAME)) { + return true; + } + if (feature.equals(Csv12Package.Literals.CSV12_READER__ROOT_ELEMENT_NAME)) { + return true; + } return super.ignoreProperty(feature); } private void createParametersGroup(Composite parent, CSV12Reader reader, FormToolkit toolkit, ISmooksModelProvider modelProvider, IEditorPart editorPart) { Group group = new Group(parent, SWT.NONE); - group.setText(Messages.Csv12ReaderUICreator_0); + group.setText(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_0); group.setBackground(ColorConstants.white); FillLayout fl = new FillLayout(); group.setLayout(fl); @@ -130,224 +138,113 @@ private void createFiledsComposite(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor) { - fieldsList.clear(); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - gd.heightHint = 150; - gd.horizontalSpan = 2; - Group fieldsComposite = new Group(parent, SWT.NONE); - fieldsComposite.setBackground(toolkit.getColors().getBackground()); - fieldsComposite.setText(Messages.Csv12ReaderUICreator_1); - fieldsComposite.setLayoutData(gd); - GridLayout gl = new GridLayout(); - gl.numColumns = 2; - fieldsComposite.setLayout(gl); + // fieldsList.clear(); + // GridData gd = new GridData(GridData.FILL_HORIZONTAL); + // gd.heightHint = 150; + // gd.horizontalSpan = 2; + // Group fieldsComposite = new Group(parent, SWT.NONE); + // fieldsComposite.setBackground(toolkit.getColors().getBackground()); + // fieldsComposite.setText(Messages.Csv12ReaderUICreator_1); + // fieldsComposite.setLayoutData(gd); + // GridLayout gl = new GridLayout(); + // gl.numColumns = 2; + // fieldsComposite.setLayout(gl); IItemPropertySource propertySource = (IItemPropertySource) editingdomain.getAdapterFactory().adapt(model, IItemPropertySource.class); + final IItemPropertyDescriptor descriptor = propertySource.getPropertyDescriptor(model, - Csv12Package.Literals.CSV12_READER__FIELDS); + Csv12Package.Literals.CSV12_READER__SEPARATOR); - final Object readOnlyMoel = model; + final AttributeFieldEditPart separatorEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Separator_Char, + parent, editingdomain, toolkit, descriptor, model, false, false, false, null, 0, null, + SmooksUIUtils.VALUE_TYPE_VALUE, null, false); + Text separateText = (Text) separatorEditPart.getContentControl(); + separateText.setTextLimit(1); - String fields = (String) SmooksUIUtils.getEditValue(descriptor, model); + final IItemPropertyDescriptor quotedescriptor = propertySource.getPropertyDescriptor(model, + Csv12Package.Literals.CSV12_READER__QUOTE); - gd = new GridData(GridData.FILL_BOTH); - final TableViewer fieldsViewer = new TableViewer(fieldsComposite, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); - fieldsViewer.getControl().setLayoutData(gd); - fieldsViewer.getTable().setLinesVisible(true); - fieldsViewer.setContentProvider(new FieldsContentProvider()); - fieldsViewer.setLabelProvider(new FieldsLabelProvider()); + final AttributeFieldEditPart quoteEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Quote_Char, parent, + editingdomain, toolkit, quotedescriptor, model, false, false, false, null, 0, null, + SmooksUIUtils.VALUE_TYPE_VALUE, null, false); + Text quoteText = (Text) quoteEditPart.getContentControl(); + quoteText.setTextLimit(1); - CellEditor fieldCellEditor = new TextCellEditor(fieldsViewer.getTable(), SWT.BORDER); + final IItemPropertyDescriptor fieldsDescriptor = propertySource.getPropertyDescriptor(model, + Csv12Package.Literals.CSV12_READER__FIELDS); - fieldsViewer.getTable().setLinesVisible(true); + String fields = (String) SmooksUIUtils.getEditValue(fieldsDescriptor, model); - fieldsViewer.setCellEditors(new CellEditor[] { fieldCellEditor }); + final AttributeFieldEditPart fieldsEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Fields, parent, + editingdomain, toolkit, fieldsDescriptor, model, false, false, false, null, 0, null, + SmooksUIUtils.VALUE_TYPE_VALUE, null, false); + Text text = (Text) fieldsEditPart.getContentControl(); + text.addModifyListener(new ModifyListener() { - fieldsViewer.setColumnProperties(new String[] { "field" }); //$NON-NLS-1$ + public void modifyText(ModifyEvent arg0) { + updateFieldsMessage(((Text) arg0.getSource()).getText(), fieldsEditPart); + } + }); + updateFieldsMessage(fields, fieldsEditPart); - fieldsViewer.setCellModifier(new ICellModifier() { + final IItemPropertyDescriptor recorddescriptor = propertySource.getPropertyDescriptor(model, + Csv12Package.Literals.CSV12_READER__RECORD_ELEMENT_NAME); - public void modify(Object element, String property, Object value) { - Object el = null; - if (element instanceof Item) { - el = ((Item) element).getData(); - } - if (el == null) - return; - if (el instanceof FieldText && value instanceof String) { - if (property.equals("field")) { //$NON-NLS-1$ + final AttributeFieldEditPart recordEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Record_Name, parent, + editingdomain, toolkit, recorddescriptor, model, false, false, false, null, 0, null, + SmooksUIUtils.VALUE_TYPE_VALUE, null, false); - if (value.toString().equals(((FieldText) el).getText())) { - return; - } - ((FieldText) el).setText(value.toString()); + final IItemPropertyDescriptor rootdescriptor = propertySource.getPropertyDescriptor(model, + Csv12Package.Literals.CSV12_READER__ROOT_ELEMENT_NAME); - fieldsViewer.refresh(el); - setFieldsValue(readOnlyMoel, descriptor); - } + final AttributeFieldEditPart rootEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Root_Name, parent, + editingdomain, toolkit, rootdescriptor, model, false, false, false, null, 0, null, + SmooksUIUtils.VALUE_TYPE_VALUE, null, false); - } - } + } - public Object getValue(Object element, String property) { - if (element instanceof FieldText) { - if (property.equals("field")) { //$NON-NLS-1$ - return ((FieldText) element).getText(); + protected void updateFieldsMessage(String fields, AttributeFieldEditPart editPart) { + editPart.getFieldMarker().clean(); + String error = null; + if (fields == null) { + error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + } else { + fields = fields.trim(); + if ("".equals(fields)) { //$NON-NLS-1$ + error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; + } else { + char[] chars = fields.toCharArray(); + for (int i = 0; i < chars.length; i++) { + char c = chars[i]; + if (c == ',') { + continue; } - } + if (Character.isLetterOrDigit(c)) { - return null; - } - - public boolean canModify(Object element, String property) { - if (element instanceof FieldText) { - if (property.equals("field")) { //$NON-NLS-1$ - return true; + } else { + error = Messages.FreemarkerCSVCreationWizardPage_Error_Incorrect + c + + Messages.FreemarkerCSVCreationWizardPage_Error_Incorrect2; + break; } } - return false; - } - }); - if (fields == null) { - fields = ""; //$NON-NLS-1$ - } - fillFieldsList(fields); - fieldsViewer.setInput(fieldsList); - Composite buttonComposite = toolkit.createComposite(fieldsComposite); - gd = new GridData(GridData.FILL_VERTICAL); - gd.widthHint = 100; - buttonComposite.setLayoutData(gd); - - GridLayout bgl = new GridLayout(); - buttonComposite.setLayout(bgl); - - gd = new GridData(GridData.FILL_HORIZONTAL); - - final Button addButton = new Button(buttonComposite, SWT.NONE); - addButton.setLayoutData(gd); - addButton.setText(Messages.Csv12ReaderUICreator_7); - - final Button removeButton = new Button(buttonComposite, SWT.NONE); - removeButton.setLayoutData(gd); - removeButton.setText(Messages.Csv12ReaderUICreator_8); - - addButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent e) { - // addButton.setEnabled(false); - try { - FieldText field = new FieldText(Messages.Csv12ReaderUICreator_9); - fieldsList.add(field); - fieldsViewer.refresh(); - setFieldsValue(readOnlyMoel, descriptor); - } catch (Throwable t) { - t.printStackTrace(); - } finally { - // addButton.setEnabled(true); + String[] fieldsArray = fields.split(","); //$NON-NLS-1$ + if (fieldsArray.length == 0) { + error = Messages.FreemarkerCSVCreationWizardPage_Error_Fields_Empty; } - } - - public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - - } - }); - - removeButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent e) { - IStructuredSelection s = (IStructuredSelection) fieldsViewer.getSelection(); - fieldsList.removeAll(s.toList()); - fieldsViewer.refresh(); - setFieldsValue(readOnlyMoel, descriptor); - } - - public void widgetDefaultSelected(SelectionEvent e) { - - } - }); - } - - private void setFieldsValue(Object model, IItemPropertyDescriptor ps) { - String fieldsString = ""; //$NON-NLS-1$ - for (int i = 0; i < fieldsList.size(); i++) { - FieldText fieldText = fieldsList.get(i); - fieldsString += fieldText.getText(); - if (i < fieldsList.size() - 1) { - fieldsString += ","; //$NON-NLS-1$ - } - } - ps.setPropertyValue(model, fieldsString); - } - - private void fillFieldsList(String fieldsString) { - if (fieldsString == null || fieldsString.length() == 0) - return; - String input = fieldsString.toString(); - input = input.trim(); - if (input.indexOf(",") != -1) { //$NON-NLS-1$ - String[] fields = input.split(","); //$NON-NLS-1$ - if (fields != null && fields.length > 0) { - for (int i = 0; i < fields.length; i++) { - String field = fields[i]; - if (field != null) { - field = field.trim(); - fieldsList.add(new FieldText(field)); + 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; + break; } } } - }else{ - fieldsList.add(new FieldText(input)); } - } - - private class FieldsLabelProvider extends LabelProvider { - - @Override - public String getText(Object element) { - if (element instanceof FieldText) { - return ((FieldText) element).getText(); - } - return super.getText(element); + if (error != null) { + editPart.getFieldMarker().setMarkerType(IFieldMarker.TYPE_ERROR); + editPart.getFieldMarker().setMessage(error); } - } - - private class FieldsContentProvider implements IStructuredContentProvider { - - public void dispose() { - // TODO Auto-generated method stub - - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - - } - - public Object[] getElements(Object inputElement) { - if (inputElement instanceof List<?>) { - return ((List<?>) inputElement).toArray(); - } - return new Object[] {}; - } - } - - private class FieldText { - private String text = null; - - public FieldText(String t) { - setText(t); - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - } } \ No newline at end of file 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -11,10 +11,18 @@ public static String CSV12InputDataWizard_0; public static String CSV12InputDataWizard_1; 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_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_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; 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -1,11 +1,16 @@ -CSV12DataPathWizardPage_CantFindFileErrorMessage=Can't find the file : +CSV12DataPathWizardPage_CantFindFileErrorMessage=Can't find the file \: CSV12DataPathWizardPage_ErrorFilePathErrorMessage=Error file path CSV12DataPathWizardPage_WizardDes=Select a CSV data file CSV12DataPathWizardPage_WizardTitle=CSV file selection CSV12InputDataWizard_0=CSV Input Data Wizard CSV12InputDataWizard_1=CSV Path Page Csv12ReaderUICreator_0=Features -Csv12ReaderUICreator_1=Fields -Csv12ReaderUICreator_7=Add Field -Csv12ReaderUICreator_8=Remove -Csv12ReaderUICreator_9=field +#Csv12ReaderUICreator_1=Fields +#Csv12ReaderUICreator_7=Add Field +#Csv12ReaderUICreator_8=Remove +#Csv12ReaderUICreator_9=field +Csv12ReaderUICreator_Fields=Fields +Csv12ReaderUICreator_Quote_Char=Quote Character +Csv12ReaderUICreator_Record_Name=Record Name +Csv12ReaderUICreator_Root_Name=Root Name +Csv12ReaderUICreator_Separator_Char=Separator Character 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -46,7 +46,7 @@ @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$ + ediFilePage = new EDIDataPathWizardPage(Messages.EDIDataWizard_0, new String[] { "edi" }); //$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/javabean/JavaBeanSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanSelectionWizardPage.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + error = Messages.JavaBeanSelectionWizardPage_CantFindClass1 + beanClass + "\""; //$NON-NLS-2$ //$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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaPropertiesSelectionDialog.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -87,7 +87,7 @@ } 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$ + 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); 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -4,10 +4,10 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.configuration.editors.javabean.messages"; //$NON-NLS-1$ - public static String BindingsPropertyUICreator_CantGetClassErrorMessage; +/* public static String BindingsPropertyUICreator_CantGetClassErrorMessage; public static String BindingsPropertyUICreator_ClassVCantBeEmptyErrorMessage; public static String BindingsPropertyUICreator_CreateOnElementgroupname; - public static String BindingsPropertyUICreator_ErrorDialogTitle; + public static String BindingsPropertyUICreator_ErrorDialogTitle; */ public static String JavaBeanSelectionWizardPage_ArrayCheckBoxLabel; public static String JavaBeanSelectionWizardPage_BeanClassEmptyErrorMessage; public static String JavaBeanSelectionWizardPage_BeanClassLabel; @@ -19,11 +19,11 @@ public static String JavaBeanSelectionWizardPage_CollectionLabel; public static String JavaBeanSelectionWizardPage_WizardDes; public static String JavaBeanSelectionWizardPage_WizardTitle; - public static String JavabeanExpressionUICreator_ExecuteOngroupname; - public static String JavabeanExpressionUICreator_ExpressionLabel; +/* public static String JavabeanExpressionUICreator_ExecuteOngroupname; + public static String JavabeanExpressionUICreator_ExpressionLabel; */ public static String JavabeanStrucutredDataWizard_WizardTitle; - public static String JavabeanValueUICreator_DatagroupName; - public static String JavabeanWiringUICreator_WiringOnElementGroupName; +/* public static String JavabeanValueUICreator_DatagroupName; + public static String JavabeanWiringUICreator_WiringOnElementGroupName; */ public static String JavaMethodsSelectionDialog_ErrorDialogTitle; public static String JavaMethodsSelectionDialog_ErrorMessage; public static String JavaMethodsSelectionDialog_MethodNameColumnText; 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -1,7 +1,7 @@ -BindingsPropertyUICreator_CantGetClassErrorMessage=Can't get the 'class' value. -BindingsPropertyUICreator_ClassVCantBeEmptyErrorMessage=The 'class' value shouldn't be empty. -BindingsPropertyUICreator_CreateOnElementgroupname=Create On Element -BindingsPropertyUICreator_ErrorDialogTitle=Error +#BindingsPropertyUICreator_CantGetClassErrorMessage=Can't get the 'class' value. +#BindingsPropertyUICreator_ClassVCantBeEmptyErrorMessage=The 'class' value shouldn't be empty. +#BindingsPropertyUICreator_CreateOnElementgroupname=Create On Element +#BindingsPropertyUICreator_ErrorDialogTitle=Error JavaBeanSelectionWizardPage_ArrayCheckBoxLabel=Array JavaBeanSelectionWizardPage_BeanClassEmptyErrorMessage=Bean Class is empty JavaBeanSelectionWizardPage_BeanClassLabel=Java Class \: @@ -13,11 +13,11 @@ JavaBeanSelectionWizardPage_CollectionLabel=Collection JavaBeanSelectionWizardPage_WizardDes=Specify the incoming Java Class sample for this configuration. JavaBeanSelectionWizardPage_WizardTitle=Input Java Class -JavabeanExpressionUICreator_ExecuteOngroupname=Execute On Element -JavabeanExpressionUICreator_ExpressionLabel=Expression +#JavabeanExpressionUICreator_ExecuteOngroupname=Execute On Element +#JavabeanExpressionUICreator_ExpressionLabel=Expression JavabeanStrucutredDataWizard_WizardTitle=Java Class Model Wizard -JavabeanValueUICreator_DatagroupName=Data -JavabeanWiringUICreator_WiringOnElementGroupName=Wrie On Element +#JavabeanValueUICreator_DatagroupName=Data +#JavabeanWiringUICreator_WiringOnElementGroupName=Wrie On Element JavaMethodsSelectionDialog_ErrorDialogTitle=Can't open dialog JavaMethodsSelectionDialog_ErrorMessage=Can't open java methods selection dialog.Please check the 'class' value of Java Object. JavaMethodsSelectionDialog_MethodNameColumnText=Method Name 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + pathPage = new JsonDataPathWizardPage(Messages.JsonDataWizard_PageText, new String[] { "jsn" }); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$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/json/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/Messages.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -8,7 +8,7 @@ public static String JsonDataPathWizardPage_WIzardTitle; public static String JsonDataWizard_PageText; public static String JsonDataWizard_WizardTitle; - public static String JsonReaderUICreator_KeysMapLabel; +/* public static String JsonReaderUICreator_KeysMapLabel; */ 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/json/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/messages.properties 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -2,4 +2,4 @@ JsonDataPathWizardPage_WIzardTitle=JSON file selection JsonDataWizard_PageText=JSON Input Data Selection JsonDataWizard_WizardTitle=JSON Input Data Wizard -JsonReaderUICreator_KeysMapLabel=Keys Map +#JsonReaderUICreator_KeysMapLabel=Keys Map Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -833,7 +833,7 @@ layout.numColumns = 2; layout.marginLeft = 0; layout.marginRight = 0; - layout.horizontalSpacing = 0; + layout.horizontalSpacing = 1; tcom.setLayout(layout); FieldMarkerComposite notificationComposite = new FieldMarkerComposite(tcom, SWT.NONE); @@ -854,7 +854,7 @@ tcom.setLayoutData(gd); - toolkit.paintBordersFor(textContainer); + toolkit.paintBordersFor(tcom); if (openFile) { final IFilePathProcessor processor = filePathProcessor; Button fileBrowseButton = toolkit.createButton(textContainer, Messages.SmooksUIUtils_BrowseButtonLabel, 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -124,7 +124,7 @@ } String message = null; if (clazz1 == null) { - message = Messages.ClassFieldEditorValidator_Warning_Cannot_Find_Class + classString + "\""; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ + 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_Abstract_Class; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/Messages.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -10,7 +10,7 @@ public static String SmooksConfigurationFileNewWizard_0; public static String SmooksConfigurationFileNewWizard_ErrorDialogTitle; public static String SmooksConfigurationFileNewWizard_PageName; - public static String SmooksConfigurationFileNewWizard_VersionPageName; +/* public static String SmooksConfigurationFileNewWizard_VersionPageName; */ public static String SmooksFileContainerSelectionPage_Page_Description; public static String SmooksFileContainerSelectionPage_Page_Title; public static String SmooksVersionSelectionPage_Label_Smooks_Version; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/messages.properties 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -4,7 +4,7 @@ SmooksConfigurationFileNewWizard_0=icons/smooks-wiz.gif SmooksConfigurationFileNewWizard_ErrorDialogTitle=Error SmooksConfigurationFileNewWizard_PageName=Smooks Configuration File -SmooksConfigurationFileNewWizard_VersionPageName=Smooks Version Selection +#SmooksConfigurationFileNewWizard_VersionPageName=Smooks Version Selection SmooksFileContainerSelectionPage_Page_Description=Create a new Smooks configuration file. SmooksFileContainerSelectionPage_Page_Title=Smooks Configuration File Wizard Page SmooksVersionSelectionPage_Label_Smooks_Version=Smooks platform version 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -17,6 +17,7 @@ public static String SmooksJavaMappingGraphicalEditor_NodeMustLinkWithJavaBean; public static String SmooksJavaMappingGraphicalEditor_NodeMustLinkWithSource; public static String SmooksJavaMappingGraphicalEditor_NullLabel; + public static String SmooksProcessGraphicalEditor_4; public static String SmooksProcessGraphicalEditor_AddTaskActionText; public static String SmooksProcessGraphicalEditor_FormText; public static String SmooksProcessGraphicalEditor_TaskConfigurationSectionTitle; @@ -28,6 +29,11 @@ public static String TaskTypeManager_InputTaskLabel; public static String TaskTypeManager_JavaMappingTaskLabel; public static String XSLLabelProvider_Text_Null_Value; + public static String SmooksProcessGraphicalEditor_Empty_Input_File; + public static String SmooksProcessGraphicalEditor_Java_Mapping_Not_Found; + public static String SmooksProcessGraphicalEditor_No_Input_File_Active; + public static String SmooksProcessGraphicalEditor_No_Input_Specified; + public static String SmooksProcessGraphicalEditor_No_Input_Task_Found; 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/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -71,7 +71,10 @@ import org.eclipse.zest.layouts.LayoutStyles; import org.eclipse.zest.layouts.algorithms.HorizontalTreeLayoutAlgorithm; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; +import org.jboss.tools.smooks.configuration.editors.SelectorCreationDialog; import org.jboss.tools.smooks.configuration.editors.SmooksReaderFormPage; +import org.jboss.tools.smooks.configuration.editors.input.InputType; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.validate.ISmooksModelValidateListener; import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor; @@ -89,6 +92,8 @@ import org.jboss.tools.smooks.graphical.editors.process.TaskNodeFigure; import org.jboss.tools.smooks.graphical.editors.process.TaskType; import org.jboss.tools.smooks.graphical.editors.process.TemplateAppyTaskNode; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; @@ -524,7 +529,6 @@ */ @Override public void createPartControl(Composite parent) { - // TODO Auto-generated method stub super.createPartControl(parent); updateHeaderFormMessage(); } @@ -629,6 +633,8 @@ createTaskDetailsSection(toolkit, sashForm); sashForm.setWeights(new int[] { 3, 7 }); + + validateEnd(null); } private void handleCommandStack(org.eclipse.emf.common.command.CommandStack commandStack) { @@ -647,6 +653,7 @@ for (Iterator<?> iterator = activeModel.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); if (object instanceof TaskType || object instanceof ProcessType) { + validateEnd(null); if (getProcessGraphViewer() != null) { getProcessGraphViewer().refresh(); getProcessGraphViewer().applyLayout(); @@ -667,6 +674,7 @@ Object object = (Object) iterator2.next(); object = AdapterFactoryEditingDomain.unwrap(object); if (object instanceof TaskType || object instanceof ProcessType) { + validateEnd(null); showTaskControl(null); break; } @@ -679,6 +687,7 @@ Object object = (Object) iterator2.next(); object = AdapterFactoryEditingDomain.unwrap(object); if (object instanceof TaskType) { + validateEnd(null); showTaskControl((TaskType) object); break; } @@ -693,6 +702,7 @@ object = AdapterFactoryEditingDomain.unwrap(object); if (object instanceof TaskType || object instanceof ProcessType) { if (getProcessGraphViewer() != null) { + validateEnd(null); showTaskControl(null); break; } @@ -705,6 +715,7 @@ Object object = (Object) iterator2.next(); object = AdapterFactoryEditingDomain.unwrap(object); if (object instanceof TaskType) { + validateEnd(null); showTaskControl((TaskType) object); break; } @@ -741,14 +752,14 @@ this.smooksModelProvider = smooksModelProvider; } - public EObject getSmooksResourceList() { + public SmooksResourceListType getSmooksResourceList() { if (smooksModelProvider != null) { EObject m = null; EObject smooksModel = smooksModelProvider.getSmooksModel(); if (smooksModel instanceof DocumentRoot) { m = ((DocumentRoot) smooksModel).getSmooksResourceList(); } - return m; + return (SmooksResourceListType) m; } return null; } @@ -1134,7 +1145,8 @@ ((ISmooksModelValidateListener) object).validateEnd(diagnosticResult); } } - + ProcessType process = this.getProcess(); + validateProcess(process); } public void validateStart() { @@ -1145,9 +1157,100 @@ ((ISmooksModelValidateListener) object).validateStart(); } } + } + protected void validateProcess(ProcessType process) { + if (process != null) { + validateTasks(process.getTask()); + GraphViewer viewer = this.getProcessGraphViewer(); + if (viewer != null) + viewer.refresh(); + } } + protected void validateTasks(List<TaskType> tasks) { + if (tasks == null) + return; + for (Iterator<?> iterator = tasks.iterator(); iterator.hasNext();) { + TaskType taskType = (TaskType) iterator.next(); + validateTask(taskType); + validateTasks(taskType.getTask()); + } + } + + protected void validateTask(TaskType task) { + if (task == null) + return; + task.setProblemType(IFieldMarker.TYPE_NONE); + task.cleanProblemMessages(); + String id = task.getId(); + if (TaskTypeManager.TASK_ID_INPUT.equals(id)) { + // check the input data + List<InputType> inputLists = SmooksUIUtils.getInputTypeList(getSmooksResourceListType()); + if (inputLists == null || inputLists.isEmpty()) { + task.setProblemType(IFieldMarker.TYPE_WARINING); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_Empty_Input_File); + } else { + boolean noactived = true; + for (Iterator<?> iterator = inputLists.iterator(); iterator.hasNext();) { + InputType inputType = (InputType) iterator.next(); + if (inputType.isActived()) { + noactived = false; + break; + } + } + if (noactived) { + task.setProblemType(IFieldMarker.TYPE_WARINING); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_No_Input_File_Active); + } else { + List<Object> inputs = SelectorCreationDialog.generateInputData(getSmooksResourceListType()); + if (inputs == null || inputs.size() == 0) { + task.setProblemType(IFieldMarker.TYPE_ERROR); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_No_Input_Task_Found); + } + } + } + } + if (TaskTypeManager.TASK_ID_JAVA_MAPPING.equals(id)) { + List<Object> inputs = SelectorCreationDialog.generateInputData(getSmooksResourceListType()); + if (inputs == null || inputs.size() == 0) { + task.setProblemType(IFieldMarker.TYPE_WARINING); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_No_Input_Specified); + } + SmooksResourceListType sr = getSmooksResourceListType(); + List<AbstractResourceConfig> rcs = sr.getAbstractResourceConfig(); + boolean correct = false; + for (Iterator<?> iterator = rcs.iterator(); iterator.hasNext();) { + AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); + if (abstractResourceConfig instanceof BeanType) { + correct = true; + break; + } + } + if (!correct) { + task.setProblemType(IFieldMarker.TYPE_ERROR); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_Java_Mapping_Not_Found); + } + } + + if (TaskTypeManager.TASK_ID_FREEMARKER_TEMPLATE.equals(id)) { + SmooksResourceListType sr = getSmooksResourceListType(); + List<AbstractResourceConfig> rcs = sr.getAbstractResourceConfig(); + boolean correct = false; + for (Iterator<?> iterator = rcs.iterator(); iterator.hasNext();) { + AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); + if (abstractResourceConfig instanceof BeanType) { + correct = true; + break; + } + } + if (!correct) { + task.setProblemType(IFieldMarker.TYPE_WARINING); + task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_4); + } + } + } + public void propertyChange(PropertyChangeEvent evt) { if (lockProcessChangeEvent) return; @@ -1168,6 +1271,7 @@ if (ProcessType.PRO_REMOVE_CHILD.equals(name)) { this.showTaskControl(null); } + validateEnd(null); } public void initFailed(int messageType, String message) { 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -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> +SmooksProcessGraphicalEditor_4=No java mapping has been specified in the Java Mapping task. SmooksProcessGraphicalEditor_AddTaskActionText=Add Task SmooksProcessGraphicalEditor_FormText=Smooks Processing SmooksProcessGraphicalEditor_TaskConfigurationSectionTitle=Selected Task Details @@ -22,3 +23,8 @@ TaskTypeManager_InputTaskLabel=Input Task TaskTypeManager_JavaMappingTaskLabel=Java Mapping XSLLabelProvider_Text_Null_Value=\ (Null Value) +SmooksProcessGraphicalEditor_Empty_Input_File=Input file can't be empty. +SmooksProcessGraphicalEditor_Java_Mapping_Not_Found=Mapping to Java classes is missing or incorrect. +SmooksProcessGraphicalEditor_No_Input_File_Active=No sample input file is checked. +SmooksProcessGraphicalEditor_No_Input_Specified=No Input configuration has been specified. +SmooksProcessGraphicalEditor_No_Input_Task_Found=No Input task was found. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessGraphicalViewerLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessGraphicalViewerLabelProvider.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessGraphicalViewerLabelProvider.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -15,6 +15,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.zest.core.viewers.IFigureProvider; @@ -24,6 +25,7 @@ import org.eclipse.zest.core.widgets.GraphNode; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; import org.jboss.tools.smooks.graphical.editors.SmooksProcessGraphicalEditor; import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; import org.jboss.tools.smooks.graphical.editors.TaskTypeManager.TaskTypeDescriptor; @@ -35,7 +37,13 @@ public class ProcessGraphicalViewerLabelProvider extends LabelProvider implements IFigureProvider, ISelfStyleProvider { private SmooksProcessGraphicalEditor processEditor; + + @Override + public void dispose() { + super.dispose(); + } + public ProcessGraphicalViewerLabelProvider(SmooksProcessGraphicalEditor graph) { this.processEditor = graph; } @@ -92,10 +100,42 @@ public void selfStyleConnection(Object element, GraphConnection connection) { connection.setLineColor(GraphicsConstants.BORDER_CORLOR); } + + private String getProblemMessage(List<String> message){ + String m = null; + if(message != null && !message.isEmpty()){ + m = ""; //$NON-NLS-1$ + for (Iterator<String> iterator = message.iterator(); iterator.hasNext();) { + String string = (String) iterator.next(); + m = m + " - " + string +" \n"; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + return m; + } public void selfStyleNode(Object element, GraphNode node) { if (node instanceof CGraphNode) { IFigure figure = ((CGraphNode) node).getFigure(); + if(figure instanceof TaskNodeFigure && element instanceof TaskType){ + int problem = ((TaskType)element).getProblemType(); + List<String> problemMessages = ((TaskType)element).getProblemMessages(); + + String message = getProblemMessage(problemMessages); + + ImageRegistry ir = SmooksConfigurationActivator.getDefault().getImageRegistry(); + switch(problem){ + case IFieldMarker.TYPE_NONE: + ((TaskNodeFigure)figure).getLabel().setIcon(null); + break; + case IFieldMarker.TYPE_ERROR: + ((TaskNodeFigure)figure).getLabel().setIcon(ir.get(GraphicsConstants.IMAGE_ERROR)); + break; + case IFieldMarker.TYPE_WARINING: + ((TaskNodeFigure)figure).getLabel().setIcon(ir.get(GraphicsConstants.IMAGE_WARNING)); + break; + } + ((TaskNodeFigure)figure).setProblemMessage(message); + } Dimension size = figure.getLayoutManager().getPreferredSize(figure, -1, -1); figure.setSize(size); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -44,6 +44,8 @@ * */ public class TaskNodeFigure extends Figure { + + private Label problemTooltip; private IFigure mainFigure; @@ -70,10 +72,24 @@ this.image = image; this.labelText = labelText; this.processGraphicalViewerEditor = graph; + this.problemTooltip = new Label(); initFigure(); hookTaskNodeFigure(); } + + public void setProblemMessage(String message){ + if(message == null){ + this.setToolTip(null); + }else{ + this.problemTooltip.setText(message); + this.setToolTip(problemTooltip); + } + } + public Label getLabel() { + return label; + } + private void hookTaskNodeFigure() { // this.addMouseMotionListener(new MouseMotionListener() { // Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskType.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskType.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskType.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -31,6 +31,22 @@ */ public interface TaskType { + int getProblemType(); + + /** + * + * @param type + */ + void setProblemType(int type); + + List<String> getProblemMessages(); + + void cleanProblemMessages(); + + void removeProblemMessage(String message); + + void addProblemMessage(String message); + void setPropertyChangeSupport(PropertyChangeSupport support); Object getParent(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskTypeImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskTypeImpl.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskTypeImpl.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -10,6 +10,8 @@ import java.util.ArrayList; import java.util.List; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; + /** * <!-- begin-user-doc --> An implementation of the model object ' * <em><b>Task Type</b></em>'. <!-- end-user-doc --> @@ -40,6 +42,40 @@ private List<Object> smooksModel = null; + private int problemType = IFieldMarker.TYPE_NONE; + + private List<String> problemMessages = null; + + public List<String> getProblemMessages() { + if (problemMessages == null) { + problemMessages = new ArrayList<String>(); + } + return problemMessages; + } + + public void addProblemMessage(String message) { + getProblemMessages().add(message); + } + + public void removeProblemMessage(String message) { + getProblemMessages().remove(message); + } + + public void cleanProblemMessages() { + getProblemMessages().clear(); + } + + public int getProblemType() { + return problemType; + } + + public void setProblemType(int problemType) { + if (this.problemType == IFieldMarker.TYPE_ERROR && problemType == IFieldMarker.TYPE_WARINING) { + return; + } + this.problemType = problemType; + } + /** * @return the propertyChangeSupport */ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -4,15 +4,15 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.smooks.graphical.wizard.freemarker.messages"; //$NON-NLS-1$ - public static String FreemarkerCSVCreationWizardPage_AddFieldButtonText; +/* public static String FreemarkerCSVCreationWizardPage_AddFieldButtonText; */ public static String FreemarkerCSVCreationWizardPage_Error_Fields_Empty; public static String FreemarkerCSVCreationWizardPage_Error_Incorrect; public static String FreemarkerCSVCreationWizardPage_Error_Incorrect2; - public static String FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage; +/* public static String FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage; */ public static String FreemarkerCSVCreationWizardPage_FieldsGroupText; public static String FreemarkerCSVCreationWizardPage_QuoteCharLabel; public static String FreemarkerCSVCreationWizardPage_QuoteEmptyErrorMessage; - public static String FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel; +/* public static String FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel; */ public static String FreemarkerCSVCreationWizardPage_SeperatorCharLabel; public static String FreemarkerCSVCreationWizardPage_SeperatorEmptyErrorMessage; public static String FreemarkerCSVCreationWizardPage_WizardDes; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -1,13 +1,13 @@ -FreemarkerCSVCreationWizardPage_AddFieldButtonText=Add Field +#FreemarkerCSVCreationWizardPage_AddFieldButtonText=Add Field FreemarkerCSVCreationWizardPage_Error_Fields_Empty=Fields can't be empty FreemarkerCSVCreationWizardPage_Error_Incorrect=The ' FreemarkerCSVCreationWizardPage_Error_Incorrect2=' is incorrect in the fields string -FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage=Fields can't be null +#FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage=Fields can't be null FreemarkerCSVCreationWizardPage_FieldsGroupText=Fields -FreemarkerCSVCreationWizardPage_QuoteCharLabel=Quote Character : +FreemarkerCSVCreationWizardPage_QuoteCharLabel=Quote Character \: FreemarkerCSVCreationWizardPage_QuoteEmptyErrorMessage=Quote can't be null -FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel=Remove -FreemarkerCSVCreationWizardPage_SeperatorCharLabel=Seperator Character : -FreemarkerCSVCreationWizardPage_SeperatorEmptyErrorMessage=Seperator can't be null -FreemarkerCSVCreationWizardPage_WizardDes=Configurate CSV Template. Use ',' to seperate the CSV field string. +#FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel=Remove +FreemarkerCSVCreationWizardPage_SeperatorCharLabel=Separator Character \: +FreemarkerCSVCreationWizardPage_SeperatorEmptyErrorMessage=Separator can't be null +FreemarkerCSVCreationWizardPage_WizardDes=Configure CSV Template\: Use ',' to separate fields in the CSV field string. FreemarkerCSVCreationWizardPage_WizardTitle=CSV Template Configuration 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -17,7 +17,7 @@ public static String JavaBeanCreationWizardPage_CatFindClassErrorMessage1; public static String JavaBeanCreationWizardPage_CollectionButtonLabel; public static String JavaBeanCreationWizardPage_CollectionClassLabel; - public static String JavaBeanCreationWizardPage_CollectionComponentClassEmptyErrorMessage; +/* public static String JavaBeanCreationWizardPage_CollectionComponentClassEmptyErrorMessage; */ public static String JavaBeanCreationWizardPage_Error_Abstract; public static String JavaBeanCreationWizardPage_Error_Cannot_Be_Instantiated; public static String JavaBeanCreationWizardPage_Error_Class_Needs_Public_Default_Const; 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2009-12-14 18:46:03 UTC (rev 19261) @@ -11,7 +11,7 @@ JavaBeanCreationWizardPage_CatFindClassErrorMessage1=Can't find the class " JavaBeanCreationWizardPage_CollectionButtonLabel=Collection JavaBeanCreationWizardPage_CollectionClassLabel=Collection Class : -JavaBeanCreationWizardPage_CollectionComponentClassEmptyErrorMessage=Colletion component class is empty +#JavaBeanCreationWizardPage_CollectionComponentClassEmptyErrorMessage=Collection component class is empty JavaBeanCreationWizardPage_Error_Abstract=Class is Abstract. Cannot be instantiated. JavaBeanCreationWizardPage_Error_Cannot_Be_Instantiated=Unable to determine if the class can be instantiated. JavaBeanCreationWizardPage_Error_Class_Needs_Public_Default_Const=Class does not have a Public Default Constructor. 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -81,7 +81,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$ + 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$ return; } } @@ -109,7 +109,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$ + 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$ } }); } 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 2009-12-14 16:57:57 UTC (rev 19260) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java 2009-12-14 18:46:03 UTC (rev 19261) @@ -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$ + setErrorMessage(Messages.SmooksRunTab_Error_Invalid_Project_Name + projectName + "'."); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$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$ + setErrorMessage(Messages.SmooksRunTab_Error_Unknown_Project_Name + projectName + "'."); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ return; }