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

Author: DartPeng Date: 2009-05-07 01:48:55 -0400 (Thu, 07 May 2009) New Revision: 15104 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.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/xsl/BindToUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java Log: JBIDE-4232 Add a "FieldMarker" on the attribute label. Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,8 @@ +package org.jboss.tools.smooks.model.validate; + +import org.eclipse.emf.common.util.Diagnostic; + +public interface ISmooksModelValidateListener { + void validateStart(); + void validateEnd(Diagnostic diagnosticResult); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -10,11 +10,14 @@ ******************************************************************************/ package org.jboss.tools.smooks.model.validate; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; @@ -24,8 +27,8 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.swt.widgets.Display; - /** * @author Dart (dpeng(a)redhat.com) * <p> @@ -35,12 +38,36 @@ Collection<?> selectedObjects; EditingDomain domain; - - public SmooksModelValidator(Collection<?> selectedObjects,EditingDomain domain){ + private boolean starting = false; + private boolean waiting = false; + private Object lock = new Object(); + + private List<ISmooksModelValidateListener> listeners = new ArrayList<ISmooksModelValidateListener>(); + + public SmooksModelValidator(Collection<?> selectedObjects, EditingDomain domain) { this.selectedObjects = selectedObjects; this.domain = domain; } + public SmooksModelValidator() { + + } + + public void addValidateListener(ISmooksModelValidateListener l) { + if (!listeners.contains(l)) + listeners.add(l); + } + + public void removeValidateListener(ISmooksModelValidateListener l) { + listeners.remove(l); + } + + public Diagnostic validate(Collection<?> selectedObjects, EditingDomain editingDomain) { + this.selectedObjects = selectedObjects; + domain = editingDomain; + return validate(new NullProgressMonitor()); + } + public Diagnostic validate(final IProgressMonitor progressMonitor) { EObject eObject = (EObject) selectedObjects.iterator().next(); int count = 0; @@ -80,4 +107,69 @@ return diagnostician.validate(eObject); } + + public void startValidate(final Collection<?> selectedObjects, final EditingDomain editingDomain) { + Thread thread = new Thread() { + public void run() { + if (starting) { + synchronized (lock) { + waiting = true; + } + return; + } else { + synchronized (lock) { + starting = true; + waiting = true; + } + while (waiting) { + try { + waiting = false; + Thread.sleep(1000); + Thread.yield(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + try { + for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) { + final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next(); + Display.getDefault().syncExec(new Runnable(){ + + /* (non-Javadoc) + * @see java.lang.Runnable#run() + */ + public void run() { + l.validateStart(); + } + + }); + + } + + final Diagnostic d = validate(selectedObjects, editingDomain); + + for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) { + final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next(); + Display.getDefault().syncExec(new Runnable(){ + + /* (non-Javadoc) + * @see java.lang.Runnable#run() + */ + public void run() { + l.validateEnd(d); + } + + }); + } + } finally { + waiting = false; + starting = false; + } + } + + } + }; + thread.setName("Validate Smooks model"); + thread.start(); + } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,166 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.actions; + +import java.lang.reflect.InvocationTargetException; +import java.util.List; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog; +import org.eclipse.emf.common.ui.viewer.IViewerProvider; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.ISetSelectionTarget; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; +import org.jboss.tools.smooks.configuration.validate.SmooksMarkerHelper; +import org.jboss.tools.smooks.model.validate.SmooksModelValidator; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class ValidateSmooksAction extends Action { + + private Resource resource = null; + + private EditingDomain editingDomain; + + private SmooksModelValidator validator = null; + + private SmooksMarkerHelper markerHelper = new SmooksMarkerHelper(); + + @Override + public void run() { + final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + IRunnableWithProgress runnableWithProgress = new IRunnableWithProgress() { + public void run(final IProgressMonitor progressMonitor) throws InvocationTargetException, + InterruptedException { + try { + final Diagnostic diagnostic = validate(progressMonitor); + shell.getDisplay().asyncExec(new Runnable() { + public void run() { + if (progressMonitor.isCanceled()) { + handleDiagnostic(Diagnostic.CANCEL_INSTANCE); + } else { + handleDiagnostic(diagnostic); + } + } + }); + } finally { + progressMonitor.done(); + } + } + }; + + if (markerHelper != null) { + runnableWithProgress = markerHelper.getWorkspaceModifyOperation(runnableWithProgress); + } + + try { + // This runs the operation, and shows progress. + // (It appears to be a bad thing to fork this onto another thread.) + // + new ProgressMonitorDialog(shell).run(true, true, runnableWithProgress); + } catch (Exception exception) { + SmooksConfigurationActivator.getDefault().log(exception); + } + } + + protected void handleDiagnostic(Diagnostic diagnostic) { + int severity = diagnostic.getSeverity(); + String title = null; + String message = null; + + if (severity == Diagnostic.ERROR || severity == Diagnostic.WARNING) { + title = "Error"; + message = "Validate Messages"; + } else { + title = "Information"; + message = "Validate success"; + } + + int result = 0; + if (diagnostic.getSeverity() == Diagnostic.OK) { +// MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), title, +// message); +// result = Window.CANCEL; + return; + } else { + result = DiagnosticDialog.open(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), title, + message, diagnostic); + } + + if (markerHelper != null) { + Resource resource = editingDomain.getResourceSet().getResources().get(0); + if (resource != null) { + markerHelper.deleteMarkers(resource); + } + + if (result == Window.OK) { + if (!diagnostic.getChildren().isEmpty()) { + List<?> data = (diagnostic.getChildren().get(0)).getData(); + if (!data.isEmpty() && data.get(0) instanceof EObject) { + Object part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .getActivePart(); + if (part instanceof ISetSelectionTarget) { + ((ISetSelectionTarget) part).selectReveal(new StructuredSelection(data.get(0))); + } else if (part instanceof IViewerProvider) { + Viewer viewer = ((IViewerProvider) part).getViewer(); + if (viewer != null) { + viewer.setSelection(new StructuredSelection(data.get(0)), true); + } + } + } + } + + if (resource != null) { + for (Diagnostic childDiagnostic : diagnostic.getChildren()) { + markerHelper.createMarkers(resource, childDiagnostic); + } + } + } + } + } + + protected Diagnostic validate(IProgressMonitor progressMonitor) { + if (resource != null && editingDomain != null) { + validator = new SmooksModelValidator(resource.getContents(), editingDomain); + return validator.validate(progressMonitor); + } + return Diagnostic.OK_INSTANCE; + } + + public Resource getResource() { + return resource; + } + + public void setResource(Resource resource) { + this.resource = resource; + } + + public EditingDomain getEditingDomain() { + return editingDomain; + } + + public void setEditingDomain(EditingDomain editingDomain) { + this.editingDomain = editingDomain; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors; + +import org.eclipse.swt.widgets.Control; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class AttributeFieldEditPart { + + private IFieldMarker fieldMarker; + + private Control contentControl; + + /** + * @return the fieldMarker + */ + public IFieldMarker getFieldMarker() { + return fieldMarker; + } + + /** + * @param fieldMarker the fieldMarker to set + */ + public void setFieldMarker(IFieldMarker fieldMarker) { + this.fieldMarker = fieldMarker; + } + + /** + * @return the contentControl + */ + public Control getContentControl() { + return contentControl; + } + + /** + * @param contentControl the contentControl to set + */ + public void setContentControl(Control contentControl) { + this.contentControl = contentControl; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors; + +import org.eclipse.swt.events.PaintEvent; +import org.eclipse.swt.events.PaintListener; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Canvas; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class FieldMarkerComposite extends Canvas implements IFieldMarker, PaintListener { + + private Image errorImage = null; + + private Image waringImage = null; + +// private Image informationImage = null; + + private int type = -1; + + public FieldMarkerComposite(Composite parent, int style) { + super(parent, style); + errorImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_ERROR); + waringImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_WARNING); + this.addPaintListener(this); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.IFieldMarker#setMarkerType() + */ + public void setMarkerType(int type) { + this.type = type; + this.redraw(); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.IFieldMarker#setMessage() + */ + public void setMessage(String message) { + this.setToolTipText(message); + } + + public void clean() { + this.setToolTipText(null); + } + + public void paintControl(PaintEvent e) { + GC gc = e.gc; + gc.fillRectangle(getBounds()); + if (type == IFieldMarker.TYPE_ERROR) { + gc.drawImage(errorImage, 0, 0); + } + if (type == IFieldMarker.TYPE_WARINING) { + gc.drawImage(waringImage, 0, 0); + } + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public interface IFieldMarker { + + int TYPE_ERROR = 1; + + int TYPE_WARINING = 2; + + void setMessage(String message); + + void setMarkerType(int type); + + void clean(); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -22,7 +22,7 @@ * Apr 7, 2009 */ public interface IPropertyUICreator { - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -32,6 +32,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.forms.events.IHyperlinkListener; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.uitls.FieldMarkerWrapper; import org.jboss.tools.smooks.configuration.editors.uitls.IFieldDialog; import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -63,7 +64,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (isBeanIDRefFieldFeature(feature)) { return createBeanIDRefFieldEditor(toolkit, parent, propertyDescriptor, model, feature, formEditor); @@ -78,8 +79,8 @@ return createFileSelectionFieldEditor(toolkit, parent, propertyDescriptor, model, feature, formEditor); } if(isConditionSelectionFeature(feature)){ - SmooksUIUtils.createContionsChoiceFieldEditor(parent, toolkit, propertyDescriptor, model); - return parent; + return SmooksUIUtils.createConditionsChoiceFieldEditor(parent, toolkit, propertyDescriptor, model); +// return parent; } if (feature == SmooksPackage.eINSTANCE.getAbstractReader_TargetProfile()) { @@ -131,7 +132,7 @@ return false; } - public Composite createFileSelectionFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createFileSelectionFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { IFieldDialog dialog = new IFieldDialog() { public Object open(Shell shell) { @@ -166,7 +167,7 @@ return false; } - public Composite createSelectorFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createSelectorFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { SmooksGraphicsExtType ext = formEditor.getSmooksGraphicsExt(); if (ext != null) { @@ -179,7 +180,7 @@ return false; } - public Composite createJavaTypeSearchEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createJavaTypeSearchEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (model instanceof EObject) return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit, propertyDescriptor, (EObject) model); @@ -190,13 +191,16 @@ return false; } - public Composite createBeanIDRefFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createBeanIDRefFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (model instanceof EObject) { + AttributeFieldEditPart editPart = new AttributeFieldEditPart(); SmooksResourceListType smooksResourceList = getSmooksResourceList((EObject) model); if (smooksResourceList != null) { - SmooksUIUtils.createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, false); + FieldMarkerWrapper wrapper = SmooksUIUtils.createFieldEditorLabel(null,parent, toolkit, propertyDescriptor, model, false); + editPart.setFieldMarker(wrapper.getMarker()); final Combo combo = new Combo(parent, SWT.BORDER); + editPart.setContentControl(combo); GridData gd = new GridData(GridData.FILL_HORIZONTAL); combo.setLayoutData(gd); Object editValue = SmooksUIUtils.getEditValue(propertyDescriptor, model); @@ -223,7 +227,7 @@ ip.setPropertyValue(cmodel, combo.getText()); } }); - return combo; + return editPart; } } return null; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -54,6 +54,7 @@ import org.eclipse.ui.actions.ActionFactory; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.actions.AddSmooksResourceAction; +import org.jboss.tools.smooks.configuration.actions.ValidateSmooksAction; import org.jboss.tools.smooks.model.datasource.DataSourceJndi; import org.jboss.tools.smooks.model.datasource.Direct; import org.jboss.tools.smooks.model.dbrouting.Executor; @@ -204,6 +205,8 @@ * @generated */ protected IMenuManager createSiblingMenuManager; + + private ValidateSmooksAction validateSmooksAction; /** * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- @@ -346,6 +349,10 @@ public void init(IActionBars actionBars) { super.init(actionBars); ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages(); + + validateSmooksAction = new ValidateSmooksAction(); + validateSmooksAction.setText("Validate"); + cutAction = new CutAction() { public void runWithEvent(Event event) { @@ -440,6 +447,9 @@ EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain(); newChildDescriptors = domain.getNewChildDescriptors(object, null); + + validateSmooksAction.setResource(domain.getResourceSet().getResources().get(0)); + validateSmooksAction.setEditingDomain(domain); // newSiblingDescriptors = domain.getNewChildDescriptors(null, // object); } @@ -622,7 +632,7 @@ menuManager.insertBefore("edit", submenuManager); // don't show properties that // menuManager.insertAfter("additions-end", showPropertiesViewAction); - menuManager.insertAfter("additions-end", validateAction); + menuManager.insertAfter("additions-end", validateSmooksAction); this.addGlobalActions(menuManager); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -18,6 +18,7 @@ import java.util.List; import java.util.Properties; +import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.IStructuredSelection; @@ -48,14 +49,16 @@ import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtFactory; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; import org.jboss.tools.smooks.model.smooks.DocumentRoot; +import org.jboss.tools.smooks.model.validate.ISmooksModelValidateListener; import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart Peng (dpeng(a)redhat.com) Date Apr 1, 2009 */ -public class SmooksConfigurationFormPage extends FormPage { +public class SmooksConfigurationFormPage extends FormPage implements ISmooksModelValidateListener{ private SmooksMasterDetailBlock masterDetailBlock = null; + private TableViewer inputDataViewer; public SmooksConfigurationFormPage(FormEditor editor, String id, String title) { @@ -111,7 +114,7 @@ protected void createExtentionArea(IManagedForm managedForm) { FormToolkit toolkit = managedForm.getToolkit(); final ScrolledForm form = managedForm.getForm(); - Section section = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE); + Section section = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED); GridData gd = new GridData(GridData.FILL_HORIZONTAL); section.setLayoutData(gd); section.setText("Input Data"); @@ -283,4 +286,12 @@ } } + public void validateEnd(Diagnostic diagnosticResult) { + System.out.println(diagnosticResult); + } + + public void validateStart() { + + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -25,7 +25,6 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; -import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -100,6 +100,8 @@ private PropertySheetPage propertySheetPage = null; private SmooksGraphicsExtType smooksGraphicsExt = null; + + private SmooksModelValidator validator = null; private EObject smooksModel; @@ -155,6 +157,9 @@ int length = oldEndIndex - startIndex + 1; handleEMFModelChange = true; document.replace(startIndex, length, replacement); + + validator.startValidate(smooksModel.eResource().getContents(), editingDomain); + } catch (Exception exception) { SmooksConfigurationActivator.getDefault().log(exception); } @@ -225,6 +230,7 @@ @Override protected void addPages() { configurationPage = createSmooksConfigurationFormPage(); + validator.addValidateListener(configurationPage); try { int index = this.addPage(configurationPage); setPageText(index, "Design"); @@ -313,6 +319,8 @@ SmooksConfigurationActivator.getDefault().log(e); } configurationPage.setSmooksModel(this.smooksModel); + + validator.startValidate(smooksModel.eResource().getContents(), editingDomain); } protected SmooksConfigurationFormPage createSmooksConfigurationFormPage() { @@ -358,8 +366,8 @@ if (this.smooksModel != null) { List<Object> lists = new ArrayList<Object>(); lists.add(smooksModel); - SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain()); - validator.validate(monitor); +// SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain()); +// validator.startValidate(smooksModel.eResource().getContents(), editingDomain); } } catch (IOException e) { SmooksConfigurationActivator.getDefault().log(e); @@ -381,6 +389,8 @@ } editingDomain.getResourceSet().getResources().add(smooksResource); super.init(site, input); + + validator = new SmooksModelValidator(); // if success to open editor , check if there isn't ext file and create // a new one String extFileName = file.getName() + SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -32,9 +32,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Spinner; -import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.IDetailsPage; import org.eclipse.ui.forms.IFormPart; import org.eclipse.ui.forms.IManagedForm; @@ -125,17 +123,18 @@ } } - protected void createAttributeUI(Composite detailsComposite, IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) { + protected AttributeFieldEditPart createAttributeUI(Composite detailsComposite, IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) { final IItemPropertyDescriptor itemPropertyDescriptor = propertyDescriptor; EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(getModel()); + AttributeFieldEditPart editPart = null; boolean createDefault = true; if (creator != null) { if (creator.ignoreProperty(feature)) { - return; + return null; } - Composite composite = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(), feature, + editPart = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(), feature, getFormEditor()); - if (composite != null) { + if (editPart != null) { createDefault = false; } } @@ -143,18 +142,19 @@ EClassifier typeClazz = feature.getEType(); boolean hasCreated = false; if (typeClazz instanceof EEnum) { - createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor); + editPart = createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor); hasCreated = true; } if (typeClazz.getInstanceClass() == String.class) { - createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); + editPart = createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); + hasCreated = true; } if (typeClazz.getInstanceClass() == Boolean.class || typeClazz.getInstanceClass() == boolean.class) { - createBooleanFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); + editPart = createBooleanFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); hasCreated = true; } if (typeClazz.getInstanceClass() == Integer.class || typeClazz.getInstanceClass() == int.class) { - createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); + editPart = createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor); hasCreated = true; } if (!hasCreated) { @@ -163,9 +163,11 @@ // itemPropertyDescriptor); } } + + return editPart; } - protected Control createEnumFieldEditor(Composite propertyComposite, EAttribute feature, final EEnum typeClass, FormToolkit formToolKit, + protected AttributeFieldEditPart createEnumFieldEditor(Composite propertyComposite, EAttribute feature, final EEnum typeClass, FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { List<EEnumLiteral> literalList = typeClass.getELiterals(); String[] items = new String[literalList.size()]; @@ -202,7 +204,7 @@ return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), items, processer, true); } - protected void createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolkit, + protected AttributeFieldEditPart createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolkit, final IItemPropertyDescriptor itemPropertyDescriptor) { IModelProcsser processer = new IModelProcsser() { @@ -226,18 +228,18 @@ } }; - SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), new String[] { "TRUE", "FALSE" }, + return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), new String[] { "TRUE", "FALSE" }, processer, true); } - protected Text createStringFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit, + protected AttributeFieldEditPart createStringFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { return SmooksUIUtils.createStringFieldEditor(propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false, false, null); } protected void createIntegerFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { - SmooksUIUtils.createFieldEditorLabel(propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false); + SmooksUIUtils.createFieldEditorLabel(null,propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false); final Spinner spinner = new Spinner(propertyComposite, SWT.BORDER); Object value = itemPropertyDescriptor.getPropertyValue(getModel()); if (value != null && value instanceof PropertyValueWrapper) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.calc.CalcPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == CalcPackage.eINSTANCE.getCounter_StartExpression()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.csv.CsvPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == CsvPackage.eINSTANCE.getCsvReader_Encoding()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.datasource.DatasourcePackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == DatasourcePackage.eINSTANCE.getDataSourceJndi_AutoCommit()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.datasource.DatasourcePackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == DatasourcePackage.eINSTANCE.getDirect_AutoCommit()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == DbroutingPackage.eINSTANCE.getExecutor_Statement()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == DbroutingPackage.eINSTANCE.getResultSetRowSelector_Where()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == DbroutingPackage.eINSTANCE.getResultSet_Name()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == MEdiPackage.eINSTANCE.getComponent_Required()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.medi.MEdiPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -36,14 +37,13 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == EdiPackage.eINSTANCE.getEDIReader_Encoding()) { } if (feature == EdiPackage.eINSTANCE.getEDIReader_MappingModel()) { - SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE, + return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE, SmooksMultiFormEditor.EDITOR_ID,null); - return parent; } return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FileRoutingPackage.eINSTANCE.getHighWaterMark_Mark()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FileRoutingPackage.eINSTANCE.getOutputStream_FileNamePattern()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getBindTo_Id()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getFreemarker_ApplyBefore()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getInline_Directive()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getOutputTo_OutputStreamResource()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -36,7 +37,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Value()) { } @@ -54,11 +55,11 @@ SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, null, null); - Text cdatatext = SmooksUIUtils.createCDATAFieldEditor("Template Contents(CDATA)", editingdomain, toolkit, parent, model, openCDATAEditorAction); - Text commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); + AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Template Contents(CDATA)", editingdomain, toolkit, parent, model, openCDATAEditorAction); + AttributeFieldEditPart commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); - openCDATAEditorAction.setRelateText(cdatatext); - openCommentEditorAction.setRelateText(commenttext); + openCDATAEditorAction.setRelateText((Text)cdatatext.getContentControl()); + openCommentEditorAction.setRelateText((Text)commenttext.getContentControl()); } @Override Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.groovy.GroovyPackage; @@ -33,7 +34,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == GroovyPackage.eINSTANCE.getGroovy_Imports()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -35,7 +36,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } @@ -44,8 +45,8 @@ public void createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { OpenEditorEditInnerContentsAction action2 = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "groovy"); - Text text = SmooksUIUtils.createCommentFieldEditor("Script Contents", editingdomain, toolkit, parent, model, action2); - action2.setRelateText(text); + AttributeFieldEditPart editPart = SmooksUIUtils.createCommentFieldEditor("Script Contents", editingdomain, toolkit, parent, model, action2); + action2.setRelateText((Text)editPart.getContentControl()); } @Override Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.iorouting.IoroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == IoroutingPackage.eINSTANCE.getIORouter_BeanId()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -51,7 +52,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == JavabeanPackage.eINSTANCE.getBindingsType_Class()) { return createBeanClassTextWithButton(parent, toolkit, propertyDescriptor, model); @@ -69,7 +70,7 @@ return super.isSelectorFeature(attribute); } - protected Composite createBeanClassTextWithButton(Composite composite, FormToolkit toolkit, + protected AttributeFieldEditPart createBeanClassTextWithButton(Composite composite, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, final Object model) { return SmooksUIUtils.createJavaTypeSearchFieldEditor(composite, toolkit, propertyDescriptor, (EObject)model); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; @@ -45,7 +46,7 @@ * @see org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator#createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, org.eclipse.swt.widgets.Composite, org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, org.eclipse.emf.ecore.EAttribute, org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; @@ -57,7 +58,7 @@ } @Override - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -26,7 +27,7 @@ public class PropertiesAndSetterMethodSearchFieldEditorCreator extends PropertyUICreator { @Override - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if(canCreatePropertiesSearchFieldEditor(feature)){ return createPropertiesSearchFieldEditor(toolkit, parent, propertyDescriptor, model); @@ -53,7 +54,7 @@ return "Search setter method"; } - protected Composite createPropertiesSearchFieldEditor(FormToolkit toolkit, Composite parent, + protected AttributeFieldEditPart createPropertiesSearchFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model) { if (model instanceof EObject) { EObject container = ((EObject) model).eContainer(); @@ -65,7 +66,7 @@ return null; } - protected Composite createMethodsSearchFieldEditor(FormToolkit toolkit, Composite parent, + protected AttributeFieldEditPart createMethodsSearchFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model) { if (model instanceof EObject) { EObject container = ((EObject) model).eContainer(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getConnection_Factory()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getHighWaterMark_Mark()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getJmsRouter_BeanId()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getJndi_ContextFactory()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getMessage_CorrelationIdPattern()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JmsroutingPackage.eINSTANCE.getSession_AcknowledgeMode()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.json.JsonPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JsonPackage.eINSTANCE.getJsonReader_ArrayElementName()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.json.JsonPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == JsonPackage.eINSTANCE.getKey_Value()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -34,7 +35,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getConditionType_Value()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -33,12 +34,11 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getImportType_File()) { - SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE, + return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE, SmooksMultiFormEditor.EDITOR_ID,null); - return parent; } return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -34,7 +35,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getParamType_Name()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getProfileType_Value()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -31,7 +32,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -34,7 +35,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getResourceConfigType_Selector()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -15,6 +15,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -34,7 +35,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getResourceType_Value()) { return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getSetOnType_Feature()) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.smooks.SmooksPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractReaderGroup()) { } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.uitls; + +import org.eclipse.swt.widgets.Control; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class FieldMarkerWrapper { + private IFieldMarker marker; + + private Control labelControl; + + /** + * @return the marker + */ + public IFieldMarker getMarker() { + return marker; + } + + /** + * @param marker the marker to set + */ + public void setMarker(IFieldMarker marker) { + this.marker = marker; + } + + /** + * @return the labelControl + */ + public Control getLabelControl() { + return labelControl; + } + + /** + * @param labelControl the labelControl to set + */ + public void setLabelControl(Control labelControl) { + this.labelControl = labelControl; + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -53,6 +53,7 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; @@ -78,8 +79,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.ClassPathFileProcessor; import org.jboss.tools.smooks.configuration.editors.CurrentProjecViewerFilter; +import org.jboss.tools.smooks.configuration.editors.FieldMarkerComposite; import org.jboss.tools.smooks.configuration.editors.FileSelectionWizard; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.OpenFileHyperLinkListener; @@ -117,36 +120,72 @@ public static int VALUE_TYPE_CDATA = 0; - public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, - Object model, boolean linkLabel, IHyperlinkListener listener) { - createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener,null); + public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, boolean linkLabel, IHyperlinkListener listener) { + createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener, + null); } - public static void createMultiMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, - Composite parent, Object model, int height,OpenEditorEditInnerContentsAction action) { - createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false, null,action); + public static void createMultiMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, int height, OpenEditorEditInnerContentsAction action) { + createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false, null, + action); } - public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, - Object model, boolean multiText, int height, boolean linkLabel, boolean openFile, IHyperlinkListener listener,OpenEditorEditInnerContentsAction action) { - createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel, openFile, height, listener, VALUE_TYPE_TEXT,action); + public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, boolean linkLabel, + boolean openFile, IHyperlinkListener listener, OpenEditorEditInnerContentsAction action) { + createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel, openFile, + height, listener, VALUE_TYPE_TEXT, action); } - public static Control createFieldEditorLabel(Composite parent, FormToolkit formToolKit, IItemPropertyDescriptor itemPropertyDescriptor, - Object model, boolean isLink) { - String displayName = itemPropertyDescriptor.getDisplayName(model); - EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(model); - if (feature.isRequired()) { - displayName = "*" + displayName; + public static FieldMarkerWrapper createFieldEditorLabel(Composite parent, FormToolkit formToolKit, + IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean isLink) { + return createFieldEditorLabel(null, parent, formToolKit, itemPropertyDescriptor, model, isLink); + } + + public static FieldMarkerWrapper createFieldEditorLabel(String labelText, Composite parent, + FormToolkit formToolKit, IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean isLink) { + FieldMarkerWrapper wrapper = new FieldMarkerWrapper(); + String displayName = labelText; + if (itemPropertyDescriptor == null) { + } else { + displayName = itemPropertyDescriptor.getDisplayName(model); + EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(model); + if (feature.isRequired()) { + displayName = "*" + displayName; + } } + Composite labelComposite = formToolKit.createComposite(parent); + labelComposite.setBackground(new Color(null, 128, 132, 132)); + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + layout.marginLeft = 0; + layout.marginRight = 0; + layout.horizontalSpacing = 0; + labelComposite.setLayout(layout); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + Control labelControl = null; if (!isLink) { - Label label = formToolKit.createLabel(parent, displayName + " :"); + Label label = formToolKit.createLabel(labelComposite, displayName + " :"); label.setForeground(formToolKit.getColors().getColor(IFormColors.TITLE)); - return label; + labelControl = label; } else { - Hyperlink link = formToolKit.createHyperlink(parent, displayName + " :", SWT.NONE); - return link; + Hyperlink link = formToolKit.createHyperlink(labelComposite, displayName + " :", SWT.NONE); + labelControl = link; } + labelControl.setLayoutData(gd); + + FieldMarkerComposite notificationComposite = new FieldMarkerComposite(labelComposite, SWT.NONE); + gd = new GridData(); + gd.heightHint = 8; + gd.widthHint = 8; + gd.horizontalAlignment = GridData.BEGINNING; + gd.verticalAlignment = GridData.BEGINNING; + notificationComposite.setLayoutData(gd); + wrapper.setLabelControl(labelControl); + wrapper.setMarker(notificationComposite); + return wrapper; } /** @@ -157,12 +196,14 @@ * @param parent * @param model */ - public static void createFilePathFieldEditor(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model) { + public static void createFilePathFieldEditor(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + Composite parent, Object model) { // IHyperlinkListener link } - public static void createLinkMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, - Object model, boolean multiText, int height, boolean linkLabel, IHyperlinkListener listener) { + public static void createLinkMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, boolean linkLabel, + IHyperlinkListener listener) { if (linkLabel) { Hyperlink link = toolkit.createHyperlink(parent, label, SWT.NONE); if (listener != null) { @@ -206,9 +247,10 @@ } public static void createLinkTextValueFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, - IItemPropertyDescriptor propertyDescriptor, FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, - boolean linkLabel, IHyperlinkListener listener) { - Control control = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, linkLabel); + IItemPropertyDescriptor propertyDescriptor, FormToolkit toolkit, Composite parent, Object model, + boolean multiText, int height, boolean linkLabel, IHyperlinkListener listener) { + FieldMarkerWrapper warpper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, linkLabel); + Control control = warpper.getLabelControl(); if (linkLabel) { Hyperlink link = (Hyperlink) control; if (listener != null) { @@ -268,22 +310,27 @@ return path; } - public static Text createStringFieldEditor(final Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor, - Object model, boolean linkLabel, boolean openFile, IHyperlinkListener listener) { - return createStringFieldEditor(null, parent, null, toolkit, itemPropertyDescriptor, model, false, linkLabel, openFile, 0, listener, - VALUE_TYPE_VALUE,null); + public static AttributeFieldEditPart createStringFieldEditor(final Composite parent, FormToolkit toolkit, + final IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean linkLabel, boolean openFile, + IHyperlinkListener listener) { + return createStringFieldEditor(null, parent, null, toolkit, itemPropertyDescriptor, model, false, linkLabel, + openFile, 0, listener, VALUE_TYPE_VALUE, null); } - public static Text createFileSelectionTextFieldEditor(String label, final Composite parent, EditingDomain editingdomain, FormToolkit toolkit, - final IItemPropertyDescriptor itemPropertyDescriptor, final Object model, int valueType, String editorID,OpenEditorEditInnerContentsAction action) { - OpenFileHyperLinkListener listener = new OpenFileHyperLinkListener(valueType, itemPropertyDescriptor, model, editorID); - return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, false, true, true, 0, listener, - valueType,action); + public static AttributeFieldEditPart createFileSelectionTextFieldEditor(String label, final Composite parent, + EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor, + final Object model, int valueType, String editorID, OpenEditorEditInnerContentsAction action) { + OpenFileHyperLinkListener listener = new OpenFileHyperLinkListener(valueType, itemPropertyDescriptor, model, + editorID); + return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, false, + true, true, 0, listener, valueType, action); } - public static Text createStringFieldEditor(String label, final Composite parent, EditingDomain editingdomain, FormToolkit toolkit, - final IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean multiText, boolean linkLabel, boolean openFile, int height, - IHyperlinkListener listener, int valueType,OpenEditorEditInnerContentsAction openEditorAction) { + public static AttributeFieldEditPart createStringFieldEditor(String label, final Composite parent, + EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor, + Object model, boolean multiText, boolean linkLabel, boolean openFile, int height, + IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction) { + AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart(); GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING); Section section = null; Composite textContainer = null; @@ -303,13 +350,13 @@ gd.heightHint = 10; space.setLayoutData(gd); - section = toolkit.createSection(parent, Section.TITLE_BAR |Section.TWISTIE); + section = toolkit.createSection(parent, Section.TITLE_BAR | Section.TWISTIE); FillLayout layout = new FillLayout(); section.setLayout(layout); section.setText(label); if (openEditorAction != null) { ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT); - + ToolBar toolbar = toolBarManager.createControl(section); final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND); toolbar.setCursor(handCursor); @@ -335,13 +382,15 @@ section.setLayoutData(gd); textContainer = textComposite; } else { - if (linkLabel) { - Hyperlink link = toolkit.createHyperlink(parent, label + " :", SWT.NONE); + FieldMarkerWrapper warpper = createFieldEditorLabel(label, parent, toolkit, itemPropertyDescriptor, model, + linkLabel); + fieldEditPart.setFieldMarker(warpper.getMarker()); + Control labelControl = warpper.getLabelControl(); + if (labelControl instanceof Hyperlink) { + Hyperlink link = (Hyperlink) labelControl; if (listener != null) { link.addHyperlinkListener(listener); } - } else { - toolkit.createLabel(parent, label + " :").setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); } if (openFile) { Composite fileSelectionComposite = toolkit.createComposite(parent); @@ -472,12 +521,14 @@ }); } } - if(section != null ) section.layout(); - return valueText; + if (section != null) + section.layout(); + fieldEditPart.setContentControl(valueText); + return fieldEditPart; } - public static Composite createSelectorFieldEditor(FormToolkit toolkit, Composite parent, final IItemPropertyDescriptor propertyDescriptor, - Object model, final SmooksGraphicsExtType extType) { + public static AttributeFieldEditPart createSelectorFieldEditor(FormToolkit toolkit, Composite parent, + final IItemPropertyDescriptor propertyDescriptor, Object model, final SmooksGraphicsExtType extType) { return createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Browse", new IFieldDialog() { public Object open(Shell shell) { SelectoreSelectionDialog dialog = new SelectoreSelectionDialog(shell, extType); @@ -504,8 +555,8 @@ } public static SmooksGraphicsExtType loadSmooksGraphicsExt(IFile file) throws IOException { - Resource resource = new SmooksGraphicsExtResourceFactoryImpl().createResource(URI.createPlatformResourceURI(file.getFullPath() - .toPortableString(), false)); + Resource resource = new SmooksGraphicsExtResourceFactoryImpl().createResource(URI.createPlatformResourceURI( + file.getFullPath().toPortableString(), false)); resource.load(Collections.emptyMap()); if (resource.getContents().size() > 0) { Object obj = resource.getContents().get(0); @@ -516,19 +567,24 @@ return null; } - public static Text createCDATAFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, - Object model,OpenEditorEditInnerContentsAction action) { - return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_CDATA,action); + public static AttributeFieldEditPart createCDATAFieldEditor(String label, + AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + OpenEditorEditInnerContentsAction action) { + return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, + null, VALUE_TYPE_CDATA, action); } - public static Text createCommentFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, - Object model,OpenEditorEditInnerContentsAction action) { - return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_COMMENT,action); + public static AttributeFieldEditPart createCommentFieldEditor(String label, + AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + OpenEditorEditInnerContentsAction action) { + return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, + null, VALUE_TYPE_COMMENT, action); } - public static Composite createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, - final EObject model) { + public static AttributeFieldEditPart createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit, + final IItemPropertyDescriptor propertyDescriptor, final EObject model) { if (model instanceof EObject) { + AttributeFieldEditPart editpart = new AttributeFieldEditPart(); final Resource resource = ((EObject) model).eResource(); URI uri = resource.getURI(); IResource workspaceResource = null; @@ -536,7 +592,9 @@ String path = uri.toPlatformString(true); workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path)); JavaTypeFieldDialog dialog = new JavaTypeFieldDialog(workspaceResource); - Hyperlink link = (Hyperlink) createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, true); + FieldMarkerWrapper warpper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, true); + editpart.setFieldMarker(warpper.getMarker()); + Hyperlink link = (Hyperlink) warpper.getLabelControl(); final Composite classTextComposite = toolkit.createComposite(parent); GridData gd = new GridData(GridData.FILL_HORIZONTAL); classTextComposite.setLayoutData(gd); @@ -544,7 +602,8 @@ fillLayout.marginHeight = 0; fillLayout.marginWidth = 0; classTextComposite.setLayout(fillLayout); - final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, "Search Class", dialog, SWT.NONE); + final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, + "Search Class", dialog, SWT.NONE); Object editValue = getEditValue(propertyDescriptor, model); if (editValue != null) { searchComposite.getText().setText(editValue.toString()); @@ -580,8 +639,9 @@ if (result != null) JavaUI.openInEditor(result); else { - MessageDialog.openInformation(classTextComposite.getShell(), "Can't find type", "Can't find type \"" + typeName - + "\" in \"" + javaProject.getProject().getName() + "\" project."); + MessageDialog.openInformation(classTextComposite.getShell(), "Can't find type", + "Can't find type \"" + typeName + "\" in \"" + + javaProject.getProject().getName() + "\" project."); } } } catch (PartInitException ex) { @@ -604,7 +664,8 @@ }); toolkit.paintBordersFor(classTextComposite); - return classTextComposite; + editpart.setContentControl(classTextComposite); + return editpart; } } return null; @@ -630,15 +691,17 @@ return null; } - public static Composite createJavaMethodSearchFieldEditor(BindingsType container, Composite parent, FormToolkit toolkit, - final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) { + public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(BindingsType container, Composite parent, + FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, + final EObject model) { String classString = ((BindingsType) container).getClass_(); IJavaProject project = getJavaProject(container); try { ProjectClassLoader classLoader = new ProjectClassLoader(project); Class<?> clazz = classLoader.loadClass(classString); JavaMethodsSelectionDialog dialog = new JavaMethodsSelectionDialog(project, clazz); - return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select method", dialog, (EObject) model); + return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select method", dialog, + (EObject) model); } catch (Exception e) { // ignore } @@ -685,7 +748,8 @@ return generateFullPath(node, sperator); } - public static String generatePath(IXMLStructuredObject startNode, IXMLStructuredObject stopNode, final String sperator, boolean includeContext) { + public static String generatePath(IXMLStructuredObject startNode, IXMLStructuredObject stopNode, + final String sperator, boolean includeContext) { String name = ""; if (startNode == stopNode) { return startNode.getNodeName(); @@ -725,8 +789,8 @@ return null; } - public static Control createContionsChoiceFieldEditor(Composite parent, FormToolkit formToolkit, IItemPropertyDescriptor itemPropertyDescriptor, - Object model) { + public static AttributeFieldEditPart createConditionsChoiceFieldEditor(Composite parent, FormToolkit formToolkit, + IItemPropertyDescriptor itemPropertyDescriptor, Object model) { SmooksResourceListType listType = getSmooks11ResourceListType((EObject) model); List<String> names = new ArrayList<String>(); if (listType != null) { @@ -739,12 +803,17 @@ } } } - return createChoiceFieldEditor(parent, formToolkit, itemPropertyDescriptor, model, names.toArray(new String[] {}), null, false); + return createChoiceFieldEditor(parent, formToolkit, itemPropertyDescriptor, model, names + .toArray(new String[] {}), null, false); } - public static Control createChoiceFieldEditor(Composite parent, FormToolkit formToolkit, IItemPropertyDescriptor itemPropertyDescriptor, - Object model, String[] items, IModelProcsser processer, boolean readOnly) { - SmooksUIUtils.createFieldEditorLabel(parent, formToolkit, itemPropertyDescriptor, model, false); + public static AttributeFieldEditPart createChoiceFieldEditor(Composite parent, FormToolkit formToolkit, + IItemPropertyDescriptor itemPropertyDescriptor, Object model, String[] items, IModelProcsser processer, + boolean readOnly) { + AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart(); + FieldMarkerWrapper markerWrapper = SmooksUIUtils.createFieldEditorLabel(parent, formToolkit, + itemPropertyDescriptor, model, false); + fieldEditPart.setFieldMarker(markerWrapper.getMarker()); Object editValue = getEditValue(itemPropertyDescriptor, model); if (processer != null) { editValue = processer.unwrapValue(editValue); @@ -784,18 +853,21 @@ fipd.setPropertyValue(fm, setValue); } }); - return combo; + fieldEditPart.setContentControl(combo); + return fieldEditPart; } - public static Composite createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, FormToolkit toolkit, - final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) { + public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, + FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, + final EObject model) { String classString = ((BindingsType) container).getClass_(); IJavaProject project = getJavaProject(container); try { ProjectClassLoader classLoader = new ProjectClassLoader(project); Class<?> clazz = classLoader.loadClass(classString); JavaPropertiesSelectionDialog dialog = new JavaPropertiesSelectionDialog(project, clazz); - return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select property", dialog, (EObject) model); + return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select property", + dialog, (EObject) model); } catch (Exception e) { // ignore } @@ -811,14 +883,19 @@ return null; } - public static Composite createDialogFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, - String buttonName, IFieldDialog dialog, final EObject model) { + public static AttributeFieldEditPart createDialogFieldEditor(Composite parent, FormToolkit toolkit, + final IItemPropertyDescriptor propertyDescriptor, String buttonName, IFieldDialog dialog, + final EObject model) { return createDialogFieldEditor(parent, toolkit, propertyDescriptor, buttonName, dialog, model, false, null); } - public static Composite createDialogFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, - String buttonName, IFieldDialog dialog, final EObject model, boolean labelLink, IHyperlinkListener listener) { - Control label = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, labelLink); + public static AttributeFieldEditPart createDialogFieldEditor(Composite parent, FormToolkit toolkit, + final IItemPropertyDescriptor propertyDescriptor, String buttonName, IFieldDialog dialog, + final EObject model, boolean labelLink, IHyperlinkListener listener) { + AttributeFieldEditPart editpart = new AttributeFieldEditPart(); + FieldMarkerWrapper wrapper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, labelLink); + editpart.setFieldMarker(wrapper.getMarker()); + Control label = wrapper.getLabelControl(); if (label instanceof Hyperlink && listener != null) { ((Hyperlink) label).addHyperlinkListener(listener); } @@ -829,7 +906,8 @@ fillLayout.marginHeight = 0; fillLayout.marginWidth = 0; classTextComposite.setLayout(fillLayout); - final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, buttonName, dialog, SWT.NONE); + final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, buttonName, dialog, + SWT.NONE); Object editValue = getEditValue(propertyDescriptor, model); if (editValue != null) { searchComposite.getText().setText(editValue.toString()); @@ -848,7 +926,8 @@ } }); toolkit.paintBordersFor(classTextComposite); - return classTextComposite; + editpart.setContentControl(classTextComposite); + return editpart; } public static void openFile(String uri, IProject project) throws PartInitException { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.xsl.XslPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == XslPackage.eINSTANCE.getBindTo_Id()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.xsl.XslPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) { if (feature == XslPackage.eINSTANCE.getOutputTo_OutputStreamResource()) { } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; @@ -37,7 +38,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == XslPackage.eINSTANCE.getTemplate_Value()) { } @@ -69,10 +70,10 @@ OpenEditorEditInnerContentsAction openCommentEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "xsl"); SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, null, null); - Text text1 = SmooksUIUtils.createCDATAFieldEditor("Template Contents (CDATA)", editingdomain, toolkit, parent, model, openCdataEditorAction); - Text text2 = SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); - openCdataEditorAction.setRelateText(text1); - openCommentEditorAction.setRelateText(text2); + AttributeFieldEditPart text1 = SmooksUIUtils.createCDATAFieldEditor("Template Contents (CDATA)", editingdomain, toolkit, parent, model, openCdataEditorAction); + AttributeFieldEditPart text2 = SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); + openCdataEditorAction.setRelateText((Text)text1.getContentControl()); + openCommentEditorAction.setRelateText((Text)text2.getContentControl()); } } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-07 04:59:16 UTC (rev 15103) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; import org.jboss.tools.smooks.model.xsl.XslPackage; @@ -32,7 +33,7 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public Composite createPropertyUI(FormToolkit toolkit, Composite parent, + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor) { if (feature == XslPackage.eINSTANCE.getXsl_ApplyBefore()) { Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java 2009-05-07 05:48:55 UTC (rev 15104) @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.validate; + +import java.util.List; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EValidator; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class SmooksMarkerHelper extends EditUIMarkerHelper { + + public IRunnableWithProgress getWorkspaceModifyOperation(IRunnableWithProgress runnableWithProgress) { + return new WorkspaceModifyDelegatingOperation(runnableWithProgress); + } + + @Override + protected String getMarkerID() { + return EValidator.MARKER; + } + + public void createMarkers(Resource resource, Diagnostic diagnostic) { + try { + createMarkers(getFile(resource), diagnostic, null); + } catch (CoreException e) { + SmooksConfigurationActivator.getDefault().log(e); + } + } + + @Override + protected String composeMessage(Diagnostic diagnostic, Diagnostic parentDiagnostic) { + String message = diagnostic.getMessage(); + if (parentDiagnostic != null) { + String parentMessage = parentDiagnostic.getMessage(); + if (parentMessage != null) { + message = message != null ? parentMessage + ". " + message : parentMessage; + } + } + return message; + } + + @Override + protected void adjustMarker(IMarker marker, Diagnostic diagnostic, Diagnostic parentDiagnostic) + throws CoreException { + List<?> data = diagnostic.getData(); + StringBuilder relatedURIs = new StringBuilder(); + boolean first = true; + for (Object object : data) { + if (object instanceof EObject) { + EObject eObject = (EObject) object; + if (first) { + first = false; + marker.setAttribute(EValidator.URI_ATTRIBUTE, EcoreUtil.getURI(eObject).toString()); + } else { + if (relatedURIs.length() != 0) { + relatedURIs.append(' '); + } + relatedURIs.append(URI.encodeFragment(EcoreUtil.getURI(eObject).toString(), false)); + } + } + } + + if (relatedURIs.length() > 0) { + marker.setAttribute(EValidator.RELATED_URIS_ATTRIBUTE, relatedURIs.toString()); + } + super.adjustMarker(marker, diagnostic, parentDiagnostic); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain