From e57dbd511691cbf18e1122721ae5abfedd9e4bc4 Mon Sep 17 00:00:00 2001 From: Sebastian Bergemann <bergemann@fortiss.org> Date: Thu, 21 Oct 2021 11:26:24 +0200 Subject: [PATCH] GREEN (+ small fixes) Issue-Ref: 3843 Issue-Url: https://git.fortiss.org/af3/af3/-/issues/3843 Signed-off-by: Sebastian Bergemann <bergemann@fortiss.org> --- .../fortiss/tooling/base/ui/editor/fx/controller/.ratings | 2 +- .../org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings | 2 +- .../common/ui/javafx/lwfxef/controller/base/.ratings | 2 +- .../lwfxef/controller/base/DefaultDiagramController.java | 8 ++++---- .../org/fortiss/tooling/kernel/ui/extension/base/.ratings | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings index 391dec0bc..02a387138 100644 --- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings +++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings @@ -1,6 +1,6 @@ CurvedLinkLayoutedContentAnchorangeController.java e22faedbe98c3dab660b5d2df8ebd004e116c5ba GREEN CurvedLinkLayoutedDiagramAnchorangeController.java f2e5e2a7cc9b6a070871e200e57371286bb15222 GREEN -EObjectDiagramController.java 45f5b1439f33685523b035d2603e8329b647b62a YELLOW +EObjectDiagramController.java 45f5b1439f33685523b035d2603e8329b647b62a GREEN EObjectEllipticResizableContentControllerBase.java f12e8f5a646a23fe428ed4768bf041c8b885ec81 GREEN EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN EObjectRectangularResizableContentControllerBase.java cde6c13659611d927691c03ecd2621cff2414b03 GREEN diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings index 39f950f35..79b9ab816 100644 --- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings +++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings @@ -2,7 +2,7 @@ DiagramCoordinate.java 6b00aec99054d4cd19003a72bd4e5e774ac6a641 GREEN DiagramLayers.java 155cbb47a5f0aaa0025320ae607e6777f3a2d2e8 GREEN DiagramViewer.java 920bb0f4ee6dd9ac6b607e44c01f04a413b2e2ed GREEN DiagramViewerDefaultTags.java 6230763252409c60009ab8887b4ef582cf883229 GREEN -DiagramViewerFeatures.java 397c9600193df18e865f1ff7c829df577c56d383 YELLOW +DiagramViewerFeatures.java 397c9600193df18e865f1ff7c829df577c56d383 GREEN DiagramViewerSelection.java e833f592543bc97077907d980a39b123fc4044e6 GREEN EDragGesture.java 5cfa098d3877db11981c2750e5e103156d62fc5e GREEN FeedbackChange.java b088fa89af648f1674f2f9c1f7f99d585ce801ca GREEN 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 f81faf3b9..54e34439b 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 @@ -2,7 +2,7 @@ AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GRE ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN ControllerBase.java 9311521b252e46640e26d409610e527fd5ed6922 GREEN -DefaultDiagramController.java 57cc1bbde64c22d0dfb4832755d50e9491261072 YELLOW +DefaultDiagramController.java 3f60229b2e0fe0b6ac40c617858cc5a0685a59eb GREEN DelegatingContentAnchorageController.java 1889628a346a2183082ffe213978f9d15a949494 GREEN DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java index 57cc1bbde..3f60229b2 100644 --- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java +++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java @@ -110,18 +110,18 @@ public class DefaultDiagramController extends ControllerBase { /** Creates a {@link MenuItem} to zoom out. */ private MenuItem createZoomOutMenuItem(DiagramViewerFeatures features) { - MenuItem zoomInMenuItem = new MenuItem("Zoom out"); - zoomInMenuItem.setOnAction(evt -> { + MenuItem zoomOutMenuItem = new MenuItem("Zoom out"); + zoomOutMenuItem.setOnAction(evt -> { features.zoomOut(); }); - return zoomInMenuItem; + return zoomOutMenuItem; } /** Creates a {@link MenuItem} to set the zoom factor. */ private MenuItem createZoomFactorMenuItem(DiagramViewerFeatures features, int zoomFactorIndex, String prefix) { MenuItem zoomFactorMenuItem = null; - if(zoomFactorIndex < features.getZoomFactors().length) { + if(zoomFactorIndex >= 0 && zoomFactorIndex < features.getZoomFactors().length) { double zoomFactor = features.getZoomFactors()[zoomFactorIndex]; zoomFactorMenuItem = new MenuItem(prefix + zoomFactor * 100 + " %"); zoomFactorMenuItem.setOnAction(evt -> { diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings index 6ccc10906..0a92aa62c 100644 --- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings +++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings @@ -6,7 +6,7 @@ EReferencePropertySectionBase.java 0548da6778516003257f59d0b4c2b60d458be3b6 GREE EditorBase.java 9c09fff92945256bb8680992ae7bb2c78f47b150 GREEN FXEditorBase.java 40caf638c7b4c02da5aece0d9d58883bce630e76 GREEN IListPropertySection.java 8bb00fe7959583e794ff9437b7a77404c9a9e70f GREEN -LWFXEFEditorBase.java f6b160b700a0287021402b5702beb2bfdce3dc2e YELLOW +LWFXEFEditorBase.java f6b160b700a0287021402b5702beb2bfdce3dc2e GREEN ModelEditorBindingBase.java b9b1a1c5a48a6e677d1f57ad55a6126d9703c4b5 GREEN ModelElementHandlerBase.java fbd38bcaec6615bcc95be7fdb847f85577c8cd47 GREEN MultiEObjectActionBase.java 9e237d8ea640c4194e4877af4a9cfce88698e543 GREEN -- GitLab