From f1fa72af7209e44d66fa0ce2026722c42da9ca84 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 11 Jun 2018 13:25:52 +0200
Subject: [PATCH] Auto Layouter: Style cleanup (no functional change)
Issue-Ref: 3433
Issue-Url: https://af3-developer.fortiss.org/issues/3433
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../tooling/base/ui/layout/auto/.ratings | 2 +-
.../ui/layout/auto/KielerAutoLayouter.java | 22 +++++++++----------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/.ratings
index 9be7d2bbf..1d5166219 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/.ratings
@@ -2,4 +2,4 @@ AutoLayoutMenu.java ef3b897cc2fd99cf9ce201f03cffea036555e3ac GREEN
DiagramTapeMeasure.java 72454e6fe5225dab11d3d691baad93aab7a171c0 YELLOW
IAutoLayouter.java de1b11d9e202c7e23352ad85684dbf8a3fd17c7d GREEN
IAutoLayouterTapeMeasure.java df186e0ba505e0ecda211b1df76cf12f3245b47e YELLOW
-KielerAutoLayouter.java 9feddf66b525bb4f3768ab67452d0e8e17d399df YELLOW
+KielerAutoLayouter.java 25f82e5f671b358cc6baa1327a522f9cbd762e98 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
index 9feddf66b..25f82e5f6 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
@@ -117,7 +117,6 @@ public class KielerAutoLayouter implements IAutoLayouter {
/** {@inheritDoc} */
@Override
public void performAutoLayout(IHierarchicElement element) {
-
boolean avUpdateEnabled = isUpdateEnabled();
setUpdateEnabled(false);
KNode rootNode = createKIELERGraph(element);
@@ -329,13 +328,21 @@ public class KielerAutoLayouter implements IAutoLayouter {
// Create nodes
for(IHierarchicElement child : element.getContainedElements()) {
-
if(!(child instanceof ILayoutedModelElement)) {
continue;
}
+ // Adjust size of node to number of connectors and label size
KNode kNode = createInitializedNode();
KShapeLayout kNodeLayout = kNode.getData(KShapeLayout.class);
+ int width = tapeMeasure.getElementWidth(child);
+ kNodeLayout.setWidth(truncateSnap2Grid(width, true));
+ int height = tapeMeasure.getElementHeight(child);
+ kNodeLayout.setHeight(truncateSnap2Grid(height, true));
+ kNode.setParent(rootNode);
+ modelElementsToKNodes.put(child, kNode);
+
+ // Setup connectors
EList<IConnector> inputConnectors = new BasicEList<IConnector>();
EList<IConnector> outputConnectors = new BasicEList<IConnector>();
EList<IConnector> undirectedConnectors = new BasicEList<IConnector>();
@@ -349,15 +356,6 @@ public class KielerAutoLayouter implements IAutoLayouter {
undirectedConnectors.add(connector);
}
}
-
- // Adjust size of node to number of connectors and label size
- int width = tapeMeasure.getElementWidth(child);
- kNodeLayout.setWidth(truncateSnap2Grid(width, true));
- int height = tapeMeasure.getElementHeight(child);
- kNodeLayout.setHeight(truncateSnap2Grid(height, true));
- kNode.setParent(rootNode);
- modelElementsToKNodes.put(child, kNode);
-
for(IConnector connector : outputConnectors) {
KPort k = createKPortFromIConnector(connector, kNode, outboundConnectorsToKPorts);
if(undirectedConnectors.contains(connector)) {
@@ -426,7 +424,7 @@ public class KielerAutoLayouter implements IAutoLayouter {
}
/**
- * Converts a given {@link IConnection} into a {@link KPort}, and registers it with the given
+ * Converts a given {@link IConnector} into a {@link KPort}, and registers it with the given
* {@link KNode} (representing the {@link IHierarchicElement} containing the {@link IConnector})
* and a {@link IConnector}-to- {@link KPort} map.
*
--
GitLab