Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2016-08-12 11:04:01 +0000
committerLaurent Redor2016-08-12 11:20:33 +0000
commit655aa41eb75a1082c8a9424a01fc932718559de5 (patch)
treefb8b9f3f4b53eedb32b3e7c660468a7fe4e0707f
parent3ada41681516cf1fbc96bd5f0b1c5268f50fb1af (diff)
downloadorg.eclipse.sirius-655aa41eb75a1082c8a9424a01fc932718559de5.tar.gz
org.eclipse.sirius-655aa41eb75a1082c8a9424a01fc932718559de5.tar.xz
org.eclipse.sirius-655aa41eb75a1082c8a9424a01fc932718559de5.zip
[498508] Revert first approach of previous commit
This commit reverts the first solution of commit [1]. Indeed this code makes regression, as explain in [2]. [1] http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=2793b25ff765a9ea089b57c4634f7662ad2c2dee [2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=498508#c5 Bug: 498508 Change-Id: Iaffe8e8952f51934806baa9e91482f6db66739bf Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java34
1 files changed, 0 insertions, 34 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java
index 5f2e741b7a..245c1ea43e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java
@@ -16,26 +16,16 @@ import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.editparts.AbstractEditPart;
import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DescriptionCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.sirius.diagram.ui.internal.edit.parts.SiriusNoteEditPart;
-import org.eclipse.sirius.diagram.ui.internal.edit.parts.SiriusTextEditPart;
import org.eclipse.sirius.ext.gmf.runtime.diagram.ui.tools.MoveInDiagramDragTracker;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.MouseEvent;
-import com.google.common.collect.Iterables;
-
/**
* A specific dragEditPartTracket that allows to change the behavior of
* SnapToShape (capability to snap to all shapes and not only brothers one).
- * <br/>
- * Furthermore, a specific selection is operated for generic diagram notes in
- * order to trigger the direct edit mode with only two slow click, like any
- * other diagram element.
*
* @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
*
@@ -161,28 +151,4 @@ public class SnapToAllDragEditPartsTracker extends DragEditPartsTrackerEx implem
}
return super.handleDragInProgress();
}
-
- /**
- * Overridden for Note selection. It will also select the contained
- * DescriptionCompartmentEditPart. This way the direct edit mode is accessed
- * after a slow double-click like any other diagram element.
- */
- @Override
- protected void performSelection() {
- super.performSelection();
- EditPart sourceEditPart = getSourceEditPart();
- if (sourceEditPart instanceof SiriusNoteEditPart || sourceEditPart instanceof SiriusTextEditPart) {
- AbstractEditPart siriusNoteEditPart = (AbstractEditPart) sourceEditPart;
- EditPartViewer viewer = siriusNoteEditPart.getViewer();
- Iterable<DescriptionCompartmentEditPart> descriptionCompartmentEditPartsfilter = Iterables.filter(sourceEditPart.getChildren(), DescriptionCompartmentEditPart.class);
- if (Iterables.size(descriptionCompartmentEditPartsfilter) == 1) {
- DescriptionCompartmentEditPart descriptionCompartmentEditPart = Iterables.getOnlyElement(descriptionCompartmentEditPartsfilter);
- if (getCurrentInput().isModKeyDown(SWT.MOD1) && viewer.getSelectedEditParts().contains(descriptionCompartmentEditPart)) {
- viewer.deselect(descriptionCompartmentEditPart);
- } else if (descriptionCompartmentEditPart.isSelectable()) {
- viewer.appendSelection(descriptionCompartmentEditPart);
- }
- }
- }
- }
}

Back to the top