From 79eb880f74134f534c6af4376907d0f0def0f28f Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Wed, 11 Dec 2019 16:24:26 +0100
Subject: [PATCH] JFX editors: Shorten controller names
Issue-Ref: 3883
Issue-Url: https://af3-developer.fortiss.org/issues/3883
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.../tooling/base/ui/editor/fx/controller/.ratings | 11 +++++------
...jectRectangularResizableContentControllerBase.java | 4 ++--
...geProvider.java => LayoutModelChangeProvider.java} | 4 ++--
...r.java => LayoutedContentAnchorageController.java} | 8 ++++----
...r.java => LayoutedDiagramAnchorageController.java} | 8 ++++----
.../controller/LayoutedLinkBendPointController.java | 4 ++--
6 files changed, 19 insertions(+), 20 deletions(-)
rename org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/{LayoutModelElementModelChangeProvider.java => LayoutModelChangeProvider.java} (97%)
rename org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/{LayoutedModelElementBasedContentAnchorageController.java => LayoutedContentAnchorageController.java} (92%)
rename org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/{LayoutedModelElementBasedDiagramAnchorageController.java => LayoutedDiagramAnchorageController.java} (93%)
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 121aae2c0..547ce3bf3 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,11 +1,10 @@
ContextMenuUtil.java 7be87ce47b775d90c533078e22d4d445d9864caf GREEN
EObjectDiagramController.java bd4a68e86f7941c04ef0f0d664c2848e7063126c YELLOW
EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
-EObjectRectangularResizableContentControllerBase.java 63b3765e583e33d2dc5233c0241b494255f872a7 YELLOW
+EObjectRectangularResizableContentControllerBase.java b2a2751705ad0832117b8926d88826846d46b82e YELLOW
KernelServiceBasedModelChangeProviderBase.java 18e48f17ea8dfba90de024a8959fc5a4b0d05d45 GREEN
-LayoutModelElementModelChangeProvider.java dae8650dc5a8a63e18182521e0f59eb5452239b6 GREEN
-LayoutedLinkBendPointController.java 47b81afd607191283b9441df34f33454addda183 YELLOW
-LayoutedModelElementBasedContentAnchorageController.java 874a17f8ed7fa9510020f0c05a1eaf45b99a7216 YELLOW
-LayoutedModelElementBasedDiagramAnchorageController.java 9e005b36b9f183cbbfcb4e08adc6b5056d0cf29a YELLOW
-LayoutedModelElementBasedLinkBendPointController.java a716406e62cbb8dba47ae72e1ab7659195f1a48c YELLOW
+LayoutModelChangeProvider.java d6ad0b5af2cd324ff77e4a214db302a1ef3d6a57 YELLOW
+LayoutedContentAnchorageController.java 70e5960964ba505f28df6df8db52f2d17231b223 YELLOW
+LayoutedDiagramAnchorageController.java 898ad367bea8889c26e5bbfa050048382cb0b7f0 YELLOW
+LayoutedLinkBendPointController.java 475af314d4f4524ebdefb64e1914d1dfd471df85 YELLOW
LayoutedRectangularResizableContentController.java aebb2c0de11e90d16f40bcbf346112a9d792bdf9 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectRectangularResizableContentControllerBase.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectRectangularResizableContentControllerBase.java
index 63b3765e5..b2a275170 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectRectangularResizableContentControllerBase.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectRectangularResizableContentControllerBase.java
@@ -57,7 +57,7 @@ public abstract class EObjectRectangularResizableContentControllerBase<T extends
extends RectangularResizableContentControllerBase {
/** {@link IModelChangeProvider} for this controller */
- private final LayoutModelElementModelChangeProvider layoutModelChangeProvider;
+ private final LayoutModelChangeProvider layoutModelChangeProvider;
/** The click controller handling double-click to open editor. */
private final IClickController openEditorDoubleClickController = new ClickControllerBase() {
@Override
@@ -101,7 +101,7 @@ public abstract class EObjectRectangularResizableContentControllerBase<T extends
}
ILayoutedModelElement lme = (ILayoutedModelElement)mvcb.getModel();
- this.layoutModelChangeProvider = new LayoutModelElementModelChangeProvider(lme) {
+ this.layoutModelChangeProvider = new LayoutModelChangeProvider(lme) {
/** {@inheritDoc} */
@Override
protected boolean acceptNotification(Notification notification) {
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelElementModelChangeProvider.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelElementModelChangeProvider.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
index dae8650dc..d6ad0b5af 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelElementModelChangeProvider.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
@@ -30,7 +30,7 @@ import org.fortiss.tooling.base.model.layout.LayoutPackage;
*
* @author hoelzl
*/
-class LayoutModelElementModelChangeProvider
+class LayoutModelChangeProvider
extends KernelServiceBasedModelChangeProviderBase<ILayoutedModelElement> {
/** The layouted model element. */
private final ILayoutedModelElement modelElement;
@@ -38,7 +38,7 @@ class LayoutModelElementModelChangeProvider
private final LayoutModelElementAdapter notificationListener;
/** Constructor. */
- public LayoutModelElementModelChangeProvider(ILayoutedModelElement modelElement) {
+ public LayoutModelChangeProvider(ILayoutedModelElement modelElement) {
this.modelElement = modelElement;
this.notificationListener = new LayoutModelElementAdapter();
}
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedContentAnchorageController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedContentAnchorageController.java
similarity index 92%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedContentAnchorageController.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedContentAnchorageController.java
index 874a17f8e..70e596096 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedContentAnchorageController.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedContentAnchorageController.java
@@ -34,13 +34,13 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
*
* @author hoelzl
*/
-public class LayoutedModelElementBasedContentAnchorageController<T extends ILayoutedModelElement>
+public class LayoutedContentAnchorageController<T extends ILayoutedModelElement>
extends DelegatingContentAnchorageController {
/** {@link IModelChangeProvider} for this controller */
- private final LayoutModelElementModelChangeProvider layoutModelChangeProvider;
+ private final LayoutModelChangeProvider layoutModelChangeProvider;
/** Constructor. */
- public LayoutedModelElementBasedContentAnchorageController(IContentAnchorageMVCBundle mvcb,
+ public LayoutedContentAnchorageController(IContentAnchorageMVCBundle mvcb,
Class<T> modelType) {
super(mvcb);
@@ -54,7 +54,7 @@ public class LayoutedModelElementBasedContentAnchorageController<T extends ILayo
}
ILayoutedModelElement lme = (ILayoutedModelElement)mvcb.getModel();
- this.layoutModelChangeProvider = new LayoutModelElementModelChangeProvider(lme);
+ this.layoutModelChangeProvider = new LayoutModelChangeProvider(lme);
}
/** Returns the model element. */
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedDiagramAnchorageController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedDiagramAnchorageController.java
similarity index 93%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedDiagramAnchorageController.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedDiagramAnchorageController.java
index 9e005b36b..898ad367b 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedModelElementBasedDiagramAnchorageController.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedDiagramAnchorageController.java
@@ -34,13 +34,13 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
*
* @author hoelzl
*/
-public class LayoutedModelElementBasedDiagramAnchorageController<T extends ILayoutedModelElement>
+public class LayoutedDiagramAnchorageController<T extends ILayoutedModelElement>
extends MoveControllerBase {
/** {@link IModelChangeProvider} for this controller */
- private final LayoutModelElementModelChangeProvider layoutModelChangeProvider;
+ private final LayoutModelChangeProvider layoutModelChangeProvider;
/** Constructor. */
- public LayoutedModelElementBasedDiagramAnchorageController(IMVCBundle mvcb,
+ public LayoutedDiagramAnchorageController(IMVCBundle mvcb,
Class<T> modelType) {
super(mvcb);
@@ -54,7 +54,7 @@ public class LayoutedModelElementBasedDiagramAnchorageController<T extends ILayo
}
ILayoutedModelElement lme = (ILayoutedModelElement)mvcb.getModel();
- this.layoutModelChangeProvider = new LayoutModelElementModelChangeProvider(lme);
+ this.layoutModelChangeProvider = new LayoutModelChangeProvider(lme);
}
/** Returns the model element. */
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLinkBendPointController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLinkBendPointController.java
index 47b81afd6..475af314d 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLinkBendPointController.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLinkBendPointController.java
@@ -40,7 +40,7 @@ import org.fortiss.tooling.kernel.service.IConnectionCompositorService;
public class LayoutedLinkBendPointController<T extends ILayoutedModelElement>
extends LinkControllerBase {
/** {@link IModelChangeProvider} for this controller */
- private final LayoutModelElementModelChangeProvider layoutModelChangeProvider;
+ private final LayoutModelChangeProvider layoutModelChangeProvider;
/** Constructor. */
public LayoutedLinkBendPointController(ILinkMVCBundle mvcb,
@@ -57,7 +57,7 @@ public class LayoutedLinkBendPointController<T extends ILayoutedModelElement>
}
ILayoutedModelElement lme = (ILayoutedModelElement)mvcb.getModel();
- this.layoutModelChangeProvider = new LayoutModelElementModelChangeProvider(lme);
+ this.layoutModelChangeProvider = new LayoutModelChangeProvider(lme);
}
/** Returns the model element. */
--
GitLab