From a3bc8799e8879ef62398a0c1ce308d3732346db5 Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Thu, 26 Mar 2020 17:05:09 +0100
Subject: [PATCH] changed method name, added check
Issue-Ref: 3967
Issue-Url: https://af3-developer.fortiss.org/issues/3967
Signed-off-by: Johannes Eder <eder@fortiss.org>
---
.../tooling/common/ui/javafx/lwfxef/controller/.ratings | 2 +-
.../common/ui/javafx/lwfxef/controller/IController.java | 2 +-
.../tooling/common/ui/javafx/lwfxef/controller/base/.ratings | 4 ++--
.../ui/javafx/lwfxef/controller/base/ControllerBase.java | 4 ++--
.../ui/javafx/lwfxef/controller/base/LinkControllerBase.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/.ratings
index d3f2c8335..a7df9b001 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/.ratings
@@ -1,5 +1,5 @@
IClickController.java c0270e99d918aef14612d46f3e84905d3a6bdd8c GREEN
-IController.java 443fe97dae2f8142e9ebc6df3267b505444c4bbe GREEN
+IController.java 84958424716cf934f461690d6b94a02f90e0f2a1 YELLOW
IControllerFactory.java 85b86eda643489f2a03454eae5383915ecf27f83 GREEN
IDragController.java c1f311d2ae9ed684c8a7cd85e9ed1f85e79658d1 GREEN
IKeyPressController.java dc8fe2a7c441866122e8c7b3114fd12d17f0b051 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/IController.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/IController.java
index 443fe97da..849584247 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/IController.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/IController.java
@@ -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,
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
index 0fc6e843d..2c67e711c 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
@@ -1,11 +1,11 @@
AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GREEN
ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN
ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN
-ControllerBase.java 63cf61e3c32a346d442b79898f6f813b4c9d4dce YELLOW
+ControllerBase.java 9311521b252e46640e26d409610e527fd5ed6922 YELLOW
DefaultDiagramController.java 0e083b89a08f63967102a384d66ebc1d64d203af GREEN
DelegatingContentAnchorageController.java 2e3b1b4e14402a3503233f816b21ef3e4aa09edc GREEN
DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN
DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN
-LinkControllerBase.java 3032dae49a7844084ea9d41d2c7f88737be3e3d8 YELLOW
+LinkControllerBase.java b59796a87ac5d5e054c332d0867d5e3d308d9936 YELLOW
MoveControllerBase.java 38d632e31f5e27d112ecdd4933e3a331378180d0 GREEN
ResizableContentControllerBase.java 898500d389b035f8138308d496d2d24be501c719 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
index 0d262e742..9311521b2 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
@@ -54,7 +54,7 @@ public abstract class ControllerBase extends MVCBundlePartBase implements IContr
/** {@inheritDoc} */
@Override
- public boolean selectOnShiftMousePress() {
+ public boolean selectOnCtrlMousePress() {
return true;
}
@@ -75,7 +75,7 @@ public abstract class ControllerBase extends MVCBundlePartBase implements IContr
if(!selectOnClick()) {
return null;
}
- if(event.isControlDown()) {
+ if(event.isControlDown() && selectOnCtrlMousePress()) {
getViewer().handleCtrlSelectionOf(getMVCBundle());
} else {
getViewer().setSingleSelectedMVCBundle(getMVCBundle());
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
index 3032dae49..b59796a87 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
@@ -392,7 +392,7 @@ public abstract class LinkControllerBase extends MVCBundlePartBase implements IC
/** {@inheritDoc} */
@Override
- public boolean selectOnShiftMousePress() {
+ public boolean selectOnCtrlMousePress() {
return true;
}
--
GitLab