Author: DartPeng Date: 2010-01-28 01:53:19 -0500 (Thu, 28 Jan 2010) New Revision: 19974 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DecoderTypeValidator.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java Log: JBIDE-5716 done Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DecoderTypeValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DecoderTypeValidator.java 2010-01-28 05:20:18 UTC (rev 19973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DecoderTypeValidator.java 2010-01-28 06:53:19 UTC (rev 19974) @@ -1,73 +0,0 @@ -/******************************************************************************* - * 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.Collection; -import java.util.List; - -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.emf.edit.domain.EditingDomain; -import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks.model.javabean12.Javabean12Package; -import org.jboss.tools.smooks.model.javabean12.ValueType; - -/** - * @author Dart dpeng(a)redhat.com - * - */ -public class DecoderTypeValidator extends AbstractValidator { - - /* - * (non-Javadoc) - * - * @see - * org.jboss.tools.smooks.configuration.validate.ISmooksValidator#initValidator - * (java.util.Collection, org.eclipse.emf.edit.domain.EditingDomain) - */ - public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { - } - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.configuration.validate.AbstractValidator#validate(java.util.Collection, org.eclipse.emf.edit.domain.EditingDomain) - */ - @Override - public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { - // TODO Auto-generated method stub - return super.validate(selectedObjects, editingDomain); - } - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.configuration.validate.AbstractValidator#validateModel(java.lang.Object, org.eclipse.emf.edit.domain.EditingDomain) - */ - @Override - protected Diagnostic validateModel(Object model, EditingDomain editingDomain) { - if (model instanceof ValueType) { - ValueType value = (ValueType) model; - String decoder = value.getDecoder(); - String defaultDecoder = SmooksUIUtils.getDefualtDecoder(value); - if (defaultDecoder == null) { - return null; - } - if (decoder == null) { - return newWaringDiagnostic("Decoder is required. Select at the connection to change it in Property View.", model, Javabean12Package.Literals.VALUE_TYPE__DECODER); - } else { - if (!decoder.equals(defaultDecoder)) { - return newWaringDiagnostic("Decoder should be '" + defaultDecoder + "'. Select at the connection to change it in Property View.", model, - Javabean12Package.Literals.VALUE_TYPE__DECODER); - } - } - } - return super.validateModel(model, editingDomain); - } - - - -} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2010-01-28 05:20:18 UTC (rev 19973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2010-01-28 06:53:19 UTC (rev 19974) @@ -96,7 +96,7 @@ validatorList.add(new SelectorValidator()); validatorList.add(new PropertyValidator()); validatorList.add(new SetterMethodValidator()); - validatorList.add(new DecoderTypeValidator()); +// validatorList.add(new DecoderTypeValidator()); innerEditingDomain = newEditingDomain(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2010-01-28 05:20:18 UTC (rev 19973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2010-01-28 06:53:19 UTC (rev 19974) @@ -3,6 +3,11 @@ */ package org.jboss.tools.smooks.gef.tree.editparts; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.Iterator; +import java.util.List; + import org.eclipse.draw2d.BendpointConnectionRouter; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Connection; @@ -11,6 +16,7 @@ import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Label; import org.eclipse.draw2d.ManhattanConnectionRouter; import org.eclipse.draw2d.PolylineConnection; import org.eclipse.draw2d.geometry.Point; @@ -21,22 +27,55 @@ import org.eclipse.gef.editparts.AbstractConnectionEditPart; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; +import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeConnectionEditPolicy; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeEndpointEditPolicy; import org.jboss.tools.smooks.gef.tree.figures.LeftOrRightAnchor; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; +import org.jboss.tools.smooks.graphical.editors.model.IValidatableModel; /** * @author DartPeng * */ -public class TreeNodeConnectionEditPart extends AbstractConnectionEditPart { +public class TreeNodeConnectionEditPart extends AbstractConnectionEditPart implements PropertyChangeListener { protected int alpha = 255; - + protected boolean canDelete = true; - + private Image markerImage = null; + protected Label errorLabel = new Label(); + + protected Label warningLabel = new Label(); + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#activate() + */ @Override + public void activate() { + super.activate(); + TreeNodeConnection connection = (TreeNodeConnection) getModel(); + connection.addPropertyChangeListener(this); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#deactivate() + */ + @Override + public void deactivate() { + TreeNodeConnection connection = (TreeNodeConnection) getModel(); + connection.removePropertyChangeListener(this); + super.deactivate(); + } + + @Override protected void createEditPolicies() { this.installEditPolicy(EditPolicy.CONNECTION_ROLE, new TreeNodeConnectionEditPolicy()); this.installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new TreeNodeEndpointEditPolicy()); @@ -45,8 +84,6 @@ public void changeLineAlpha(int alpha) { this.alpha = alpha; } - - /** * @return the markerImage @@ -56,7 +93,8 @@ } /** - * @param markerImage the markerImage to set + * @param markerImage + * the markerImage to set */ public void setMarkerImage(Image markerImage) { this.markerImage = markerImage; @@ -70,18 +108,72 @@ } /** - * @param canDelete the canDelete to set + * @param canDelete + * the canDelete to set */ public void setCanDelete(boolean canDelete) { this.canDelete = canDelete; } - - protected IEditorPart getEditorPart(){ + + protected IEditorPart getEditorPart() { GraphicalViewer viewer = (GraphicalViewer) this.getViewer(); - DefaultEditDomain domain = (DefaultEditDomain)viewer.getEditDomain(); + DefaultEditDomain domain = (DefaultEditDomain) viewer.getEditDomain(); return domain.getEditorPart(); } + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals() + */ + @Override + protected void refreshVisuals() { + + Label tooltip = null; + this.setMarkerImage(null); + Object connection = getModel(); + + if (connection instanceof IValidatableModel) { + int serverity = ((IValidatableModel) connection).getSeverity(); + String message = getSeverityMessage((IValidatableModel) connection); + Image image = null; + if (serverity == IValidatableModel.NONE) { + image = null; + } + if (serverity == IValidatableModel.ERROR) { + image = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_ERROR); + tooltip = errorLabel; + tooltip.setText(message); + } + if (serverity == IValidatableModel.WARNING) { + image = SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_WARNING); + tooltip = warningLabel; + tooltip.setText(message); + } + if (image != null) { + this.setMarkerImage(image); + getFigure().repaint(); + // ((TreeNodeFigure) getFigure()).setLabelImage(image); + } + getFigure().setToolTip(tooltip); + } + } + + protected String getSeverityMessage(IValidatableModel model) { + List<String> messages = model.getMessage(); + String message = null; + for (Iterator<?> iterator = messages.iterator(); iterator.hasNext();) { + String string = (String) iterator.next(); + if (message == null) { + message = " - " + string; //$NON-NLS-1$ + } else { + message = message + "\n" + " - " + string; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + return message; + } + protected IFigure createSourceFlagFigure() { Figure sourceFlagFigure = new Figure() { @@ -187,13 +279,13 @@ }; return targetFlagFigure; } - - protected void drawLineMarkerImage(Graphics graphics){ - if(getMarkerImage() != null){ - graphics.drawImage(getMarkerImage(), this.getFigure().getBounds().getCenter().getTranslated(-8, -8)); - } + + protected void drawLineMarkerImage(Graphics graphics) { + if (getMarkerImage() != null) { + graphics.drawImage(getMarkerImage(), this.getFigure().getBounds().getCenter().getTranslated( + -getMarkerImage().getBounds().width / 2, -getMarkerImage().getBounds().height / 2)); + } } - protected Connection createConnectionFigure() { PolylineConnection connection = new PolylineConnection() { @@ -202,6 +294,10 @@ public void paintFigure(Graphics graphics) { graphics.setAlpha(alpha); graphics.setLineWidth(3); +// if (getMarkerImage() == null) { +// Point p = getBounds().getCenter().getTranslated(-8, -8); +// graphics.fillRectangle(p.x, p.y, 16, 16); +// } super.paintFigure(graphics); drawLineMarkerImage(graphics); } @@ -262,4 +358,11 @@ connection.setConnectionRouter(new BendpointConnectionRouter()); return connection; } + + public void propertyChange(PropertyChangeEvent evt) { + String event = evt.getPropertyName(); + if (AbstractSmooksGraphicalModel.PRO_SEVERITY_CHANGED.equals(event)) { + refreshVisuals(); + } + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java 2010-01-28 05:20:18 UTC (rev 19973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeConnection.java 2010-01-28 06:53:19 UTC (rev 19974) @@ -3,20 +3,33 @@ */ package org.jboss.tools.smooks.gef.tree.model; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.core.runtime.Assert; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.graphical.editors.model.IValidatableModel; /** * @author DartPeng * */ -public class TreeNodeConnection { +public class TreeNodeConnection implements IValidatableModel{ + protected int severity = IFieldMarker.TYPE_NONE; + private Object data; private AbstractSmooksGraphicalModel sourceNode; private AbstractSmooksGraphicalModel targetNode; + + protected List<String> markerMessages = null; + + protected PropertyChangeSupport support = new PropertyChangeSupport(this); public TreeNodeConnection() { @@ -86,4 +99,44 @@ public void setTargetNode(AbstractSmooksGraphicalModel targetNode) { this.targetNode = targetNode; } + + public void addMessage(String message) { + this.getMessage().add(message); + } + + public List<String> getMessage() { + if(markerMessages == null){ + markerMessages = new ArrayList<String>(); + } + return markerMessages; + } + + /** + * @return the severity + */ + public int getSeverity() { + return severity; + } + + public void addPropertyChangeListener(PropertyChangeListener listener){ + support.addPropertyChangeListener(listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener){ + support.removePropertyChangeListener(listener); + } + + /** + * @param severity the severity to set + */ + public void setSeverity(int severity) { + int old = this.severity; + if (severity == this.severity){ + old = -1; + } + this.severity = severity; + support.firePropertyChange(AbstractSmooksGraphicalModel.PRO_SEVERITY_CHANGED, old, this.severity); + } + + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2010-01-28 05:20:18 UTC (rev 19973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2010-01-28 06:53:19 UTC (rev 19974) @@ -10,23 +10,31 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.editors; +import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.palette.PaletteRoot; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.IFieldMarker; import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper; import org.jboss.tools.smooks.configuration.editors.actions.JavaBean11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.common.RootModel; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.graphical.editors.autolayout.IAutoLayout; import org.jboss.tools.smooks.graphical.editors.autolayout.JavaMappingAutoLayout; import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanGraphModel; import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaMappingActionCreator; import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.ValueType; /** * @author Dart @@ -41,36 +49,105 @@ // TODO Auto-generated constructor stub } - - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart#needToLayoutWhenAddModel(java.lang.Object) + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * needToLayoutWhenAddModel(java.lang.Object) */ @Override protected boolean needToLayoutWhenAddModel(Object model) { model = AdapterFactoryEditingDomain.unwrap(model); - if(model instanceof BeanType){ + if (model instanceof BeanType) { return true; } return super.needToLayoutWhenAddModel(model); } + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * validateEnd(java.util.List) + */ + @Override + public void validateEnd(List<Diagnostic> diagnosticResult) { + super.validateEnd(diagnosticResult); + // validate decoder type (target connections of java property node) + GraphicalViewer viewer = this.getGraphicalViewer(); + if (viewer != null) { + EditPart rootEditPart = viewer.getContents(); + Object rootModel = rootEditPart.getModel(); + if (rootModel instanceof AbstractSmooksGraphicalModel) { + validateConnection((AbstractSmooksGraphicalModel) rootModel); + } + } + } - /* (non-Javadoc) - * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart#needToLayoutWhenRemoveModel(java.lang.Object) + /** + * + * @param model */ + protected void validateConnection(AbstractSmooksGraphicalModel model) { + List<TreeNodeConnection> targetConnections = model.getTargetConnections(); + if (targetConnections != null) { + for (Iterator<?> iterator = targetConnections.iterator(); iterator.hasNext();) { + TreeNodeConnection connection = (TreeNodeConnection) iterator.next(); + Object target = connection.getTargetNode().getData(); + target = AdapterFactoryEditingDomain.unwrap(target); + if (target instanceof ValueType) { + ValueType value = (ValueType) target; + String decoder = value.getDecoder(); + connection.getMessage().clear(); + boolean changed = false; + String defaultDecoder = SmooksUIUtils.getDefualtDecoder(value); + if (defaultDecoder == null) { + connection.setSeverity(IFieldMarker.TYPE_NONE); + continue; + } + if (decoder == null) { + connection.addMessage("Decoder is required."); + connection.setSeverity(IFieldMarker.TYPE_WARINING); + changed = true; + } else { + if (!decoder.equals(defaultDecoder)) { + connection.addMessage("Decoder should be '" + defaultDecoder + "'."); + connection.setSeverity(IFieldMarker.TYPE_WARINING); + changed = true; + } + } + if(!changed){ + connection.setSeverity(IFieldMarker.TYPE_NONE); + } + } + } + } + List<AbstractSmooksGraphicalModel> children = model.getChildrenWithoutDynamic(); + if(model instanceof RootModel){ + children = model.getChildren(); + } + for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { + AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next(); + validateConnection(abstractSmooksGraphicalModel); + } + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * needToLayoutWhenRemoveModel(java.lang.Object) + */ @Override protected boolean needToLayoutWhenRemoveModel(Object model) { model = AdapterFactoryEditingDomain.unwrap(model); - if(model instanceof BeanType){ + if (model instanceof BeanType) { return true; } return super.needToLayoutWhenRemoveModel(model); } - - /* * (non-Javadoc) * @@ -186,35 +263,35 @@ } return p; } -// if (obj instanceof BindingsType) { -// String p = ((BindingsType) obj).getBeanId(); -// if (p == null) { -// p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; -// } -// return p; -// } -// -// if (obj instanceof ValueType) { -// String p = ((ValueType) obj).getProperty(); -// if (p == null) { -// p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; -// } -// return p; -// } -// if (obj instanceof WiringType) { -// String p = ((WiringType) obj).getProperty(); -// if (p == null) { -// p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; -// } -// return p; -// } -// if (obj instanceof ExpressionType) { -// String p = ((ExpressionType) obj).getProperty(); -// if (p == null) { -// p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; -// } -// return p; -// } + // if (obj instanceof BindingsType) { + // String p = ((BindingsType) obj).getBeanId(); + // if (p == null) { + // p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; + // } + // return p; + // } + // + // if (obj instanceof ValueType) { + // String p = ((ValueType) obj).getProperty(); + // if (p == null) { + // p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; + // } + // return p; + // } + // if (obj instanceof WiringType) { + // String p = ((WiringType) obj).getProperty(); + // if (p == null) { + // p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; + // } + // return p; + // } + // if (obj instanceof ExpressionType) { + // String p = ((ExpressionType) obj).getProperty(); + // if (p == null) { + // p = Messages.SmooksJavaMappingGraphicalEditor_NullLabel; + // } + // return p; + // } if (obj instanceof org.jboss.tools.smooks.model.javabean12.ValueType) { String p = ((org.jboss.tools.smooks.model.javabean12.ValueType) obj).getProperty();