Commit 85c92880 authored by Alexander Diewald's avatar Alexander Diewald

Merge branch '3967' into 'master'

3967

See merge request !98
parents 1c570288 f6b78e9a
ContextMenuUtil.java 405387151d45b09dffb3b6ba44f980313c8edcaf GREEN
CurvedLinkLayoutedContentAnchorangeController.java e22faedbe98c3dab660b5d2df8ebd004e116c5ba GREEN
CurvedLinkLayoutedDiagramAnchorangeController.java f2e5e2a7cc9b6a070871e200e57371286bb15222 GREEN
EObjectDiagramController.java 2b253941592ee25ead95223470f983f23ef9776f GREEN
EObjectDiagramController.java 019e37a9016e895a720374f31667972744080e3b GREEN
EObjectEllipticResizableContentControllerBase.java 958d3856daf5337cd75d0a6f163a27dcc8717160 GREEN
EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
EObjectRectangularResizableContentControllerBase.java 7cbc3e89b7b74106d56b8b4f845087e96e13d109 GREEN
......
......@@ -26,7 +26,7 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.tooling.common.ui.javafx.lwfxef.DiagramCoordinate;
import org.fortiss.tooling.common.ui.javafx.lwfxef.DiagramViewerFeatures;
import org.fortiss.tooling.common.ui.javafx.lwfxef.controller.base.ControllerBase;
import org.fortiss.tooling.common.ui.javafx.lwfxef.controller.base.DefaultDiagramController;
import org.fortiss.tooling.common.ui.javafx.lwfxef.model.IModelChangeProvider;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IMVCBundle;
import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
......@@ -43,7 +43,7 @@ import javafx.scene.input.Dragboard;
*
* @author hoelzl
*/
public class EObjectDiagramController<T extends EObject> extends ControllerBase {
public class EObjectDiagramController<T extends EObject> extends DefaultDiagramController {
/** The model change provider. */
private final EObjectModelChangeProvider modelChangeProvider;
......
DiagramCoordinate.java 6b00aec99054d4cd19003a72bd4e5e774ac6a641 GREEN
DiagramLayers.java 155cbb47a5f0aaa0025320ae607e6777f3a2d2e8 GREEN
DiagramViewer.java a96338d3d8e043564eb857920ade45f6e2d4ac18 GREEN
DiagramViewer.java 82a70a1bb673b455ebc430bbc2cffc71ab9f3140 GREEN
DiagramViewerDefaultTags.java 6230763252409c60009ab8887b4ef582cf883229 GREEN
DiagramViewerFeatures.java 31e3fb61f915b0d8695005b083c47ce1c5be0b05 GREEN
DiagramViewerSelection.java e833f592543bc97077907d980a39b123fc4044e6 GREEN
EDragGesture.java 5cfa098d3877db11981c2750e5e103156d62fc5e GREEN
FeedbackChange.java b088fa89af648f1674f2f9c1f7f99d585ce801ca GREEN
GridCanvasVisual.java 734027d56af342cd01ff445ba9347b8dbb6c83c2 GREEN
MVCBundleManager.java 2b4ab114c55b30a3d98d7135458f8f3ddd244d58 GREEN
MVCBundleManager.java e4892a571fd26eccc5e4e9b2256432721723f542 GREEN
MouseState.java 3d9993f799d5d74bc74ac03b46e4a1857c4d267e GREEN
SVGExporter.java cbbd1eceb2910fd5c1693e05c5303a193127b9db GREEN
......@@ -377,8 +377,8 @@ public class DiagramViewer {
}
/** Interprets the effect of shift-clicking the given {@link IMVCBundle}. */
public void handleShiftSelectionOf(IMVCBundle sel) {
viewerManager.handleShiftSelectionOf(sel);
public void handleCtrlSelectionOf(IMVCBundle sel) {
viewerManager.handleCtrlSelectionOf(sel);
}
/**
......
......@@ -605,7 +605,7 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
}
/** Performs shift selection of the given bundle. */
public void handleShiftSelectionOf(IMVCBundle sel) {
public void handleCtrlSelectionOf(IMVCBundle sel) {
if(primarySelectedBundle == sel || secondarySelectedBundles.contains(sel)) {
removeSelectedMVCBundle(sel);
} else {
......
IClickController.java c0270e99d918aef14612d46f3e84905d3a6bdd8c GREEN
IController.java 443fe97dae2f8142e9ebc6df3267b505444c4bbe GREEN
IController.java 84958424716cf934f461690d6b94a02f90e0f2a1 GREEN
IControllerFactory.java 85b86eda643489f2a03454eae5383915ecf27f83 GREEN
IDragController.java c1f311d2ae9ed684c8a7cd85e9ed1f85e79658d1 GREEN
IKeyPressController.java dc8fe2a7c441866122e8c7b3114fd12d17f0b051 GREEN
......@@ -40,7 +40,7 @@ public interface IController extends IMVCBundlePart {
* Returns whether the {@link IMVCBundle} should be added to the selection if the mouse is
* pressed on one of its nodes while the shift key is down.
*/
boolean selectOnShiftMousePress();
boolean selectOnCtrlMousePress();
/** Returns an {@link IDragController} for the given node and last mouse location. */
IDragController getDragController(EDragGesture gesture, Node node,
......
AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GREEN
ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN
ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN
ControllerBase.java 0ab6cf1b36cf3618a70c1666fd8747c59e90dbc6 GREEN
ControllerBase.java 9311521b252e46640e26d409610e527fd5ed6922 GREEN
DefaultDiagramController.java 0e083b89a08f63967102a384d66ebc1d64d203af GREEN
DelegatingContentAnchorageController.java 1889628a346a2183082ffe213978f9d15a949494 GREEN
DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN
DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN
LinkControllerBase.java c2232100230997f1ba7f2686a2f0626f85d223ed GREEN
LinkControllerBase.java b59796a87ac5d5e054c332d0867d5e3d308d9936 GREEN
MoveControllerBase.java 38d632e31f5e27d112ecdd4933e3a331378180d0 GREEN
ResizableContentControllerBase.java 898500d389b035f8138308d496d2d24be501c719 GREEN
......@@ -54,7 +54,7 @@ public abstract class ControllerBase extends MVCBundlePartBase implements IContr
/** {@inheritDoc} */
@Override
public boolean selectOnShiftMousePress() {
public boolean selectOnCtrlMousePress() {
return true;
}
......@@ -75,8 +75,8 @@ public abstract class ControllerBase extends MVCBundlePartBase implements IContr
if(!selectOnClick()) {
return null;
}
if(event.isShiftDown()) {
getViewer().handleShiftSelectionOf(getMVCBundle());
if(event.isControlDown() && selectOnCtrlMousePress()) {
getViewer().handleCtrlSelectionOf(getMVCBundle());
} else {
getViewer().setSingleSelectedMVCBundle(getMVCBundle());
}
......
......@@ -131,11 +131,7 @@ public abstract class LinkControllerBase extends MVCBundlePartBase implements IC
DiagramCoordinate snappedLocation = features.snapToCenter(diagramLocation);
return () -> createBendPointAt(currentBendPointIndex, snappedLocation);
}
if(event.isShiftDown()) {
viewer.handleShiftSelectionOf(getMVCBundle());
} else {
viewer.setSingleSelectedMVCBundle(getMVCBundle());
}
viewer.setSingleSelectedMVCBundle(getMVCBundle());
return null;
}
......@@ -396,7 +392,7 @@ public abstract class LinkControllerBase extends MVCBundlePartBase implements IC
/** {@inheritDoc} */
@Override
public boolean selectOnShiftMousePress() {
public boolean selectOnCtrlMousePress() {
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment