Author: DartPeng Date: 2009-12-01 03:23:46 -0500 (Tue, 01 Dec 2009) New Revision: 18943 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/RightClickSelectMarqueeDragTraker.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java Log: JBIDE-5314 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-12-01 08:16:37 UTC (rev 18942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-12-01 08:23:46 UTC (rev 18943) @@ -40,10 +40,12 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.gef.ContextMenuProvider; import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.DragTracker; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.Request; import org.eclipse.gef.commands.CommandStack; import org.eclipse.gef.commands.CommandStackEvent; import org.eclipse.gef.commands.CommandStackEventListener; @@ -93,6 +95,7 @@ import org.jboss.tools.smooks.graphical.editors.autolayout.IAutoLayout; import org.jboss.tools.smooks.graphical.editors.commands.IgnoreException; import org.jboss.tools.smooks.graphical.editors.editparts.InputDataContainerEditPart; +import org.jboss.tools.smooks.graphical.editors.editparts.RightClickSelectMarqueeDragTraker; import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil; import org.jboss.tools.smooks.graphical.editors.model.IValidatableModel; import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel; @@ -669,7 +672,11 @@ getGraphicalViewer().setEditDomain(editDomain); getGraphicalViewer().setEditPartFactory(createEdtiPartFactory()); - getGraphicalViewer().setRootEditPart(new FreeformGraphicalRootEditPart()); + getGraphicalViewer().setRootEditPart(new FreeformGraphicalRootEditPart() { + public DragTracker getDragTracker(Request req) { + return new RightClickSelectMarqueeDragTraker(); + } + }); getGraphicalViewer().addDropTargetListener( (TransferDropTargetListener) new TemplateTransferDropTargetListener(getGraphicalViewer())); @@ -768,7 +775,7 @@ expandConnectedModels(connections); this.autoLayout(false); - + List<Diagnostic> diagnosticList = this.getSmooksModelProvider().getDiagnosticList(); this.validateEnd(diagnosticList); } @@ -1360,8 +1367,8 @@ } } - - protected String getDiagnosticMessage(Diagnostic diagnostic){ + + protected String getDiagnosticMessage(Diagnostic diagnostic) { List<?> datas = diagnostic.getData(); if (datas.size() == 2) { Object parentObj = datas.get(0); 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 2009-12-01 08:16:37 UTC (rev 18942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2009-12-01 08:23:46 UTC (rev 18943) @@ -28,11 +28,9 @@ import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaMappingActionCreator; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean.ExpressionType; -import org.jboss.tools.smooks.model.javabean.JavabeanPackage; import org.jboss.tools.smooks.model.javabean.ValueType; import org.jboss.tools.smooks.model.javabean.WiringType; import org.jboss.tools.smooks.model.javabean12.BeanType; -import org.jboss.tools.smooks.model.javabean12.Javabean12Package; /** * @author Dart Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/RightClickSelectMarqueeDragTraker.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/RightClickSelectMarqueeDragTraker.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/RightClickSelectMarqueeDragTraker.java 2009-12-01 08:23:46 UTC (rev 18943) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.tools.smooks.graphical.editors.editparts; + +import org.eclipse.gef.tools.MarqueeDragTracker; + +/** + * @author Dart + * + */ +public class RightClickSelectMarqueeDragTraker extends MarqueeDragTracker{ + + @Override + protected boolean handleButtonUp(int button) { + int state = getState(); + setState(STATE_DRAG_IN_PROGRESS); + boolean flag = super.handleButtonUp(button); + setState(state); + return flag; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/RightClickSelectMarqueeDragTraker.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java 2009-12-01 08:16:37 UTC (rev 18942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java 2009-12-01 08:23:46 UTC (rev 18943) @@ -26,7 +26,7 @@ public static final int BEAN_TYPE = 2; public static final int BINDINGS_TYPE = 1; - + /* * (non-Javadoc) * @@ -42,5 +42,4 @@ DefaultEditDomain editDomain = (DefaultEditDomain) viewer.getEditDomain(); return editDomain.getEditorPart(); } - }