From 3b9f865d031c2a128ae15ae8778aa35c4e661207 Mon Sep 17 00:00:00 2001 From: stu215592 Date: Mon, 23 May 2022 10:38:49 +0200 Subject: [PATCH 01/76] Initial commit, added properties and hacky fix for fonts --- .../klighd/standalone/KlighdStandaloneSetup.java | 7 +++++++ .../cs/kieler/klighd/util/KlighdProperties.java | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java index 5127064ba..8fd83fe2b 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java +++ b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java @@ -15,6 +15,8 @@ import java.awt.Font; import java.awt.GraphicsEnvironment; +import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.util.Collection; @@ -129,6 +131,11 @@ protected void registerFonts() { final GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); for (int i = 0; i < filePaths.length; ++i) { try (InputStream fontStream = this.getClass().getResourceAsStream(filePaths[i])) { + + // TODO Hacky workaround for opening fonts + String path = this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath() + ".." + filePaths[i]; + InputStream temp = new FileInputStream(new File(path)); + ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, fontStream)); } catch (Throwable e) { System.out.println("could not load font file " + filePaths[i]); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 09e56a876..6f28cd282 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -23,9 +23,11 @@ import org.eclipse.elk.core.options.PortSide; import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import de.cau.cs.kieler.klighd.KlighdConstants; +import de.cau.cs.kieler.klighd.kgraph.KGraphData; import de.cau.cs.kieler.klighd.kgraph.KGraphElement; import de.cau.cs.kieler.klighd.kgraph.KNode; import de.cau.cs.kieler.klighd.krendering.KText; @@ -379,4 +381,16 @@ public static boolean isSelectable(final EObject viewElement) { */ public static final IProperty IS_NODE_TITLE = new Property("klighd.isNodeTitle", false); + + /** + * Property determining how a proxy of this node should be rendered. + */ + public static final IProperty> PROXY_RENDERING = + new Property>("de.cau.cs.kieler.klighd.proxyRendering", null); + + /** + * Property determining whether this node should be rendered as a proxy. + */ + public static final IProperty RENDER_NODE_AS_PROXY = + new Property("de.cau.cs.kieler.klighd.renderNodeAsProxy", true); } From 8649530e1efb6cd46255e7d3eda0ae66bbc55d71 Mon Sep 17 00:00:00 2001 From: stu215592 Date: Tue, 31 May 2022 13:01:59 +0200 Subject: [PATCH 02/76] Updated to support the proxy-view API --- .../klighd/lsp/utils/RenderingPreparer.xtend | 39 +++++++++++++++++++ .../kieler/klighd/util/KlighdProperties.java | 14 +++---- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 6924f4c28..aa2f6af34 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -53,6 +53,7 @@ import java.util.Map import static com.google.common.collect.Iterables.filter import static extension de.cau.cs.kieler.klighd.lsp.utils.SprottyProperties.* +import de.cau.cs.kieler.klighd.util.KlighdProperties /** * Utility class to provide some functionality to persist prepare the rendering of a {@link KGraphElement}. @@ -129,6 +130,44 @@ final class RenderingPreparer { prepareRendering(port) } } + + // TODO: Afterwards perform micro-layout (reuse KRenderingPreparer) + // Also for proxy-view.data after element.data loop, potentially union + val proxyRendering = element.getProperty(KlighdProperties.PROXY_RENDERING) + if (element.getProperty(KlighdProperties.RENDER_NODE_AS_PROXY) && proxyRendering !== null) { + for (data : proxyRendering) { + switch(data) { + KRenderingLibrary: { + // The library needs to generate ids for all later KRenderingRefs to refer to, but no own bounds, + // since these are generic renderings. + for (rendering : data.renderings) { + if (rendering instanceof KRendering) { + KRenderingIdGenerator.generateIdsRecursive(rendering) + } + } + } + KRenderingRef: { + // all references to KRenderings need to place a map with the ids of the renderings and their + // sizes and their decoration in this case in the properties of the reference. + var boundsMap = new HashMap + var decorationMap = new HashMap + handleKRendering(element, data.rendering, boundsMap, decorationMap) + // add new Property to contain the boundsMap + data.properties.put(CALCULATED_BOUNDS_MAP, boundsMap) + // and the decorationMap + data.properties.put(CALCULATED_DECORATION_MAP, decorationMap) + // remember the id of the rendering in the reference + data.renderingId = data.rendering.renderingId + + } + KRendering: { + // every rendering needs an ID, generate it here + KRenderingIdGenerator.generateIdsRecursive(data) + handleKRendering(data.eContainer as KGraphElement, data, null, null) + } + } + } + } } /** diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 6f28cd282..590ee87b6 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -17,13 +17,13 @@ package de.cau.cs.kieler.klighd.util; import java.awt.Color; +import java.util.List; import org.eclipse.elk.core.math.KVector; import org.eclipse.elk.core.math.Spacing; import org.eclipse.elk.core.options.PortSide; import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; -import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import de.cau.cs.kieler.klighd.KlighdConstants; @@ -382,15 +382,15 @@ public static boolean isSelectable(final EObject viewElement) { public static final IProperty IS_NODE_TITLE = new Property("klighd.isNodeTitle", false); - /** - * Property determining how a proxy of this node should be rendered. - */ - public static final IProperty> PROXY_RENDERING = - new Property>("de.cau.cs.kieler.klighd.proxyRendering", null); - /** * Property determining whether this node should be rendered as a proxy. */ public static final IProperty RENDER_NODE_AS_PROXY = new Property("de.cau.cs.kieler.klighd.renderNodeAsProxy", true); + + /** + * Property determining how a proxy of this node should be rendered. + */ + public static final IProperty> PROXY_RENDERING = + new Property>("de.cau.cs.kieler.klighd.proxyRendering", null); } From 675a8d18ba1c169d692b254ff21a76bde5c62f88 Mon Sep 17 00:00:00 2001 From: stu215592 Date: Tue, 31 May 2022 13:38:04 +0200 Subject: [PATCH 03/76] Added a type check --- .../cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index aa2f6af34..31eaa568e 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -131,8 +131,7 @@ final class RenderingPreparer { } } - // TODO: Afterwards perform micro-layout (reuse KRenderingPreparer) - // Also for proxy-view.data after element.data loop, potentially union + // Also calculate the sizes of all proxy-renderings val proxyRendering = element.getProperty(KlighdProperties.PROXY_RENDERING) if (element.getProperty(KlighdProperties.RENDER_NODE_AS_PROXY) && proxyRendering !== null) { for (data : proxyRendering) { @@ -163,7 +162,9 @@ final class RenderingPreparer { KRendering: { // every rendering needs an ID, generate it here KRenderingIdGenerator.generateIdsRecursive(data) - handleKRendering(data.eContainer as KGraphElement, data, null, null) + if (data.eContainer instanceof KGraphElement) { + handleKRendering(data.eContainer as KGraphElement, data, null, null) + } } } } From 4a781d022eeb3f39f3cb0e1ed31fe974e9bf519b Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Thu, 23 Jun 2022 16:47:06 +0200 Subject: [PATCH 04/76] add basic semantic structure to create semantic filters --- .../META-INF/MANIFEST.MF | 1 + .../cau/cs/kieler/klighd/KlighdOptions.java | 35 +++++++++++++++++ .../klighd/filtering/AndConnective.java | 31 +++++++++++++++ .../klighd/filtering/BinaryConnective.java | 33 ++++++++++++++++ .../klighd/filtering/NegationConnective.java | 30 ++++++++++++++ .../kieler/klighd/filtering/OrConnective.java | 31 +++++++++++++++ .../klighd/filtering/SemanticFilterRule.java | 25 ++++++++++++ .../klighd/filtering/SemanticFilterTag.java | 39 +++++++++++++++++++ .../klighd/filtering/UnaryConnective.java | 32 +++++++++++++++ 9 files changed, 257 insertions(+) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index 63165adb9..273c125bc 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -21,6 +21,7 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin Export-Package: de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.actions, + de.cau.cs.kieler.klighd.filtering, de.cau.cs.kieler.klighd.internal;x-friends:="de.cau.cs.kieler.klighd.piccolo,de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.lsp", de.cau.cs.kieler.klighd.internal.macrolayout;x-friends:="de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.piccolo", de.cau.cs.kieler.klighd.internal.preferences;x-internal:=true, diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index fead2f59f..286bbeeeb 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -16,7 +16,9 @@ */ package de.cau.cs.kieler.klighd; +import java.util.Collection; import java.util.EnumSet; +import java.util.List; import org.eclipse.elk.core.data.ILayoutMetaDataProvider; import org.eclipse.elk.core.data.LayoutOptionData; @@ -24,6 +26,8 @@ import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.labels.management.LabelManagementResult; import de.cau.cs.kieler.klighd.util.ExpansionAwareLayoutOption; @@ -67,6 +71,18 @@ public class KlighdOptions implements ILayoutMetaDataProvider { public static final IProperty LABELS_TEXT_OVERRIDE = new Property("de.cau.cs.kieler.klighd.labels.textOverride", LABELS_TEXT_OVERRIDE_DEFAULT, null, null); + + public static final List SEMANTIC_FILTER_TAGS_DEFAULT = null; + + public static final IProperty> SEMANTIC_FILTER_TAGS = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.tags", + SEMANTIC_FILTER_TAGS_DEFAULT, null, null); + + public static final List SEMANTIC_FILTER_RULES_DEFAULT = null; + + public static final IProperty> SEMANTIC_FILTER_RULES = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.rules", + SEMANTIC_FILTER_RULES_DEFAULT, null, null); public void apply(final org.eclipse.elk.core.data.ILayoutMetaDataProvider.Registry registry) { registry.register(new LayoutOptionData.Builder() @@ -113,5 +129,24 @@ public void apply(final org.eclipse.elk.core.data.ILayoutMetaDataProvider.Regist .defaultValue(LABELS_TEXT_OVERRIDE_DEFAULT).type(LayoutOptionData.Type.STRING) .optionClass(String.class).targets(EnumSet.of(LayoutOptionData.Target.LABELS)) .visibility(LayoutOptionData.Visibility.HIDDEN).create()); + + // TODO: check if these are sensible settings (all below options) + registry.register(new LayoutOptionData.Builder() + .id("de.cau.cs.kieler.klighd.semanticFilter.tags").group("semanticFilter") + .name("Semantic Filter Tags") + .description("TODO") + .defaultValue(SEMANTIC_FILTER_TAGS_DEFAULT).type(LayoutOptionData.Type.OBJECT) + .optionClass(Collection.class) + .targets(EnumSet.of(LayoutOptionData.Target.NODES)) // TODO: also other element types + .visibility(LayoutOptionData.Visibility.HIDDEN).create()); + + registry.register(new LayoutOptionData.Builder() + .id("de.cau.cs.kieler.klighd.semanticFilter.rules").group("semanticFilter") + .name("Semantic Filter Rules") + .description("TODO") + .defaultValue(SEMANTIC_FILTER_RULES_DEFAULT).type(LayoutOptionData.Type.OBJECT) + .optionClass(Collection.class) + .targets(EnumSet.of(LayoutOptionData.Target.PARENTS)) // TODO: really only want this on top level of graph + .visibility(LayoutOptionData.Visibility.HIDDEN).create()); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java new file mode 100644 index 000000000..6df3e8f91 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -0,0 +1,31 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public class AndConnective extends BinaryConnective { + + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this.name = "AND"; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java new file mode 100644 index 000000000..6f173ef17 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -0,0 +1,33 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public abstract class BinaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule leftOperand; + protected SemanticFilterRule rightOperand; + + public String getString() { + return "(" + leftOperand + " name " + rightOperand + ")"; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java new file mode 100644 index 000000000..64c7f819a --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -0,0 +1,30 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public class NegationConnective extends UnaryConnective { + + public NegationConnective(SemanticFilterRule operand) { + this.name = "NOT"; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java new file mode 100644 index 000000000..cfd51b235 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -0,0 +1,31 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public class OrConnective extends BinaryConnective { + + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this.name = "OR"; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java new file mode 100644 index 000000000..4a7d07858 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -0,0 +1,25 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public abstract class SemanticFilterRule { + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java new file mode 100644 index 000000000..bc6571348 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -0,0 +1,39 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public class SemanticFilterTag extends SemanticFilterRule { + + private String tag; + + public SemanticFilterTag(String tag) { + this.tag = tag; + } + + public String getTag() { + return this.tag; + } + + public String toString() { + return this.tag; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java new file mode 100644 index 000000000..084e8f4b8 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -0,0 +1,32 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public abstract class UnaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule operand; + + public String toString() { + return "(" + name + " " + this.operand + ")"; + } + +} From 771e38afec21b4655903a5924d00355f53dd7c1c Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 Jun 2022 16:03:54 +0200 Subject: [PATCH 05/76] add different concrete building blocks for filters --- .../cs/kieler/klighd/filtering/AndConnective.java | 7 +++++++ .../kieler/klighd/filtering/BinaryConnective.java | 8 ++++++++ .../klighd/filtering/NegationConnective.java | 6 ++++++ .../cs/kieler/klighd/filtering/OrConnective.java | 7 +++++++ .../klighd/filtering/SemanticFilterRule.java | 14 ++++++++++++++ .../kieler/klighd/filtering/SemanticFilterTag.java | 5 +++++ .../kieler/klighd/filtering/UnaryConnective.java | 8 ++++++++ 7 files changed, 55 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java index 6df3e8f91..4a6ada66b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -27,5 +27,12 @@ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOpe this.leftOperand = leftOperand; this.rightOperand = rightOperand; } + + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + super(ruleName); + this.name = "AND"; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java index 6f173ef17..70e841c13 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -26,6 +26,14 @@ public abstract class BinaryConnective extends SemanticFilterRule { protected SemanticFilterRule leftOperand; protected SemanticFilterRule rightOperand; + public BinaryConnective() { + + } + + public BinaryConnective(String ruleName) { + super(ruleName); + } + public String getString() { return "(" + leftOperand + " name " + rightOperand + ")"; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java index 64c7f819a..1651c4c4f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -26,5 +26,11 @@ public NegationConnective(SemanticFilterRule operand) { this.name = "NOT"; this.operand = operand; } + + public NegationConnective(SemanticFilterRule operand, String ruleName) { + super(ruleName); + this.name = "NOT"; + this.operand = operand; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java index cfd51b235..6c1d8c765 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -27,5 +27,12 @@ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOper this.leftOperand = leftOperand; this.rightOperand = rightOperand; } + + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + super(ruleName); + this.name = "OR"; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java index 4a7d07858..171e08296 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -21,5 +21,19 @@ * */ public abstract class SemanticFilterRule { + + private String ruleName; + + public SemanticFilterRule() { + + } + + public SemanticFilterRule(String ruleName) { + this.ruleName = ruleName; + } + + public String getRuleName() { + return this.ruleName; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java index bc6571348..25e749094 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -28,6 +28,11 @@ public SemanticFilterTag(String tag) { this.tag = tag; } + public SemanticFilterTag(String tag, String ruleName) { + super(ruleName); + this.tag = tag; + } + public String getTag() { return this.tag; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java index 084e8f4b8..88e5bdcb2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -25,6 +25,14 @@ public abstract class UnaryConnective extends SemanticFilterRule { protected String name; protected SemanticFilterRule operand; + public UnaryConnective() { + + } + + public UnaryConnective(String ruleName) { + super(ruleName); + } + public String toString() { return "(" + name + " " + this.operand + ")"; } From 74c9fc2b196793b57d7a376653a8ff9d6d48384a Mon Sep 17 00:00:00 2001 From: fight4day Date: Sat, 25 Jun 2022 10:43:35 +0200 Subject: [PATCH 06/76] Added a property for hierarchical off-screen depth --- .../klighd/lsp/utils/RenderingPreparer.xtend | 4 ++-- .../kieler/klighd/util/KlighdProperties.java | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 31eaa568e..ed87f840c 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -132,8 +132,8 @@ final class RenderingPreparer { } // Also calculate the sizes of all proxy-renderings - val proxyRendering = element.getProperty(KlighdProperties.PROXY_RENDERING) - if (element.getProperty(KlighdProperties.RENDER_NODE_AS_PROXY) && proxyRendering !== null) { + val proxyRendering = element.getProperty(KlighdProperties.PROXY_VIEW_PROXY_RENDERING) + if (element.getProperty(KlighdProperties.PROXY_VIEW_RENDER_NODE_AS_PROXY) && proxyRendering !== null) { for (data : proxyRendering) { switch(data) { KRenderingLibrary: { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 590ee87b6..c8b8687d1 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -385,12 +385,28 @@ public static boolean isSelectable(final EObject viewElement) { /** * Property determining whether this node should be rendered as a proxy. */ - public static final IProperty RENDER_NODE_AS_PROXY = - new Property("de.cau.cs.kieler.klighd.renderNodeAsProxy", true); + public static final IProperty PROXY_VIEW_RENDER_NODE_AS_PROXY = + new Property("de.cau.cs.kieler.klighd.proxy-view.renderNodeAsProxy", true); /** * Property determining how a proxy of this node should be rendered. */ - public static final IProperty> PROXY_RENDERING = - new Property>("de.cau.cs.kieler.klighd.proxyRendering", null); + public static final IProperty> PROXY_VIEW_PROXY_RENDERING = + new Property>("de.cau.cs.kieler.klighd.proxy-view.proxyRendering", null); + + /** + * Property determining depth of going into hierarchical off-screen nodes. + * Only relevant for the root.
+ * Choose {@code 0} for default, showing only the outermost node as a proxy.
+ * Choose a value {@code x>0} to show proxies up to x layers deep inside a hierarchical node.
+ * Choose a value {@code x<0} to always show proxies for all layers. + */ + public static final IProperty PROXY_VIEW_HIERARCHICAL_OFF_SCREEN_DEPTH = + new Property("de.cau.cs.kieler.klighd.proxy-view.hierarchicalOffScreenDepth", 0); + + /** + * Property determining the semantic type of a node. + */ + public static final IProperty NODE_TYPE = + new Property("de.cau.cs.kieler.klighd.nodeType", null); } From 446ad4427a03d743c62d248fd45f26d85211ca81 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 27 Jun 2022 08:46:52 +0200 Subject: [PATCH 07/76] add documentation for semantic filters --- .../cau/cs/kieler/klighd/KlighdOptions.java | 13 ++++++----- .../klighd/filtering/AndConnective.java | 13 +++++++++++ .../klighd/filtering/BinaryConnective.java | 11 ++++++++++ .../klighd/filtering/NegationConnective.java | 11 ++++++++++ .../kieler/klighd/filtering/OrConnective.java | 13 +++++++++++ .../klighd/filtering/SemanticFilterRule.java | 14 ++++++++++++ .../klighd/filtering/SemanticFilterTag.java | 22 +++++++++++++++++++ .../klighd/filtering/UnaryConnective.java | 12 ++++++++++ 8 files changed, 104 insertions(+), 5 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index 286bbeeeb..29329cd2b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -130,23 +130,26 @@ public void apply(final org.eclipse.elk.core.data.ILayoutMetaDataProvider.Regist .optionClass(String.class).targets(EnumSet.of(LayoutOptionData.Target.LABELS)) .visibility(LayoutOptionData.Visibility.HIDDEN).create()); - // TODO: check if these are sensible settings (all below options) registry.register(new LayoutOptionData.Builder() .id("de.cau.cs.kieler.klighd.semanticFilter.tags").group("semanticFilter") .name("Semantic Filter Tags") - .description("TODO") + .description("Tags to provide semantic context in a diagram. Used by semantic filter rules to include" + + " or exclude an element.") .defaultValue(SEMANTIC_FILTER_TAGS_DEFAULT).type(LayoutOptionData.Type.OBJECT) .optionClass(Collection.class) - .targets(EnumSet.of(LayoutOptionData.Target.NODES)) // TODO: also other element types + .targets(EnumSet.of(LayoutOptionData.Target.NODES, LayoutOptionData.Target.EDGES, + LayoutOptionData.Target.LABELS, LayoutOptionData.Target.PORTS)) .visibility(LayoutOptionData.Visibility.HIDDEN).create()); registry.register(new LayoutOptionData.Builder() .id("de.cau.cs.kieler.klighd.semanticFilter.rules").group("semanticFilter") .name("Semantic Filter Rules") - .description("TODO") + .description("Semantic filter rules that can be constructed through the combination of other semantic " + + "filter rules and logical connectives. A semantic filter tag T is used as an atomic rule with " + + "the semantics 'graph element has tag T'.") .defaultValue(SEMANTIC_FILTER_RULES_DEFAULT).type(LayoutOptionData.Type.OBJECT) .optionClass(Collection.class) - .targets(EnumSet.of(LayoutOptionData.Target.PARENTS)) // TODO: really only want this on top level of graph + .targets(EnumSet.of(LayoutOptionData.Target.PARENTS)) .visibility(LayoutOptionData.Visibility.HIDDEN).create()); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java index 4a6ada66b..0db0c30fe 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -17,17 +17,30 @@ package de.cau.cs.kieler.klighd.filtering; /** + * An AND Connective takes two rules R1 and R2 and evaluates to true iff both rules are true. + * * @author mka * */ public class AndConnective extends BinaryConnective { + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { this.name = "AND"; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { super(ruleName); this.name = "AND"; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java index 70e841c13..2ae1503c1 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** + * A binary connective C takes two filter rules R1 and R2 as operands and creates the new rule R1 C R2. * @author mka * */ @@ -26,14 +27,24 @@ public abstract class BinaryConnective extends SemanticFilterRule { protected SemanticFilterRule leftOperand; protected SemanticFilterRule rightOperand; + /** + * {@inheritDoc} + */ public BinaryConnective() { } + /** + * {@inheritDoc} + */ public BinaryConnective(String ruleName) { super(ruleName); } + /** + * Returns a string representation of the rule of the form '(R1 C R2)'. + * @return the rule string + */ public String getString() { return "(" + leftOperand + " name " + rightOperand + ")"; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java index 1651c4c4f..c58278b03 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -17,16 +17,27 @@ package de.cau.cs.kieler.klighd.filtering; /** + * A NOT Connective takes a rule R and evaluates to true iff R evaluates to false. + * * @author mka * */ public class NegationConnective extends UnaryConnective { + /** + * Constructor for unnamed rule. + * @param operand the operand + */ public NegationConnective(SemanticFilterRule operand) { this.name = "NOT"; this.operand = operand; } + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ public NegationConnective(SemanticFilterRule operand, String ruleName) { super(ruleName); this.name = "NOT"; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java index 6c1d8c765..d1728cef4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -17,17 +17,30 @@ package de.cau.cs.kieler.klighd.filtering; /** + * An OR Connective takes two rules R1 and R2 and evaluates to true iff R1 or R2 evaluates to true. + * * @author mka * */ public class OrConnective extends BinaryConnective { + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { this.name = "OR"; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { super(ruleName); this.name = "OR"; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java index 171e08296..83b9ee4aa 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -17,6 +17,9 @@ package de.cau.cs.kieler.klighd.filtering; /** + * Semantic filter rules describe a filter that can be evaluated to include only elements tagged with certain tags. + * The rules are constructed through the combination of filter rules with logical connectives. + * * @author mka * */ @@ -24,14 +27,25 @@ public abstract class SemanticFilterRule { private String ruleName; + /** + * Basic constructor + */ public SemanticFilterRule() { } + /** + * Constructor that takes a rule name. The rule name is used to identify rules and distinguish them from one another. + * @param ruleName + */ public SemanticFilterRule(String ruleName) { this.ruleName = ruleName; } + /** + * Returns the rule name. + * @return the rule name + */ public String getRuleName() { return this.ruleName; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java index 25e749094..e9f226f44 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -17,6 +17,10 @@ package de.cau.cs.kieler.klighd.filtering; /** + * Semantic filter tags serve both as tags on graph elements to provide semantic meaning in a diagram that can not + * be conveyed otherwise and as an atomic filter rule that can be combined with other rules to construct more complex + * rules. + * * @author mka * */ @@ -24,19 +28,37 @@ public class SemanticFilterTag extends SemanticFilterRule { private String tag; + /** + * Constructor for tag. + * @param tag string identifier + */ public SemanticFilterTag(String tag) { this.tag = tag; } + /** + * Constructor for tag as a semantic filter rule. Here an additional rule name is required as this is later used + * to differentiate between multiple rules. + * @param tag string identifier of the tag the rule applies to + * @param ruleName string identifier of the rule itself, can be anything + */ public SemanticFilterTag(String tag, String ruleName) { super(ruleName); this.tag = tag; } + /** + * Returns the tag. + * @return the tag + */ public String getTag() { return this.tag; } + /** + * Returns a string representation of the rule/tag. + * @return the rule string + */ public String toString() { return this.tag; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java index 88e5bdcb2..4ea831ef1 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -17,6 +17,8 @@ package de.cau.cs.kieler.klighd.filtering; /** + * An unary connective C takes a single filter rule R as an operand and creates the new rule C R. + * * @author mka * */ @@ -25,14 +27,24 @@ public abstract class UnaryConnective extends SemanticFilterRule { protected String name; protected SemanticFilterRule operand; + /** + * {@inheritDoc} + */ public UnaryConnective() { } + /** + * {@inheritDoc} + */ public UnaryConnective(String ruleName) { super(ruleName); } + /** + * Returns a string representation of the rule in the form '(C R)'. + * @return the rule string + */ public String toString() { return "(" + name + " " + this.operand + ")"; } From 51dc9264d0188ff9c8afeeb7b3cf8d5ad2944a74 Mon Sep 17 00:00:00 2001 From: fight4day Date: Thu, 30 Jun 2022 17:31:55 +0200 Subject: [PATCH 08/76] Preparation for semantic filtering --- .../src/de/cau/cs/kieler/klighd/util/KlighdProperties.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index c8b8687d1..1e6829e54 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -403,10 +403,4 @@ public static boolean isSelectable(final EObject viewElement) { */ public static final IProperty PROXY_VIEW_HIERARCHICAL_OFF_SCREEN_DEPTH = new Property("de.cau.cs.kieler.klighd.proxy-view.hierarchicalOffScreenDepth", 0); - - /** - * Property determining the semantic type of a node. - */ - public static final IProperty NODE_TYPE = - new Property("de.cau.cs.kieler.klighd.nodeType", null); } From a37ba4c3c4dc240534b4c4a8532dcb5be7bf7e47 Mon Sep 17 00:00:00 2001 From: fight4day Date: Fri, 1 Jul 2022 21:45:52 +0200 Subject: [PATCH 09/76] Added numeric operators to semantic filters. Should mostly be working --- .../klighd/filtering/AndConnective.java | 9 ++- .../klighd/filtering/BinaryConnective.java | 4 +- .../filtering/GreaterThanConnective.java | 49 +++++++++++++++ .../klighd/filtering/IfThenConnective.java | 54 +++++++++++++++++ .../filtering/IfThenElseConnective.java | 60 +++++++++++++++++++ .../klighd/filtering/LessThanConnective.java | 49 +++++++++++++++ .../filtering/LogicEqualConnective.java | 54 +++++++++++++++++ .../klighd/filtering/NegationConnective.java | 9 ++- .../filtering/NumericEqualConnective.java | 49 +++++++++++++++ .../kieler/klighd/filtering/OrConnective.java | 9 ++- .../klighd/filtering/SemanticFilterTag.java | 34 ++++++++++- .../klighd/filtering/TernaryConnective.java | 53 ++++++++++++++++ .../klighd/filtering/UnaryConnective.java | 6 +- 13 files changed, 424 insertions(+), 15 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java index 0db0c30fe..4b8a8df4d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -17,12 +17,15 @@ package de.cau.cs.kieler.klighd.filtering; /** - * An AND Connective takes two rules R1 and R2 and evaluates to true iff both rules are true. + * An And Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 and R2 evaluate to true. * * @author mka * */ public class AndConnective extends BinaryConnective { + protected static final String NAME = "AND"; /** * Constructor for unnamed rule. @@ -30,7 +33,7 @@ public class AndConnective extends BinaryConnective { * @param rightOperand right operand */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = "AND"; + this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } @@ -43,7 +46,7 @@ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOpe */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { super(ruleName); - this.name = "AND"; + this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java index 2ae1503c1..439084cd4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -42,11 +42,11 @@ public BinaryConnective(String ruleName) { } /** - * Returns a string representation of the rule of the form '(R1 C R2)'. + * Returns a string representation of the rule of the form 'C(R1, R2)'. * @return the rule string */ public String getString() { - return "(" + leftOperand + " name " + rightOperand + ")"; + return name + "(" + leftOperand + ", " + rightOperand + ")"; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java new file mode 100644 index 000000000..ec2fe37fa --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -0,0 +1,49 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A GreaterThan Connective takes one rule R and evaluates to true + * iff + * R evaluates to true and R.num > correspondingTag.num. + * @author tik + * + */ +public class GreaterThanConnective extends UnaryConnective { + protected static final String NAME = "GREATERTHAN"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public GreaterThanConnective(SemanticFilterTag operand) { + this.name = NAME; + this.operand = operand; + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public GreaterThanConnective(SemanticFilterTag operand, String ruleName) { + super(ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java new file mode 100644 index 000000000..e950e36c2 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java @@ -0,0 +1,54 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An IfThen Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 evaluates to false or R2 evaluates to true. + * + * @author tik + * + */ +public class IfThenConnective extends BinaryConnective { + protected static final String NAME = "IFTHEN"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + super(ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java new file mode 100644 index 000000000..19a30b30b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java @@ -0,0 +1,60 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An IfThenElse Connective takes three rules R1, R2 and R3 and evaluates to true + * iff + * R1 and R2 evaluate to true or R1 evaluates to false and R3 evaluates to true. + * + * @author tik + * + */ +public class IfThenElseConnective extends TernaryConnective { + protected static final String NAME = "IFTHENELSE"; + + /** + * Constructor for unnamed rule. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand) { + this.name = NAME; + this.firstOperand = firstOperand; + this.secondOperand = secondOperand; + this.thirdOperand = thirdOperand; + } + + /** + * Constructor for named rule. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param ruleName rule name + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, String ruleName) { + super(ruleName); + this.name = NAME; + this.firstOperand = firstOperand; + this.secondOperand = secondOperand; + this.thirdOperand = thirdOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java new file mode 100644 index 000000000..9b38690fe --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -0,0 +1,49 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A LessThan Connective takes one rule R and evaluates to true + * iff + * R evaluates to true and R.num < correspondingTag.num. + * @author tik + * + */ +public class LessThanConnective extends UnaryConnective { + protected static final String NAME = "LESSTHAN"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public LessThanConnective(SemanticFilterTag operand) { + this.name = NAME; + this.operand = operand; + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public LessThanConnective(SemanticFilterTag operand, String ruleName) { + super(ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java new file mode 100644 index 000000000..0ac4999e5 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java @@ -0,0 +1,54 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An Equal Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 and R2 evaluate to true or R1 and R2 evaluate to false. + * + * @author tik + * + */ +public class LogicEqualConnective extends BinaryConnective { + protected static final String NAME = "LOGICEQUAL"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + super(ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java index c58278b03..1fd88c79d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -17,19 +17,22 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A NOT Connective takes a rule R and evaluates to true iff R evaluates to false. + * A Not Connective takes a rule R and evaluates to true + * iff + * R evaluates to false. * * @author mka * */ public class NegationConnective extends UnaryConnective { + protected static final String NAME = "NOT"; /** * Constructor for unnamed rule. * @param operand the operand */ public NegationConnective(SemanticFilterRule operand) { - this.name = "NOT"; + this.name = NAME; this.operand = operand; } @@ -40,7 +43,7 @@ public NegationConnective(SemanticFilterRule operand) { */ public NegationConnective(SemanticFilterRule operand, String ruleName) { super(ruleName); - this.name = "NOT"; + this.name = NAME; this.operand = operand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java new file mode 100644 index 000000000..8fb9e8008 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -0,0 +1,49 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A NumericEqual Connective takes one rule R and evaluates to true + * iff + * R evaluates to true and R.num === correspondingTag.num. + * @author tik + * + */ +public class NumericEqualConnective extends UnaryConnective { + protected static final String NAME = "NUMERICEQUAL"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public NumericEqualConnective(SemanticFilterTag operand) { + this.name = NAME; + this.operand = operand; + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public NumericEqualConnective(SemanticFilterTag operand, String ruleName) { + super(ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java index d1728cef4..658cfd733 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -17,12 +17,15 @@ package de.cau.cs.kieler.klighd.filtering; /** - * An OR Connective takes two rules R1 and R2 and evaluates to true iff R1 or R2 evaluates to true. + * An Or Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 or R2 evaluate to true. * * @author mka * */ public class OrConnective extends BinaryConnective { + protected static final String NAME = "OR"; /** * Constructor for unnamed rule. @@ -30,7 +33,7 @@ public class OrConnective extends BinaryConnective { * @param rightOperand right operand */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = "OR"; + this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } @@ -43,7 +46,7 @@ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOper */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { super(ruleName); - this.name = "OR"; + this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java index e9f226f44..2e54746e3 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -27,6 +27,7 @@ public class SemanticFilterTag extends SemanticFilterRule { private String tag; + private Double num = 0.0; /** * Constructor for tag. @@ -36,6 +37,16 @@ public SemanticFilterTag(String tag) { this.tag = tag; } + /** + * Constructor for tag. + * @param tag string identifier + * @param num the number + */ + public SemanticFilterTag(String tag, Double num) { + this.tag = tag; + this.num = num; + } + /** * Constructor for tag as a semantic filter rule. Here an additional rule name is required as this is later used * to differentiate between multiple rules. @@ -47,6 +58,19 @@ public SemanticFilterTag(String tag, String ruleName) { this.tag = tag; } + /** + * Constructor for tag as a semantic filter rule. Here an additional rule name is required as this is later used + * to differentiate between multiple rules. + * @param tag string identifier of the tag the rule applies to + * @param num the number + * @param ruleName string identifier of the rule itself, can be anything + */ + public SemanticFilterTag(String tag, Double num, String ruleName) { + super(ruleName); + this.tag = tag; + this.num = num; + } + /** * Returns the tag. * @return the tag @@ -55,12 +79,20 @@ public String getTag() { return this.tag; } + /** + * Returns the num. + * @return the num + */ + public Double getNum() { + return this.num; + } + /** * Returns a string representation of the rule/tag. * @return the rule string */ public String toString() { - return this.tag; + return "(tag=" + this.tag + ", num=" + this.num + ")"; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java new file mode 100644 index 000000000..37113057c --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java @@ -0,0 +1,53 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A ternary connective C takes three filter rules R1, R2 and R3 as operands and creates the new rule C R1 R2 R3. + * + * @author tik + * + */ +public abstract class TernaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule firstOperand; + protected SemanticFilterRule secondOperand; + protected SemanticFilterRule thirdOperand; + + /** + * {@inheritDoc} + */ + public TernaryConnective() { + + } + + /** + * {@inheritDoc} + */ + public TernaryConnective(String ruleName) { + super(ruleName); + } + + /** + * Returns a string representation of the rule of the form 'C(R1, R2, R3)'. + * @return the rule string + */ + public String getString() { + return name + "(" + firstOperand + ", " + secondOperand + ", " + thirdOperand + ")"; + } +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java index 4ea831ef1..23ef90fd2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -17,7 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** - * An unary connective C takes a single filter rule R as an operand and creates the new rule C R. + * An unary connective C takes a single filter rule R as an operand and creates the new rule C(R). * * @author mka * @@ -42,11 +42,11 @@ public UnaryConnective(String ruleName) { } /** - * Returns a string representation of the rule in the form '(C R)'. + * Returns a string representation of the rule in the form 'C(R)'. * @return the rule string */ public String toString() { - return "(" + name + " " + this.operand + ")"; + return name + "(" + this.operand + ")"; } } From 7485a9912a078f80a5f3220b4eb430eca35e3d2e Mon Sep 17 00:00:00 2001 From: fight4day Date: Sat, 2 Jul 2022 17:21:43 +0200 Subject: [PATCH 10/76] Cleared up javadocs --- .../cau/cs/kieler/klighd/filtering/GreaterThanConnective.java | 2 +- .../de/cau/cs/kieler/klighd/filtering/LessThanConnective.java | 2 +- .../cau/cs/kieler/klighd/filtering/NumericEqualConnective.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java index ec2fe37fa..f4cfd572f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -19,7 +19,7 @@ /** * A GreaterThan Connective takes one rule R and evaluates to true * iff - * R evaluates to true and R.num > correspondingTag.num. + * R.num > correspondingTag.num. * @author tik * */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 9b38690fe..3fe50c7b0 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -19,7 +19,7 @@ /** * A LessThan Connective takes one rule R and evaluates to true * iff - * R evaluates to true and R.num < correspondingTag.num. + * R.num < correspondingTag.num. * @author tik * */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java index 8fb9e8008..0faae46a7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -19,7 +19,7 @@ /** * A NumericEqual Connective takes one rule R and evaluates to true * iff - * R evaluates to true and R.num === correspondingTag.num. + * R.num == correspondingTag.num. * @author tik * */ From 63d55f598bc31413a2748cba1d903687c117e8dc Mon Sep 17 00:00:00 2001 From: fight4day Date: Mon, 4 Jul 2022 12:54:15 +0200 Subject: [PATCH 11/76] Added some util methods - big operators, constants, etc --- .../klighd/filtering/ConnectiveUtil.java | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java new file mode 100644 index 000000000..d50c5b6a9 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java @@ -0,0 +1,126 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Util for easily getting some rules. + * + * @author tik + * + */ +public abstract class ConnectiveUtil { + /** An empty tag used to define constants. */ + private static final SemanticFilterTag EMPTY = new SemanticFilterTag(""); + /** A rule that is always evaluated to false. */ + public static final SemanticFilterRule FALSE = + new AndConnective(EMPTY, new NegationConnective(EMPTY)); + /** A rule that is always evaluated to true. */ + public static final SemanticFilterRule TRUE = + new OrConnective(EMPTY, new NegationConnective(EMPTY)); + + /** + * Constructs an unnamed rule with all operands connected via OR. If no operands are given, this + * is always false. + * + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigOrConnective(SemanticFilterRule... operands) { + return getBigOrConnective(null, operands); + } + + /** + * Constructs a named rule with all operands connected via OR. If no operands are given, this is + * always false. + * + * @param ruleName + * The rule name. + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigOrConnective(String ruleName, + SemanticFilterRule... operands) { + if (operands.length <= 0) { + // No rules, automatically evaluate to false + return FALSE; + } else if (operands.length <= 1) { + // Just one rule, true iff rule is true + // Add ruleName instead of just using first operand twice to avoid double evaluation + return addRuleName(ruleName, operands[0]); + } + OrConnective bigOr = new OrConnective(operands[0], operands[1], ruleName); + for (int i = 2; i < operands.length; i++) { + bigOr.rightOperand = new OrConnective(bigOr.rightOperand, operands[i]); + } + return bigOr; + } + + /** + * Constructs an unnamed rule with all operands connected via AND. If no operands are given, + * this is always false. + * + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigAndConnective(SemanticFilterRule... operands) { + return getBigAndConnective(null, operands); + } + + /** + * Constructs a named rule with all operands connected via AND. If no operands are given, this + * is always false. + * + * @param ruleName + * The rule name. + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigAndConnective(String ruleName, + SemanticFilterRule... operands) { + if (operands.length <= 0) { + // No rules, automatically evaluate to false + return FALSE; + } else if (operands.length <= 1) { + // Just one rule, true iff rule is true + // Add ruleName instead of just using first operand twice to avoid double evaluation + return addRuleName(ruleName, operands[0]); + } + // Use first operand twice in case of just one rule, e.g. true iff rule is true + AndConnective bigAnd = new AndConnective(operands[0], operands[1], ruleName); + for (int i = 2; i < operands.length; i++) { + bigAnd.rightOperand = new AndConnective(bigAnd.rightOperand, operands[i]); + } + return bigAnd; + } + + /** + * Constructs a named rule from a given potentially unnamed rule. + * + * @param ruleName + * The rule name. + * @param rule + * The rule. + * @return A named rule. + */ + public static SemanticFilterRule addRuleName(String ruleName, SemanticFilterRule rule) { + return new NegationConnective(new NegationConnective(rule), ruleName); + } +} From 2f736806e71e1a5afa5903ea77bd30e7868c866a Mon Sep 17 00:00:00 2001 From: fight4day Date: Mon, 4 Jul 2022 12:55:32 +0200 Subject: [PATCH 12/76] Rename --- .../{ConnectiveUtil.java => SemanticFilterRuleUtil.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/{ConnectiveUtil.java => SemanticFilterRuleUtil.java} (98%) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java similarity index 98% rename from plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java rename to plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java index d50c5b6a9..258c4a6a7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/ConnectiveUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java @@ -22,7 +22,7 @@ * @author tik * */ -public abstract class ConnectiveUtil { +public abstract class SemanticFilterRuleUtil { /** An empty tag used to define constants. */ private static final SemanticFilterTag EMPTY = new SemanticFilterTag(""); /** A rule that is always evaluated to false. */ From e6b3b682ad8eb383f085f25d825a50c1314076dd Mon Sep 17 00:00:00 2001 From: fight4day Date: Wed, 6 Jul 2022 09:28:13 +0200 Subject: [PATCH 13/76] mka code review first change --- .../cau/cs/kieler/klighd/KlighdOptions.java | 34 ------------------- .../kieler/klighd/util/KlighdProperties.java | 14 ++++++++ 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index 29329cd2b..9cbb1766e 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -71,18 +71,6 @@ public class KlighdOptions implements ILayoutMetaDataProvider { public static final IProperty LABELS_TEXT_OVERRIDE = new Property("de.cau.cs.kieler.klighd.labels.textOverride", LABELS_TEXT_OVERRIDE_DEFAULT, null, null); - - public static final List SEMANTIC_FILTER_TAGS_DEFAULT = null; - - public static final IProperty> SEMANTIC_FILTER_TAGS = - new Property>("de.cau.cs.kieler.klighd.semanticFilter.tags", - SEMANTIC_FILTER_TAGS_DEFAULT, null, null); - - public static final List SEMANTIC_FILTER_RULES_DEFAULT = null; - - public static final IProperty> SEMANTIC_FILTER_RULES = - new Property>("de.cau.cs.kieler.klighd.semanticFilter.rules", - SEMANTIC_FILTER_RULES_DEFAULT, null, null); public void apply(final org.eclipse.elk.core.data.ILayoutMetaDataProvider.Registry registry) { registry.register(new LayoutOptionData.Builder() @@ -129,27 +117,5 @@ public void apply(final org.eclipse.elk.core.data.ILayoutMetaDataProvider.Regist .defaultValue(LABELS_TEXT_OVERRIDE_DEFAULT).type(LayoutOptionData.Type.STRING) .optionClass(String.class).targets(EnumSet.of(LayoutOptionData.Target.LABELS)) .visibility(LayoutOptionData.Visibility.HIDDEN).create()); - - registry.register(new LayoutOptionData.Builder() - .id("de.cau.cs.kieler.klighd.semanticFilter.tags").group("semanticFilter") - .name("Semantic Filter Tags") - .description("Tags to provide semantic context in a diagram. Used by semantic filter rules to include" - + " or exclude an element.") - .defaultValue(SEMANTIC_FILTER_TAGS_DEFAULT).type(LayoutOptionData.Type.OBJECT) - .optionClass(Collection.class) - .targets(EnumSet.of(LayoutOptionData.Target.NODES, LayoutOptionData.Target.EDGES, - LayoutOptionData.Target.LABELS, LayoutOptionData.Target.PORTS)) - .visibility(LayoutOptionData.Visibility.HIDDEN).create()); - - registry.register(new LayoutOptionData.Builder() - .id("de.cau.cs.kieler.klighd.semanticFilter.rules").group("semanticFilter") - .name("Semantic Filter Rules") - .description("Semantic filter rules that can be constructed through the combination of other semantic " - + "filter rules and logical connectives. A semantic filter tag T is used as an atomic rule with " - + "the semantics 'graph element has tag T'.") - .defaultValue(SEMANTIC_FILTER_RULES_DEFAULT).type(LayoutOptionData.Type.OBJECT) - .optionClass(Collection.class) - .targets(EnumSet.of(LayoutOptionData.Target.PARENTS)) - .visibility(LayoutOptionData.Visibility.HIDDEN).create()); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 1e6829e54..4cfddad85 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -27,6 +27,8 @@ import org.eclipse.emf.ecore.EObject; import de.cau.cs.kieler.klighd.KlighdConstants; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.kgraph.KGraphData; import de.cau.cs.kieler.klighd.kgraph.KGraphElement; import de.cau.cs.kieler.klighd.kgraph.KNode; @@ -403,4 +405,16 @@ public static boolean isSelectable(final EObject viewElement) { */ public static final IProperty PROXY_VIEW_HIERARCHICAL_OFF_SCREEN_DEPTH = new Property("de.cau.cs.kieler.klighd.proxy-view.hierarchicalOffScreenDepth", 0); + + public static final List SEMANTIC_FILTER_TAGS_DEFAULT = null; + + public static final IProperty> SEMANTIC_FILTER_TAGS = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.tags", + SEMANTIC_FILTER_TAGS_DEFAULT, null, null); + + public static final List SEMANTIC_FILTER_RULES_DEFAULT = null; + + public static final IProperty> SEMANTIC_FILTER_RULES = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.rules", + SEMANTIC_FILTER_RULES_DEFAULT, null, null); } From 5251ccf03d9642ac6fa67176d52977e2023ce56a Mon Sep 17 00:00:00 2001 From: fight4day Date: Wed, 6 Jul 2022 18:43:14 +0200 Subject: [PATCH 14/76] Some of the code review --- .../klighd/lsp/utils/RenderingPreparer.xtend | 2 +- .../standalone/KlighdStandaloneSetup.java | 5 ----- .../kieler/klighd/util/KlighdProperties.java | 19 ++++++++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index ed87f840c..fdb88890e 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -44,6 +44,7 @@ import de.cau.cs.kieler.klighd.microlayout.DecoratorPlacementUtil import de.cau.cs.kieler.klighd.microlayout.DecoratorPlacementUtil.Decoration import de.cau.cs.kieler.klighd.microlayout.GridPlacementUtil import de.cau.cs.kieler.klighd.microlayout.PlacementUtil +import de.cau.cs.kieler.klighd.util.KlighdProperties import java.awt.geom.Point2D import java.util.ArrayList import java.util.HashMap @@ -53,7 +54,6 @@ import java.util.Map import static com.google.common.collect.Iterables.filter import static extension de.cau.cs.kieler.klighd.lsp.utils.SprottyProperties.* -import de.cau.cs.kieler.klighd.util.KlighdProperties /** * Utility class to provide some functionality to persist prepare the rendering of a {@link KGraphElement}. diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java index 8fd83fe2b..3b7d06402 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java +++ b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java @@ -131,11 +131,6 @@ protected void registerFonts() { final GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); for (int i = 0; i < filePaths.length; ++i) { try (InputStream fontStream = this.getClass().getResourceAsStream(filePaths[i])) { - - // TODO Hacky workaround for opening fonts - String path = this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath() + ".." + filePaths[i]; - InputStream temp = new FileInputStream(new File(path)); - ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, fontStream)); } catch (Throwable e) { System.out.println("could not load font file " + filePaths[i]); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 4cfddad85..b298d32c2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.util; import java.awt.Color; +import java.util.ArrayList; import java.util.List; import org.eclipse.elk.core.math.KVector; @@ -406,15 +407,19 @@ public static boolean isSelectable(final EObject viewElement) { public static final IProperty PROXY_VIEW_HIERARCHICAL_OFF_SCREEN_DEPTH = new Property("de.cau.cs.kieler.klighd.proxy-view.hierarchicalOffScreenDepth", 0); - public static final List SEMANTIC_FILTER_TAGS_DEFAULT = null; - + /** + * Property determining an element's semantic filter tags. + */ public static final IProperty> SEMANTIC_FILTER_TAGS = new Property>("de.cau.cs.kieler.klighd.semanticFilter.tags", - SEMANTIC_FILTER_TAGS_DEFAULT, null, null); - - public static final List SEMANTIC_FILTER_RULES_DEFAULT = null; - + // ArrayList is cloneable, no problem here + new ArrayList<>()); + + /** + * Property determining an element's semantic filter rules. + * Only relevant for the root. + */ public static final IProperty> SEMANTIC_FILTER_RULES = new Property>("de.cau.cs.kieler.klighd.semanticFilter.rules", - SEMANTIC_FILTER_RULES_DEFAULT, null, null); + new ArrayList<>()); } From 1f09038b13685ece5f915aa66fb7db59c70d7adf Mon Sep 17 00:00:00 2001 From: fight4day Date: Wed, 20 Jul 2022 15:06:22 +0200 Subject: [PATCH 15/76] Code review + default values --- .../klighd/lsp/utils/RenderingPreparer.xtend | 9 ---- .../klighd/filtering/AndConnective.java | 28 +++++++++++-- .../klighd/filtering/BinaryConnective.java | 17 +++++++- .../filtering/GreaterThanConnective.java | 24 +++++++++-- .../klighd/filtering/IfThenConnective.java | 27 ++++++++++-- .../filtering/IfThenElseConnective.java | 32 ++++++++++++--- .../klighd/filtering/LessThanConnective.java | 24 +++++++++-- .../filtering/LogicEqualConnective.java | 27 ++++++++++-- .../klighd/filtering/NegationConnective.java | 25 +++++++++-- .../filtering/NumericEqualConnective.java | 24 +++++++++-- .../kieler/klighd/filtering/OrConnective.java | 28 +++++++++++-- .../klighd/filtering/SemanticFilterRule.java | 41 +++++++++++++++++-- .../filtering/SemanticFilterRuleUtil.java | 2 +- .../klighd/filtering/SemanticFilterTag.java | 17 +++++--- .../klighd/filtering/TernaryConnective.java | 16 +++++++- .../klighd/filtering/UnaryConnective.java | 15 +++++++ 16 files changed, 301 insertions(+), 55 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index fdb88890e..0b5afff87 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -136,15 +136,6 @@ final class RenderingPreparer { if (element.getProperty(KlighdProperties.PROXY_VIEW_RENDER_NODE_AS_PROXY) && proxyRendering !== null) { for (data : proxyRendering) { switch(data) { - KRenderingLibrary: { - // The library needs to generate ids for all later KRenderingRefs to refer to, but no own bounds, - // since these are generic renderings. - for (rendering : data.renderings) { - if (rendering instanceof KRendering) { - KRenderingIdGenerator.generateIdsRecursive(rendering) - } - } - } KRenderingRef: { // all references to KRenderings need to place a map with the ids of the renderings and their // sizes and their decoration in this case in the properties of the reference. diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java index 4b8a8df4d..d3722337b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -22,6 +22,7 @@ * R1 and R2 evaluate to true. * * @author mka + * @author tik * */ public class AndConnective extends BinaryConnective { @@ -33,9 +34,17 @@ public class AndConnective extends BinaryConnective { * @param rightOperand right operand */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** @@ -45,7 +54,18 @@ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOpe * @param ruleName rule name */ public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { - super(ruleName); + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java index 439084cd4..c16a4f752 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -19,6 +19,7 @@ /** * A binary connective C takes two filter rules R1 and R2 as operands and creates the new rule R1 C R2. * @author mka + * @author tik * */ public abstract class BinaryConnective extends SemanticFilterRule { @@ -34,6 +35,13 @@ public BinaryConnective() { } + /** + * {@inheritDoc} + */ + public BinaryConnective(Boolean defaultValue) { + super(defaultValue); + } + /** * {@inheritDoc} */ @@ -41,11 +49,18 @@ public BinaryConnective(String ruleName) { super(ruleName); } + /** + * {@inheritDoc} + */ + public BinaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + /** * Returns a string representation of the rule of the form 'C(R1, R2)'. * @return the rule string */ - public String getString() { + public String toString() { return name + "(" + leftOperand + ", " + rightOperand + ")"; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java index f4cfd572f..80b06338d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -31,8 +31,16 @@ public class GreaterThanConnective extends UnaryConnective { * @param operand the operand */ public GreaterThanConnective(SemanticFilterTag operand) { - this.name = NAME; - this.operand = operand; + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); } /** @@ -41,7 +49,17 @@ public GreaterThanConnective(SemanticFilterTag operand) { * @param ruleName rule name */ public GreaterThanConnective(SemanticFilterTag operand, String ruleName) { - super(ruleName); + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.operand = operand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java index e950e36c2..3fa3da6f6 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java @@ -33,9 +33,17 @@ public class IfThenConnective extends BinaryConnective { * @param rightOperand right operand */ public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** @@ -45,7 +53,18 @@ public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule right * @param ruleName rule name */ public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { - super(ruleName); + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java index 19a30b30b..2174016fa 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java @@ -35,10 +35,19 @@ public class IfThenElseConnective extends TernaryConnective { */ public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, SemanticFilterRule thirdOperand) { - this.name = NAME; - this.firstOperand = firstOperand; - this.secondOperand = secondOperand; - this.thirdOperand = thirdOperand; + this(firstOperand, secondOperand, thirdOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param defaultValue the default value + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, Boolean defaultValue) { + this(firstOperand, secondOperand, thirdOperand, defaultValue, null); } /** @@ -50,7 +59,20 @@ public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule */ public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, SemanticFilterRule thirdOperand, String ruleName) { - super(ruleName); + this(firstOperand, secondOperand, thirdOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.firstOperand = firstOperand; this.secondOperand = secondOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 3fe50c7b0..49a7a0184 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -31,8 +31,16 @@ public class LessThanConnective extends UnaryConnective { * @param operand the operand */ public LessThanConnective(SemanticFilterTag operand) { - this.name = NAME; - this.operand = operand; + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); } /** @@ -41,7 +49,17 @@ public LessThanConnective(SemanticFilterTag operand) { * @param ruleName rule name */ public LessThanConnective(SemanticFilterTag operand, String ruleName) { - super(ruleName); + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.operand = operand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java index 0ac4999e5..d238a246b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java @@ -33,9 +33,17 @@ public class LogicEqualConnective extends BinaryConnective { * @param rightOperand right operand */ public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** @@ -45,7 +53,18 @@ public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule r * @param ruleName rule name */ public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { - super(ruleName); + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java index 1fd88c79d..e144b2145 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -22,6 +22,7 @@ * R evaluates to false. * * @author mka + * @author tik * */ public class NegationConnective extends UnaryConnective { @@ -32,8 +33,16 @@ public class NegationConnective extends UnaryConnective { * @param operand the operand */ public NegationConnective(SemanticFilterRule operand) { - this.name = NAME; - this.operand = operand; + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public NegationConnective(SemanticFilterRule operand, Boolean defaultValue) { + this(operand, defaultValue, null); } /** @@ -42,7 +51,17 @@ public NegationConnective(SemanticFilterRule operand) { * @param ruleName rule name */ public NegationConnective(SemanticFilterRule operand, String ruleName) { - super(ruleName); + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NegationConnective(SemanticFilterRule operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.operand = operand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java index 0faae46a7..707e555be 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -31,8 +31,16 @@ public class NumericEqualConnective extends UnaryConnective { * @param operand the operand */ public NumericEqualConnective(SemanticFilterTag operand) { - this.name = NAME; - this.operand = operand; + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); } /** @@ -41,7 +49,17 @@ public NumericEqualConnective(SemanticFilterTag operand) { * @param ruleName rule name */ public NumericEqualConnective(SemanticFilterTag operand, String ruleName) { - super(ruleName); + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.operand = operand; } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java index 658cfd733..dba9a1b43 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -22,6 +22,7 @@ * R1 or R2 evaluate to true. * * @author mka + * @author tik * */ public class OrConnective extends BinaryConnective { @@ -33,9 +34,17 @@ public class OrConnective extends BinaryConnective { * @param rightOperand right operand */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { - this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** @@ -45,7 +54,18 @@ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOper * @param ruleName rule name */ public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { - super(ruleName); + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); this.name = NAME; this.leftOperand = leftOperand; this.rightOperand = rightOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java index 83b9ee4aa..fd4d29a81 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -21,24 +21,50 @@ * The rules are constructed through the combination of filter rules with logical connectives. * * @author mka + * @author tik * */ public abstract class SemanticFilterRule { + /** The rule name is used to identify rules and distinguish them from one another. */ private String ruleName; + /** The default value is used to indicate whether the semantic filter should be on or off by default. */ + private Boolean defaultValue; /** * Basic constructor */ public SemanticFilterRule() { - + this(null, null); } /** - * Constructor that takes a rule name. The rule name is used to identify rules and distinguish them from one another. - * @param ruleName + * Constructor that takes a default value. + * The default value is used to indicate whether the semantic filter should be on or off by default. + * @param defaultValue the default value + */ + public SemanticFilterRule(Boolean defaultValue) { + this(defaultValue, null); + } + + /** + * Constructor that takes a rule name. + * The rule name is used to identify rules and distinguish them from one another. + * @param ruleName the rule name */ public SemanticFilterRule(String ruleName) { + this(null, ruleName); + } + + /** + * Constructor that takes a rule name and default value. + * The default value is used to indicate whether the semantic filter should be on or off by default. + * The rule name is used to identify rules and distinguish them from one another. + * @param defaultValue the default value + * @param ruleName the rule name + */ + public SemanticFilterRule(Boolean defaultValue, String ruleName) { + this.defaultValue = defaultValue; this.ruleName = ruleName; } @@ -49,5 +75,12 @@ public SemanticFilterRule(String ruleName) { public String getRuleName() { return this.ruleName; } - + + /** + * Returns the default value. + * @return the default value + */ + public boolean getDefaultValue() { + return this.defaultValue; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java index 258c4a6a7..c80697521 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java @@ -112,7 +112,7 @@ public static SemanticFilterRule getBigAndConnective(String ruleName, } /** - * Constructs a named rule from a given potentially unnamed rule. + * Constructs a new named rule from a given potentially unnamed rule. * * @param ruleName * The rule name. diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java index 2e54746e3..dec5abec1 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -21,13 +21,18 @@ * be conveyed otherwise and as an atomic filter rule that can be combined with other rules to construct more complex * rules. * + * When using a tag in numeric expressions, keep in mind that not defining the number results in it defaulting to 0. + * It's best practice to always set the number explicitly, if one can be assigned. + * * @author mka + * @author tik * */ public class SemanticFilterTag extends SemanticFilterRule { private String tag; - private Double num = 0.0; + /** If unset, defaults to 0. */ + private Double num; /** * Constructor for tag. @@ -38,7 +43,7 @@ public SemanticFilterTag(String tag) { } /** - * Constructor for tag. + * Constructor for tag with a number. * @param tag string identifier * @param num the number */ @@ -48,8 +53,8 @@ public SemanticFilterTag(String tag, Double num) { } /** - * Constructor for tag as a semantic filter rule. Here an additional rule name is required as this is later used - * to differentiate between multiple rules. + * Constructor for tag as a semantic filter rule. + * Here, an additional rule name is required as this is later used to differentiate between multiple rules. * @param tag string identifier of the tag the rule applies to * @param ruleName string identifier of the rule itself, can be anything */ @@ -59,8 +64,8 @@ public SemanticFilterTag(String tag, String ruleName) { } /** - * Constructor for tag as a semantic filter rule. Here an additional rule name is required as this is later used - * to differentiate between multiple rules. + * Constructor for tag with a number as a semantic filter rule. + * Here, an additional rule name is required as this is later used to differentiate between multiple rules. * @param tag string identifier of the tag the rule applies to * @param num the number * @param ruleName string identifier of the rule itself, can be anything diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java index 37113057c..52b0ad374 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java @@ -36,6 +36,13 @@ public TernaryConnective() { } + /** + * {@inheritDoc} + */ + public TernaryConnective(Boolean defaultValue) { + super(defaultValue); + } + /** * {@inheritDoc} */ @@ -43,11 +50,18 @@ public TernaryConnective(String ruleName) { super(ruleName); } + /** + * {@inheritDoc} + */ + public TernaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + /** * Returns a string representation of the rule of the form 'C(R1, R2, R3)'. * @return the rule string */ - public String getString() { + public String toString() { return name + "(" + firstOperand + ", " + secondOperand + ", " + thirdOperand + ")"; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java index 23ef90fd2..785d7a8fb 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -20,6 +20,7 @@ * An unary connective C takes a single filter rule R as an operand and creates the new rule C(R). * * @author mka + * @author tik * */ public abstract class UnaryConnective extends SemanticFilterRule { @@ -34,6 +35,13 @@ public UnaryConnective() { } + /** + * {@inheritDoc} + */ + public UnaryConnective(Boolean defaultValue) { + super(defaultValue); + } + /** * {@inheritDoc} */ @@ -41,6 +49,13 @@ public UnaryConnective(String ruleName) { super(ruleName); } + /** + * {@inheritDoc} + */ + public UnaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + /** * Returns a string representation of the rule in the form 'C(R)'. * @return the rule string From 791a1a15cde83dd41b009acdab3a36fe4648e0cf Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 25 Jul 2022 13:46:59 +0200 Subject: [PATCH 16/76] semantic filtering specifics --- .../META-INF/MANIFEST.MF | 3 +- .../cau/cs/kieler/klighd/KlighdOptions.java | 4 + .../klighd/filtering/AndConnective.java | 74 ++++++++++ .../klighd/filtering/BinaryConnective.java | 67 ++++++++++ .../filtering/GreaterThanConnective.java | 67 ++++++++++ .../klighd/filtering/IfThenConnective.java | 73 ++++++++++ .../filtering/IfThenElseConnective.java | 82 ++++++++++++ .../klighd/filtering/LessThanConnective.java | 67 ++++++++++ .../filtering/LogicEqualConnective.java | 73 ++++++++++ .../klighd/filtering/NegationConnective.java | 69 ++++++++++ .../filtering/NumericEqualConnective.java | 67 ++++++++++ .../kieler/klighd/filtering/OrConnective.java | 74 ++++++++++ .../klighd/filtering/SemanticFilterRule.java | 86 ++++++++++++ .../filtering/SemanticFilterRuleUtil.java | 126 ++++++++++++++++++ .../klighd/filtering/SemanticFilterTag.java | 103 ++++++++++++++ .../klighd/filtering/TernaryConnective.java | 67 ++++++++++ .../klighd/filtering/UnaryConnective.java | 67 ++++++++++ 17 files changed, 1168 insertions(+), 1 deletion(-) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index 9995c36b2..273c125bc 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams (KLighD) Bundle-SymbolicName: de.cau.cs.kieler.klighd;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.1.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.klighd.kgraph, @@ -21,6 +21,7 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin Export-Package: de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.actions, + de.cau.cs.kieler.klighd.filtering, de.cau.cs.kieler.klighd.internal;x-friends:="de.cau.cs.kieler.klighd.piccolo,de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.lsp", de.cau.cs.kieler.klighd.internal.macrolayout;x-friends:="de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.piccolo", de.cau.cs.kieler.klighd.internal.preferences;x-internal:=true, diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index fead2f59f..9cbb1766e 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -16,7 +16,9 @@ */ package de.cau.cs.kieler.klighd; +import java.util.Collection; import java.util.EnumSet; +import java.util.List; import org.eclipse.elk.core.data.ILayoutMetaDataProvider; import org.eclipse.elk.core.data.LayoutOptionData; @@ -24,6 +26,8 @@ import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.labels.management.LabelManagementResult; import de.cau.cs.kieler.klighd.util.ExpansionAwareLayoutOption; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java new file mode 100644 index 000000000..d3722337b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.java @@ -0,0 +1,74 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An And Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 and R2 evaluate to true. + * + * @author mka + * @author tik + * + */ +public class AndConnective extends BinaryConnective { + protected static final String NAME = "AND"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java new file mode 100644 index 000000000..c16a4f752 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A binary connective C takes two filter rules R1 and R2 as operands and creates the new rule R1 C R2. + * @author mka + * @author tik + * + */ +public abstract class BinaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule leftOperand; + protected SemanticFilterRule rightOperand; + + /** + * {@inheritDoc} + */ + public BinaryConnective() { + + } + + /** + * {@inheritDoc} + */ + public BinaryConnective(Boolean defaultValue) { + super(defaultValue); + } + + /** + * {@inheritDoc} + */ + public BinaryConnective(String ruleName) { + super(ruleName); + } + + /** + * {@inheritDoc} + */ + public BinaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + + /** + * Returns a string representation of the rule of the form 'C(R1, R2)'. + * @return the rule string + */ + public String toString() { + return name + "(" + leftOperand + ", " + rightOperand + ")"; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java new file mode 100644 index 000000000..80b06338d --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A GreaterThan Connective takes one rule R and evaluates to true + * iff + * R.num > correspondingTag.num. + * @author tik + * + */ +public class GreaterThanConnective extends UnaryConnective { + protected static final String NAME = "GREATERTHAN"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public GreaterThanConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public GreaterThanConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java new file mode 100644 index 000000000..3fa3da6f6 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenConnective.java @@ -0,0 +1,73 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An IfThen Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 evaluates to false or R2 evaluates to true. + * + * @author tik + * + */ +public class IfThenConnective extends BinaryConnective { + protected static final String NAME = "IFTHEN"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public IfThenConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java new file mode 100644 index 000000000..2174016fa --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IfThenElseConnective.java @@ -0,0 +1,82 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An IfThenElse Connective takes three rules R1, R2 and R3 and evaluates to true + * iff + * R1 and R2 evaluate to true or R1 evaluates to false and R3 evaluates to true. + * + * @author tik + * + */ +public class IfThenElseConnective extends TernaryConnective { + protected static final String NAME = "IFTHENELSE"; + + /** + * Constructor for unnamed rule. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand) { + this(firstOperand, secondOperand, thirdOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param defaultValue the default value + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, Boolean defaultValue) { + this(firstOperand, secondOperand, thirdOperand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param ruleName rule name + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, String ruleName) { + this(firstOperand, secondOperand, thirdOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param firstOperand first operand + * @param secondOperand second operand + * @param thirdOperand third operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public IfThenElseConnective(SemanticFilterRule firstOperand, SemanticFilterRule secondOperand, + SemanticFilterRule thirdOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.firstOperand = firstOperand; + this.secondOperand = secondOperand; + this.thirdOperand = thirdOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java new file mode 100644 index 000000000..49a7a0184 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A LessThan Connective takes one rule R and evaluates to true + * iff + * R.num < correspondingTag.num. + * @author tik + * + */ +public class LessThanConnective extends UnaryConnective { + protected static final String NAME = "LESSTHAN"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public LessThanConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public LessThanConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java new file mode 100644 index 000000000..d238a246b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LogicEqualConnective.java @@ -0,0 +1,73 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An Equal Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 and R2 evaluate to true or R1 and R2 evaluate to false. + * + * @author tik + * + */ +public class LogicEqualConnective extends BinaryConnective { + protected static final String NAME = "LOGICEQUAL"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public LogicEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java new file mode 100644 index 000000000..e144b2145 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NegationConnective.java @@ -0,0 +1,69 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A Not Connective takes a rule R and evaluates to true + * iff + * R evaluates to false. + * + * @author mka + * @author tik + * + */ +public class NegationConnective extends UnaryConnective { + protected static final String NAME = "NOT"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public NegationConnective(SemanticFilterRule operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public NegationConnective(SemanticFilterRule operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public NegationConnective(SemanticFilterRule operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NegationConnective(SemanticFilterRule operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java new file mode 100644 index 000000000..707e555be --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A NumericEqual Connective takes one rule R and evaluates to true + * iff + * R.num == correspondingTag.num. + * @author tik + * + */ +public class NumericEqualConnective extends UnaryConnective { + protected static final String NAME = "NUMERICEQUAL"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public NumericEqualConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public NumericEqualConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java new file mode 100644 index 000000000..dba9a1b43 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/OrConnective.java @@ -0,0 +1,74 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An Or Connective takes two rules R1 and R2 and evaluates to true + * iff + * R1 or R2 evaluate to true. + * + * @author mka + * @author tik + * + */ +public class OrConnective extends BinaryConnective { + protected static final String NAME = "OR"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public OrConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java new file mode 100644 index 000000000..fd4d29a81 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -0,0 +1,86 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Semantic filter rules describe a filter that can be evaluated to include only elements tagged with certain tags. + * The rules are constructed through the combination of filter rules with logical connectives. + * + * @author mka + * @author tik + * + */ +public abstract class SemanticFilterRule { + + /** The rule name is used to identify rules and distinguish them from one another. */ + private String ruleName; + /** The default value is used to indicate whether the semantic filter should be on or off by default. */ + private Boolean defaultValue; + + /** + * Basic constructor + */ + public SemanticFilterRule() { + this(null, null); + } + + /** + * Constructor that takes a default value. + * The default value is used to indicate whether the semantic filter should be on or off by default. + * @param defaultValue the default value + */ + public SemanticFilterRule(Boolean defaultValue) { + this(defaultValue, null); + } + + /** + * Constructor that takes a rule name. + * The rule name is used to identify rules and distinguish them from one another. + * @param ruleName the rule name + */ + public SemanticFilterRule(String ruleName) { + this(null, ruleName); + } + + /** + * Constructor that takes a rule name and default value. + * The default value is used to indicate whether the semantic filter should be on or off by default. + * The rule name is used to identify rules and distinguish them from one another. + * @param defaultValue the default value + * @param ruleName the rule name + */ + public SemanticFilterRule(Boolean defaultValue, String ruleName) { + this.defaultValue = defaultValue; + this.ruleName = ruleName; + } + + /** + * Returns the rule name. + * @return the rule name + */ + public String getRuleName() { + return this.ruleName; + } + + /** + * Returns the default value. + * @return the default value + */ + public boolean getDefaultValue() { + return this.defaultValue; + } +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java new file mode 100644 index 000000000..c80697521 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java @@ -0,0 +1,126 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Util for easily getting some rules. + * + * @author tik + * + */ +public abstract class SemanticFilterRuleUtil { + /** An empty tag used to define constants. */ + private static final SemanticFilterTag EMPTY = new SemanticFilterTag(""); + /** A rule that is always evaluated to false. */ + public static final SemanticFilterRule FALSE = + new AndConnective(EMPTY, new NegationConnective(EMPTY)); + /** A rule that is always evaluated to true. */ + public static final SemanticFilterRule TRUE = + new OrConnective(EMPTY, new NegationConnective(EMPTY)); + + /** + * Constructs an unnamed rule with all operands connected via OR. If no operands are given, this + * is always false. + * + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigOrConnective(SemanticFilterRule... operands) { + return getBigOrConnective(null, operands); + } + + /** + * Constructs a named rule with all operands connected via OR. If no operands are given, this is + * always false. + * + * @param ruleName + * The rule name. + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigOrConnective(String ruleName, + SemanticFilterRule... operands) { + if (operands.length <= 0) { + // No rules, automatically evaluate to false + return FALSE; + } else if (operands.length <= 1) { + // Just one rule, true iff rule is true + // Add ruleName instead of just using first operand twice to avoid double evaluation + return addRuleName(ruleName, operands[0]); + } + OrConnective bigOr = new OrConnective(operands[0], operands[1], ruleName); + for (int i = 2; i < operands.length; i++) { + bigOr.rightOperand = new OrConnective(bigOr.rightOperand, operands[i]); + } + return bigOr; + } + + /** + * Constructs an unnamed rule with all operands connected via AND. If no operands are given, + * this is always false. + * + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigAndConnective(SemanticFilterRule... operands) { + return getBigAndConnective(null, operands); + } + + /** + * Constructs a named rule with all operands connected via AND. If no operands are given, this + * is always false. + * + * @param ruleName + * The rule name. + * @param operands + * The operands. + * @return The SemanticFilterRule. + */ + public static SemanticFilterRule getBigAndConnective(String ruleName, + SemanticFilterRule... operands) { + if (operands.length <= 0) { + // No rules, automatically evaluate to false + return FALSE; + } else if (operands.length <= 1) { + // Just one rule, true iff rule is true + // Add ruleName instead of just using first operand twice to avoid double evaluation + return addRuleName(ruleName, operands[0]); + } + // Use first operand twice in case of just one rule, e.g. true iff rule is true + AndConnective bigAnd = new AndConnective(operands[0], operands[1], ruleName); + for (int i = 2; i < operands.length; i++) { + bigAnd.rightOperand = new AndConnective(bigAnd.rightOperand, operands[i]); + } + return bigAnd; + } + + /** + * Constructs a new named rule from a given potentially unnamed rule. + * + * @param ruleName + * The rule name. + * @param rule + * The rule. + * @return A named rule. + */ + public static SemanticFilterRule addRuleName(String ruleName, SemanticFilterRule rule) { + return new NegationConnective(new NegationConnective(rule), ruleName); + } +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java new file mode 100644 index 000000000..dec5abec1 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -0,0 +1,103 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Semantic filter tags serve both as tags on graph elements to provide semantic meaning in a diagram that can not + * be conveyed otherwise and as an atomic filter rule that can be combined with other rules to construct more complex + * rules. + * + * When using a tag in numeric expressions, keep in mind that not defining the number results in it defaulting to 0. + * It's best practice to always set the number explicitly, if one can be assigned. + * + * @author mka + * @author tik + * + */ +public class SemanticFilterTag extends SemanticFilterRule { + + private String tag; + /** If unset, defaults to 0. */ + private Double num; + + /** + * Constructor for tag. + * @param tag string identifier + */ + public SemanticFilterTag(String tag) { + this.tag = tag; + } + + /** + * Constructor for tag with a number. + * @param tag string identifier + * @param num the number + */ + public SemanticFilterTag(String tag, Double num) { + this.tag = tag; + this.num = num; + } + + /** + * Constructor for tag as a semantic filter rule. + * Here, an additional rule name is required as this is later used to differentiate between multiple rules. + * @param tag string identifier of the tag the rule applies to + * @param ruleName string identifier of the rule itself, can be anything + */ + public SemanticFilterTag(String tag, String ruleName) { + super(ruleName); + this.tag = tag; + } + + /** + * Constructor for tag with a number as a semantic filter rule. + * Here, an additional rule name is required as this is later used to differentiate between multiple rules. + * @param tag string identifier of the tag the rule applies to + * @param num the number + * @param ruleName string identifier of the rule itself, can be anything + */ + public SemanticFilterTag(String tag, Double num, String ruleName) { + super(ruleName); + this.tag = tag; + this.num = num; + } + + /** + * Returns the tag. + * @return the tag + */ + public String getTag() { + return this.tag; + } + + /** + * Returns the num. + * @return the num + */ + public Double getNum() { + return this.num; + } + + /** + * Returns a string representation of the rule/tag. + * @return the rule string + */ + public String toString() { + return "(tag=" + this.tag + ", num=" + this.num + ")"; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java new file mode 100644 index 000000000..52b0ad374 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TernaryConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A ternary connective C takes three filter rules R1, R2 and R3 as operands and creates the new rule C R1 R2 R3. + * + * @author tik + * + */ +public abstract class TernaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule firstOperand; + protected SemanticFilterRule secondOperand; + protected SemanticFilterRule thirdOperand; + + /** + * {@inheritDoc} + */ + public TernaryConnective() { + + } + + /** + * {@inheritDoc} + */ + public TernaryConnective(Boolean defaultValue) { + super(defaultValue); + } + + /** + * {@inheritDoc} + */ + public TernaryConnective(String ruleName) { + super(ruleName); + } + + /** + * {@inheritDoc} + */ + public TernaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + + /** + * Returns a string representation of the rule of the form 'C(R1, R2, R3)'. + * @return the rule string + */ + public String toString() { + return name + "(" + firstOperand + ", " + secondOperand + ", " + thirdOperand + ")"; + } +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java new file mode 100644 index 000000000..785d7a8fb --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/UnaryConnective.java @@ -0,0 +1,67 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An unary connective C takes a single filter rule R as an operand and creates the new rule C(R). + * + * @author mka + * @author tik + * + */ +public abstract class UnaryConnective extends SemanticFilterRule { + + protected String name; + protected SemanticFilterRule operand; + + /** + * {@inheritDoc} + */ + public UnaryConnective() { + + } + + /** + * {@inheritDoc} + */ + public UnaryConnective(Boolean defaultValue) { + super(defaultValue); + } + + /** + * {@inheritDoc} + */ + public UnaryConnective(String ruleName) { + super(ruleName); + } + + /** + * {@inheritDoc} + */ + public UnaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + + /** + * Returns a string representation of the rule in the form 'C(R)'. + * @return the rule string + */ + public String toString() { + return name + "(" + this.operand + ")"; + } + +} From d522bbc9937d9a2931863f6762ea3510b4264832 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 26 Jul 2022 11:03:13 +0200 Subject: [PATCH 17/76] add utility connectives and fix bundle version --- .../META-INF/MANIFEST.MF | 2 +- .../klighd/filtering/FalseConnective.java | 62 ++++++++++++++++ .../klighd/filtering/IdentityConnective.java | 71 +++++++++++++++++++ .../klighd/filtering/NullaryConnective.java | 63 ++++++++++++++++ .../filtering/SemanticFilterRuleUtil.java | 16 ++--- .../klighd/filtering/TrueConnective.java | 62 ++++++++++++++++ 6 files changed, 263 insertions(+), 13 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/FalseConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NullaryConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TrueConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index 273c125bc..2a48d88d7 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams (KLighD) Bundle-SymbolicName: de.cau.cs.kieler.klighd;singleton:=true -Bundle-Version: 2.1.1.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.klighd.kgraph, diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/FalseConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/FalseConnective.java new file mode 100644 index 000000000..c2daf10b5 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/FalseConnective.java @@ -0,0 +1,62 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A False Connective always evaluates to false. + * + * @author mka + * + */ +public class FalseConnective extends NullaryConnective { + + protected static final String NAME = "FALSE"; + + /** + * Constructor for unnamed rule. + */ + public FalseConnective() { + this(null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param defaultValue + */ + public FalseConnective(Boolean defaultValue) { + this(defaultValue, null); + } + + /** + * Constructor for named rule. + * @param ruleName + */ + public FalseConnective(String ruleName) { + this(null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param defaultValue + * @param ruleName + */ + public FalseConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java new file mode 100644 index 000000000..a025602b6 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java @@ -0,0 +1,71 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * An Identity Connective evaluates its operand. For example ID (R) is equivalent to R. + * + * @author mka + * + */ +public class IdentityConnective extends UnaryConnective { + + protected static final String NAME = "ID"; + + /** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ + public IdentityConnective(SemanticFilterRule operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ + public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ + public IdentityConnective(SemanticFilterRule operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NullaryConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NullaryConnective.java new file mode 100644 index 000000000..e2768cd8b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NullaryConnective.java @@ -0,0 +1,63 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * @author mka + * + */ +public abstract class NullaryConnective extends SemanticFilterRule { + + protected String name; + + /** + * {@inheritDoc} + */ + public NullaryConnective() { + + } + + /** + * {@inheritDoc} + */ + public NullaryConnective(Boolean defaultValue) { + super(defaultValue); + } + + /** + * {@inheritDoc} + */ + public NullaryConnective(String ruleName) { + super(ruleName); + } + + /** + * {@inheritDoc} + */ + public NullaryConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + } + + /** + * Returns a string representation of the rule in the form 'C(R)'. + * @return the rule string + */ + public String toString() { + return name; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java index c80697521..d119f3b97 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRuleUtil.java @@ -19,18 +19,10 @@ /** * Util for easily getting some rules. * - * @author tik + * @author tik, mka * */ public abstract class SemanticFilterRuleUtil { - /** An empty tag used to define constants. */ - private static final SemanticFilterTag EMPTY = new SemanticFilterTag(""); - /** A rule that is always evaluated to false. */ - public static final SemanticFilterRule FALSE = - new AndConnective(EMPTY, new NegationConnective(EMPTY)); - /** A rule that is always evaluated to true. */ - public static final SemanticFilterRule TRUE = - new OrConnective(EMPTY, new NegationConnective(EMPTY)); /** * Constructs an unnamed rule with all operands connected via OR. If no operands are given, this @@ -58,7 +50,7 @@ public static SemanticFilterRule getBigOrConnective(String ruleName, SemanticFilterRule... operands) { if (operands.length <= 0) { // No rules, automatically evaluate to false - return FALSE; + return new FalseConnective(); } else if (operands.length <= 1) { // Just one rule, true iff rule is true // Add ruleName instead of just using first operand twice to avoid double evaluation @@ -97,7 +89,7 @@ public static SemanticFilterRule getBigAndConnective(String ruleName, SemanticFilterRule... operands) { if (operands.length <= 0) { // No rules, automatically evaluate to false - return FALSE; + return new FalseConnective(); } else if (operands.length <= 1) { // Just one rule, true iff rule is true // Add ruleName instead of just using first operand twice to avoid double evaluation @@ -121,6 +113,6 @@ public static SemanticFilterRule getBigAndConnective(String ruleName, * @return A named rule. */ public static SemanticFilterRule addRuleName(String ruleName, SemanticFilterRule rule) { - return new NegationConnective(new NegationConnective(rule), ruleName); + return new IdentityConnective((rule), ruleName); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TrueConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TrueConnective.java new file mode 100644 index 000000000..e1b7325da --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/TrueConnective.java @@ -0,0 +1,62 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A True Connective always evaluates to true. + * + * @author mka + * + */ +public class TrueConnective extends NullaryConnective { + + protected static final String NAME = "TRUE"; + + /** + * Constructor for unnamed rule. + */ + public TrueConnective() { + this(null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param defaultValue + */ + public TrueConnective(Boolean defaultValue) { + this(defaultValue, null); + } + + /** + * Constructor for named rule. + * @param ruleName + */ + public TrueConnective(String ruleName) { + this(null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param defaultValue + * @param ruleName + */ + public TrueConnective(Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + } + +} From aad71104fdc6e652b0441de3bfb6d905a1228eb2 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 26 Jul 2022 14:50:05 +0200 Subject: [PATCH 18/76] add properties api to add filter tags and rules to graphs --- .../kieler/klighd/util/KlighdProperties.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 09e56a876..c5d018693 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -17,6 +17,8 @@ package de.cau.cs.kieler.klighd.util; import java.awt.Color; +import java.util.ArrayList; +import java.util.List; import org.eclipse.elk.core.math.KVector; import org.eclipse.elk.core.math.Spacing; @@ -26,6 +28,8 @@ import org.eclipse.emf.ecore.EObject; import de.cau.cs.kieler.klighd.KlighdConstants; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.kgraph.KGraphElement; import de.cau.cs.kieler.klighd.kgraph.KNode; import de.cau.cs.kieler.klighd.krendering.KText; @@ -379,4 +383,20 @@ public static boolean isSelectable(final EObject viewElement) { */ public static final IProperty IS_NODE_TITLE = new Property("klighd.isNodeTitle", false); + + /** + * Property determining an element's semantic filter tags. + */ + public static final IProperty> SEMANTIC_FILTER_TAGS = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.tags", + // ArrayList is cloneable, no problem here + new ArrayList<>()); + + /** + * Property determining an element's semantic filter rules. + * Only relevant for the root. + */ + public static final IProperty> SEMANTIC_FILTER_RULES = + new Property>("de.cau.cs.kieler.klighd.semanticFilter.rules", + new ArrayList<>()); } From 0b1faa8e1e3262d875eada28d8e336c4aa395e1e Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 26 Jul 2022 15:30:00 +0200 Subject: [PATCH 19/76] add >=, <= and != numeric connectives --- .../filtering/GreaterEqualsConnective.java | 68 ++++++++++++++++++ .../filtering/LessEqualsConnective.java | 69 +++++++++++++++++++ .../filtering/NumericNotEqualConnective.java | 69 +++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java new file mode 100644 index 000000000..0578a14b9 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java @@ -0,0 +1,68 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A GreaterEquals Connective takes one rule R and evaluates to true + * iff + * R.num >= correspondingTag.num. + * + * @author mka + * + */ +public class GreaterEqualsConnective extends UnaryConnective { +protected static final String NAME = "GREATEREQUALS"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public GreaterEqualsConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public GreaterEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public GreaterEqualsConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public GreaterEqualsConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java new file mode 100644 index 000000000..80fa8c5ff --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -0,0 +1,69 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * * A LessEquals Connective takes one rule R and evaluates to true + * iff + * R.num <= correspondingTag.num. + * + * @author mka + * + */ +public class LessEqualsConnective extends UnaryConnective { + +protected static final String NAME = "LESSEQUALS"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public LessEqualsConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public LessEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public LessEqualsConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public LessEqualsConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java new file mode 100644 index 000000000..204afe7bc --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java @@ -0,0 +1,69 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * * A NumericNotEqual Connective takes one rule R and evaluates to true + * iff + * R.num != correspondingTag.num. + * + * @author mka + * + */ +public class NumericNotEqualConnective extends UnaryConnective { + +protected static final String NAME = "NUMERICNOTEQUAL"; + + /** + * Constructor for unnamed rule. + * @param operand the operand + */ + public NumericNotEqualConnective(SemanticFilterTag operand) { + this(operand, null, null); + } + + /** + * Constructor for unnamed rule with default value. + * @param operand the operand + * @param defaultValue the default value + */ + public NumericNotEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { + this(operand, defaultValue, null); + } + + /** + * Constructor for named rule. + * @param operand the operand + * @param ruleName rule name + */ + public NumericNotEqualConnective(SemanticFilterTag operand, String ruleName) { + this(operand, null, ruleName); + } + + /** + * Constructor for named rule with default value. + * @param operand the operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericNotEqualConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.operand = operand; + } + +} From b9f7fc84d0334ed2d7173506de8d1274d9473e42 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 29 Jul 2022 13:05:54 +0200 Subject: [PATCH 20/76] add numeric connectives Signed-off-by: Max Kasperowski --- .../filtering/GreaterEqualsConnective.java | 10 ++-- .../filtering/GreaterThanConnective.java | 10 ++-- .../filtering/LessEqualsConnective.java | 10 ++-- .../klighd/filtering/LessThanConnective.java | 10 ++-- .../filtering/NumericDividesConnective.java | 46 +++++++++++++++++++ .../filtering/NumericEqualConnective.java | 10 ++-- .../filtering/NumericMinusConnective.java | 46 +++++++++++++++++++ .../filtering/NumericNotEqualConnective.java | 10 ++-- .../filtering/NumericPlusConnective.java | 46 +++++++++++++++++++ .../klighd/filtering/NumericResult.java | 28 +++++++++++ .../filtering/NumericTimesConnective.java | 46 +++++++++++++++++++ .../klighd/filtering/SemanticFilterTag.java | 2 +- 12 files changed, 243 insertions(+), 31 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericResult.java create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java index 0578a14b9..aab24ac28 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java @@ -31,7 +31,7 @@ public class GreaterEqualsConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public GreaterEqualsConnective(SemanticFilterTag operand) { + public GreaterEqualsConnective(NumericResult operand) { this(operand, null, null); } @@ -40,7 +40,7 @@ public GreaterEqualsConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public GreaterEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) { + public GreaterEqualsConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -49,7 +49,7 @@ public GreaterEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) * @param operand the operand * @param ruleName rule name */ - public GreaterEqualsConnective(SemanticFilterTag operand, String ruleName) { + public GreaterEqualsConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -59,10 +59,10 @@ public GreaterEqualsConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public GreaterEqualsConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public GreaterEqualsConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java index 80b06338d..b73caa03c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -30,7 +30,7 @@ public class GreaterThanConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public GreaterThanConnective(SemanticFilterTag operand) { + public GreaterThanConnective(NumericResult operand) { this(operand, null, null); } @@ -39,7 +39,7 @@ public GreaterThanConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + public GreaterThanConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -48,7 +48,7 @@ public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue) { * @param operand the operand * @param ruleName rule name */ - public GreaterThanConnective(SemanticFilterTag operand, String ruleName) { + public GreaterThanConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -58,10 +58,10 @@ public GreaterThanConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public GreaterThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public GreaterThanConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java index 80fa8c5ff..788750c05 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -32,7 +32,7 @@ public class LessEqualsConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public LessEqualsConnective(SemanticFilterTag operand) { + public LessEqualsConnective(NumericResult operand) { this(operand, null, null); } @@ -41,7 +41,7 @@ public LessEqualsConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public LessEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) { + public LessEqualsConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -50,7 +50,7 @@ public LessEqualsConnective(SemanticFilterTag operand, Boolean defaultValue) { * @param operand the operand * @param ruleName rule name */ - public LessEqualsConnective(SemanticFilterTag operand, String ruleName) { + public LessEqualsConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -60,10 +60,10 @@ public LessEqualsConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public LessEqualsConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public LessEqualsConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 49a7a0184..7904aea60 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -30,7 +30,7 @@ public class LessThanConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public LessThanConnective(SemanticFilterTag operand) { + public LessThanConnective(NumericResult operand) { this(operand, null, null); } @@ -39,7 +39,7 @@ public LessThanConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue) { + public LessThanConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -48,7 +48,7 @@ public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue) { * @param operand the operand * @param ruleName rule name */ - public LessThanConnective(SemanticFilterTag operand, String ruleName) { + public LessThanConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -58,10 +58,10 @@ public LessThanConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public LessThanConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public LessThanConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java new file mode 100644 index 000000000..514aae416 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java @@ -0,0 +1,46 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A Numeric Divides Connective takes two numeric operands and evaluates + * to their quotient. + * + * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal + * connective and should never be treated as a rule and thus does not need a name. + * + * @author mka + * + */ +public class NumericDividesConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICDIVIDES"; + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericDividesConnective(NumericResult leftOperand, NumericResult rightOperand) { + super(); + this.name = NAME; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java index 707e555be..4b6a16cfc 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -30,7 +30,7 @@ public class NumericEqualConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public NumericEqualConnective(SemanticFilterTag operand) { + public NumericEqualConnective(NumericResult operand) { this(operand, null, null); } @@ -39,7 +39,7 @@ public NumericEqualConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { + public NumericEqualConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -48,7 +48,7 @@ public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { * @param operand the operand * @param ruleName rule name */ - public NumericEqualConnective(SemanticFilterTag operand, String ruleName) { + public NumericEqualConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -58,10 +58,10 @@ public NumericEqualConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public NumericEqualConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public NumericEqualConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java new file mode 100644 index 000000000..df875cc27 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java @@ -0,0 +1,46 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A Numeric Minus Connective takes two numeric operands and evaluates + * to their difference. + * + * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal + * connective and should never be treated as a rule and thus does not need a name. + * + * @author mka + * + */ +public class NumericMinusConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICMINUS"; + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericMinusConnective(NumericResult leftOperand, NumericResult rightOperand) { + super(); + this.name = NAME; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java index 204afe7bc..513670374 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java @@ -32,7 +32,7 @@ public class NumericNotEqualConnective extends UnaryConnective { * Constructor for unnamed rule. * @param operand the operand */ - public NumericNotEqualConnective(SemanticFilterTag operand) { + public NumericNotEqualConnective(NumericResult operand) { this(operand, null, null); } @@ -41,7 +41,7 @@ public NumericNotEqualConnective(SemanticFilterTag operand) { * @param operand the operand * @param defaultValue the default value */ - public NumericNotEqualConnective(SemanticFilterTag operand, Boolean defaultValue) { + public NumericNotEqualConnective(NumericResult operand, Boolean defaultValue) { this(operand, defaultValue, null); } @@ -50,7 +50,7 @@ public NumericNotEqualConnective(SemanticFilterTag operand, Boolean defaultValue * @param operand the operand * @param ruleName rule name */ - public NumericNotEqualConnective(SemanticFilterTag operand, String ruleName) { + public NumericNotEqualConnective(NumericResult operand, String ruleName) { this(operand, null, ruleName); } @@ -60,10 +60,10 @@ public NumericNotEqualConnective(SemanticFilterTag operand, String ruleName) { * @param defaultValue the default value * @param ruleName rule name */ - public NumericNotEqualConnective(SemanticFilterTag operand, Boolean defaultValue, String ruleName) { + public NumericNotEqualConnective(NumericResult operand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = operand; + this.operand = (SemanticFilterRule) operand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java new file mode 100644 index 000000000..4fe6f4092 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java @@ -0,0 +1,46 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A Numeric Plus Connective takes two numeric operands and evaluates + * to their sum. + * + * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal + * connective and should never be treated as a rule and thus does not need a name. + * + * @author mka + * + */ +public class NumericPlusConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICPLUS"; + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericPlusConnective(NumericResult leftOperand, NumericResult rightOperand) { + super(); + this.name = NAME; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericResult.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericResult.java new file mode 100644 index 000000000..9c06f47b2 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericResult.java @@ -0,0 +1,28 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Identifies rules that return a numeric result. + * + * @author mka + * + */ +public interface NumericResult { + + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java new file mode 100644 index 000000000..87924264e --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java @@ -0,0 +1,46 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * A Numeric Times Connective takes two numeric operands and evaluates + * to their product. + * + * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal + * connective and should never be treated as a rule and thus does not need a name. + * + * @author mka + * + */ +public class NumericTimesConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICTIMES"; + + /** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ + public NumericTimesConnective(NumericResult leftOperand, NumericResult rightOperand) { + super(); + this.name = NAME; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; + } + +} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java index dec5abec1..7cb48c6a8 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterTag.java @@ -28,7 +28,7 @@ * @author tik * */ -public class SemanticFilterTag extends SemanticFilterRule { +public class SemanticFilterTag extends SemanticFilterRule implements NumericResult { private String tag; /** If unset, defaults to 0. */ From ac1af70200f28e50b7f723aa0018c28fe275d767 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 29 Jul 2022 13:08:14 +0200 Subject: [PATCH 21/76] organize imports Signed-off-by: Max Kasperowski --- .../src/de/cau/cs/kieler/klighd/KlighdOptions.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index 9cbb1766e..fead2f59f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -16,9 +16,7 @@ */ package de.cau.cs.kieler.klighd; -import java.util.Collection; import java.util.EnumSet; -import java.util.List; import org.eclipse.elk.core.data.ILayoutMetaDataProvider; import org.eclipse.elk.core.data.LayoutOptionData; @@ -26,8 +24,6 @@ import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; -import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; -import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.labels.management.LabelManagementResult; import de.cau.cs.kieler.klighd.util.ExpansionAwareLayoutOption; From 5853dc5bdad85b2c032f80180c2223e753ed8ff3 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 29 Jul 2022 15:30:50 +0200 Subject: [PATCH 22/76] rename numeric connectives Signed-off-by: Max Kasperowski --- ...PlusConnective.java => NumericAdditionConnective.java} | 8 ++++---- ...idesConnective.java => NumericDivisionConnective.java} | 8 ++++---- ...nnective.java => NumericMultiplicationConnective.java} | 8 ++++---- ...sConnective.java => NumericSubtractionConnective.java} | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) rename plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/{NumericPlusConnective.java => NumericAdditionConnective.java} (78%) rename plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/{NumericDividesConnective.java => NumericDivisionConnective.java} (78%) rename plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/{NumericTimesConnective.java => NumericMultiplicationConnective.java} (77%) rename plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/{NumericMinusConnective.java => NumericSubtractionConnective.java} (78%) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java similarity index 78% rename from plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java rename to plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java index 4fe6f4092..566e1c733 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericPlusConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java @@ -17,7 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A Numeric Plus Connective takes two numeric operands and evaluates + * A Numeric Addition Connective takes two numeric operands and evaluates * to their sum. * * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal @@ -26,8 +26,8 @@ * @author mka * */ -public class NumericPlusConnective extends BinaryConnective implements NumericResult { - protected static final String NAME = "NUMERICPLUS"; +public class NumericAdditionConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICADDITION"; /** * Constructor for named rule with default value. @@ -36,7 +36,7 @@ public class NumericPlusConnective extends BinaryConnective implements NumericRe * @param defaultValue the default value * @param ruleName rule name */ - public NumericPlusConnective(NumericResult leftOperand, NumericResult rightOperand) { + public NumericAdditionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); this.name = NAME; this.leftOperand = (SemanticFilterRule) leftOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java similarity index 78% rename from plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java rename to plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java index 514aae416..c7fb01c7d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDividesConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java @@ -17,7 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A Numeric Divides Connective takes two numeric operands and evaluates + * A Numeric Division Connective takes two numeric operands and evaluates * to their quotient. * * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal @@ -26,8 +26,8 @@ * @author mka * */ -public class NumericDividesConnective extends BinaryConnective implements NumericResult { - protected static final String NAME = "NUMERICDIVIDES"; +public class NumericDivisionConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICDIVISION"; /** * Constructor for named rule with default value. @@ -36,7 +36,7 @@ public class NumericDividesConnective extends BinaryConnective implements Numeri * @param defaultValue the default value * @param ruleName rule name */ - public NumericDividesConnective(NumericResult leftOperand, NumericResult rightOperand) { + public NumericDivisionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); this.name = NAME; this.leftOperand = (SemanticFilterRule) leftOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java similarity index 77% rename from plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java rename to plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java index 87924264e..38bdbb88c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericTimesConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java @@ -17,7 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A Numeric Times Connective takes two numeric operands and evaluates + * A Numeric Multiplication Connective takes two numeric operands and evaluates * to their product. * * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal @@ -26,8 +26,8 @@ * @author mka * */ -public class NumericTimesConnective extends BinaryConnective implements NumericResult { - protected static final String NAME = "NUMERICTIMES"; +public class NumericMultiplicationConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICMULTIPLICATION"; /** * Constructor for named rule with default value. @@ -36,7 +36,7 @@ public class NumericTimesConnective extends BinaryConnective implements NumericR * @param defaultValue the default value * @param ruleName rule name */ - public NumericTimesConnective(NumericResult leftOperand, NumericResult rightOperand) { + public NumericMultiplicationConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); this.name = NAME; this.leftOperand = (SemanticFilterRule) leftOperand; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java similarity index 78% rename from plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java rename to plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java index df875cc27..6b93635ee 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMinusConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java @@ -17,7 +17,7 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A Numeric Minus Connective takes two numeric operands and evaluates + * A Numeric Subtraction Connective takes two numeric operands and evaluates * to their difference. * * Operands must implement {@link NumericResult} and be a {@link SemanticFilterTag}. This connective is an internal @@ -26,8 +26,8 @@ * @author mka * */ -public class NumericMinusConnective extends BinaryConnective implements NumericResult { - protected static final String NAME = "NUMERICMINUS"; +public class NumericSubtractionConnective extends BinaryConnective implements NumericResult { + protected static final String NAME = "NUMERICSUBSTRACTION"; /** * Constructor for named rule with default value. @@ -36,7 +36,7 @@ public class NumericMinusConnective extends BinaryConnective implements NumericR * @param defaultValue the default value * @param ruleName rule name */ - public NumericMinusConnective(NumericResult leftOperand, NumericResult rightOperand) { + public NumericSubtractionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); this.name = NAME; this.leftOperand = (SemanticFilterRule) leftOperand; From d8296086ad6f0269c75a92f2207df87d949a4809 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 2 Aug 2022 16:03:02 +0200 Subject: [PATCH 23/76] make comparator connectives binary Signed-off-by: Max Kasperowski --- .../filtering/GreaterEqualsConnective.java | 85 ++++++++++--------- .../filtering/GreaterThanConnective.java | 37 ++++---- .../filtering/LessEqualsConnective.java | 85 ++++++++++--------- .../klighd/filtering/LessThanConnective.java | 37 ++++---- .../filtering/NumericEqualConnective.java | 37 ++++---- .../filtering/NumericNotEqualConnective.java | 85 ++++++++++--------- 6 files changed, 198 insertions(+), 168 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java index aab24ac28..bb0dc5a53 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java @@ -17,52 +17,57 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A GreaterEquals Connective takes one rule R and evaluates to true + * A GreaterEquals Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R.num >= correspondingTag.num. + * R1 >= R2 * * @author mka * */ -public class GreaterEqualsConnective extends UnaryConnective { +public class GreaterEqualsConnective extends BinaryConnective { protected static final String NAME = "GREATEREQUALS"; - /** - * Constructor for unnamed rule. - * @param operand the operand - */ - public GreaterEqualsConnective(NumericResult operand) { - this(operand, null, null); - } - - /** - * Constructor for unnamed rule with default value. - * @param operand the operand - * @param defaultValue the default value - */ - public GreaterEqualsConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); - } - - /** - * Constructor for named rule. - * @param operand the operand - * @param ruleName rule name - */ - public GreaterEqualsConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); - } - - /** - * Constructor for named rule with default value. - * @param operand the operand - * @param defaultValue the default value - * @param ruleName rule name - */ - public GreaterEqualsConnective(NumericResult operand, Boolean defaultValue, String ruleName) { - super(defaultValue, ruleName); - this.name = NAME; - this.operand = (SemanticFilterRule) operand; - } +/** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ +public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); +} + +/** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ +public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); +} + +/** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ +public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); +} + +/** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ +public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; +} } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java index b73caa03c..d6e44e2c4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -17,51 +17,56 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A GreaterThan Connective takes one rule R and evaluates to true + * A GreaterThan Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R.num > correspondingTag.num. - * @author tik + * R1 > R2 + * @author tik, mka * */ -public class GreaterThanConnective extends UnaryConnective { +public class GreaterThanConnective extends BinaryConnective { protected static final String NAME = "GREATERTHAN"; /** * Constructor for unnamed rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand */ - public GreaterThanConnective(NumericResult operand) { - this(operand, null, null); + public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); } /** * Constructor for unnamed rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value */ - public GreaterThanConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); + public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** * Constructor for named rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param ruleName rule name */ - public GreaterThanConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); + public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); } /** * Constructor for named rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value * @param ruleName rule name */ - public GreaterThanConnective(NumericResult operand, Boolean defaultValue, String ruleName) { + public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = (SemanticFilterRule) operand; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java index 788750c05..ce1a074f8 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -17,53 +17,58 @@ package de.cau.cs.kieler.klighd.filtering; /** - * * A LessEquals Connective takes one rule R and evaluates to true + * A LessEquals Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R.num <= correspondingTag.num. + * R1 <= R2 * * @author mka * */ -public class LessEqualsConnective extends UnaryConnective { +public class LessEqualsConnective extends BinaryConnective { protected static final String NAME = "LESSEQUALS"; - /** - * Constructor for unnamed rule. - * @param operand the operand - */ - public LessEqualsConnective(NumericResult operand) { - this(operand, null, null); - } - - /** - * Constructor for unnamed rule with default value. - * @param operand the operand - * @param defaultValue the default value - */ - public LessEqualsConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); - } - - /** - * Constructor for named rule. - * @param operand the operand - * @param ruleName rule name - */ - public LessEqualsConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); - } - - /** - * Constructor for named rule with default value. - * @param operand the operand - * @param defaultValue the default value - * @param ruleName rule name - */ - public LessEqualsConnective(NumericResult operand, Boolean defaultValue, String ruleName) { - super(defaultValue, ruleName); - this.name = NAME; - this.operand = (SemanticFilterRule) operand; - } +/** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ +public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); +} + +/** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ +public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); +} + +/** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ +public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); +} + +/** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ +public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; +} } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 7904aea60..d535b9bf7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -17,51 +17,56 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A LessThan Connective takes one rule R and evaluates to true + * A LessThan Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R.num < correspondingTag.num. - * @author tik + * R1 < R2 + * @author tik, mka * */ -public class LessThanConnective extends UnaryConnective { +public class LessThanConnective extends BinaryConnective { protected static final String NAME = "LESSTHAN"; /** * Constructor for unnamed rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand */ - public LessThanConnective(NumericResult operand) { - this(operand, null, null); + public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); } /** * Constructor for unnamed rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value */ - public LessThanConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); + public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** * Constructor for named rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param ruleName rule name */ - public LessThanConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); + public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); } /** * Constructor for named rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value * @param ruleName rule name */ - public LessThanConnective(NumericResult operand, Boolean defaultValue, String ruleName) { + public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = (SemanticFilterRule) operand; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java index 4b6a16cfc..f165d2879 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -17,51 +17,56 @@ package de.cau.cs.kieler.klighd.filtering; /** - * A NumericEqual Connective takes one rule R and evaluates to true + * A NumericEqual Connective takes two rules R1 and R2 and evaluates to true * iff - * R.num == correspondingTag.num. - * @author tik + * R1 == R2 + * @author tik, mka * */ -public class NumericEqualConnective extends UnaryConnective { +public class NumericEqualConnective extends BinaryConnective { protected static final String NAME = "NUMERICEQUAL"; /** * Constructor for unnamed rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand */ - public NumericEqualConnective(NumericResult operand) { - this(operand, null, null); + public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); } /** * Constructor for unnamed rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value */ - public NumericEqualConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); + public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); } /** * Constructor for named rule. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param ruleName rule name */ - public NumericEqualConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); + public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); } /** * Constructor for named rule with default value. - * @param operand the operand + * @param leftOperand left operand + * @param rightOperand right operand * @param defaultValue the default value * @param ruleName rule name */ - public NumericEqualConnective(NumericResult operand, Boolean defaultValue, String ruleName) { + public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.operand = (SemanticFilterRule) operand; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java index 513670374..aeffe5a25 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java @@ -17,53 +17,58 @@ package de.cau.cs.kieler.klighd.filtering; /** - * * A NumericNotEqual Connective takes one rule R and evaluates to true + * A NumericNotEqual Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R.num != correspondingTag.num. + * R1 != R2 * * @author mka * */ -public class NumericNotEqualConnective extends UnaryConnective { +public class NumericNotEqualConnective extends BinaryConnective { protected static final String NAME = "NUMERICNOTEQUAL"; - /** - * Constructor for unnamed rule. - * @param operand the operand - */ - public NumericNotEqualConnective(NumericResult operand) { - this(operand, null, null); - } - - /** - * Constructor for unnamed rule with default value. - * @param operand the operand - * @param defaultValue the default value - */ - public NumericNotEqualConnective(NumericResult operand, Boolean defaultValue) { - this(operand, defaultValue, null); - } - - /** - * Constructor for named rule. - * @param operand the operand - * @param ruleName rule name - */ - public NumericNotEqualConnective(NumericResult operand, String ruleName) { - this(operand, null, ruleName); - } - - /** - * Constructor for named rule with default value. - * @param operand the operand - * @param defaultValue the default value - * @param ruleName rule name - */ - public NumericNotEqualConnective(NumericResult operand, Boolean defaultValue, String ruleName) { - super(defaultValue, ruleName); - this.name = NAME; - this.operand = (SemanticFilterRule) operand; - } +/** + * Constructor for unnamed rule. + * @param leftOperand left operand + * @param rightOperand right operand + */ +public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + this(leftOperand, rightOperand, null, null); +} + +/** + * Constructor for unnamed rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + */ +public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + this(leftOperand, rightOperand, defaultValue, null); +} + +/** + * Constructor for named rule. + * @param leftOperand left operand + * @param rightOperand right operand + * @param ruleName rule name + */ +public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + this(leftOperand, rightOperand, null, ruleName); +} + +/** + * Constructor for named rule with default value. + * @param leftOperand left operand + * @param rightOperand right operand + * @param defaultValue the default value + * @param ruleName rule name + */ +public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + super(defaultValue, ruleName); + this.name = NAME; + this.leftOperand = leftOperand; + this.rightOperand = rightOperand; +} } From 9f96a571787aa5b4d08366b8566b04ef07ce867f Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 2 Aug 2022 16:24:35 +0200 Subject: [PATCH 24/76] add numeric constant Signed-off-by: Max Kasperowski --- .../filtering/NumericConstantConnective.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java new file mode 100644 index 000000000..e927a92b5 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java @@ -0,0 +1,68 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering; + +/** + * Numeric constant for building expressions. + * + * @author mka + * + */ +public class NumericConstantConnective extends NullaryConnective implements NumericResult { + +protected static final String NAME = "CONST"; +private Double num; + + /** + * Constructor for unnamed rule. + * @param num + */ + public NumericConstantConnective(Double num) { + this(null, null, num); + } + + /** + * Constructor for unnamed rule with default value. + * @param defaultValue + * @param num + */ + public NumericConstantConnective(Boolean defaultValue, Double num) { + this(defaultValue, null, num); + } + + /** + * Constructor for named rule. + * @param ruleName + * @param num + */ + public NumericConstantConnective(String ruleName, Double num) { + this(null, ruleName, num); + } + + /** + * Constructor for named rule with default value. + * @param defaultValue + * @param ruleName + * @param num + */ + public NumericConstantConnective(Boolean defaultValue, String ruleName, Double num) { + super(defaultValue, ruleName); + this.name = NAME; + this.num = num; + } + +} From e41ed10459eb20db93bf0f62a77c24424198a001 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 29 Aug 2022 13:18:05 +0200 Subject: [PATCH 25/76] add parser with tests and update some type checks that were missing Signed-off-by: Max Kasperowski --- .../META-INF/MANIFEST.MF | 1 + .../filtering/GreaterEqualsConnective.java | 12 +- .../filtering/GreaterThanConnective.java | 12 +- .../filtering/LessEqualsConnective.java | 12 +- .../klighd/filtering/LessThanConnective.java | 12 +- .../filtering/NumericConstantConnective.java | 5 + .../filtering/NumericEqualConnective.java | 12 +- .../filtering/NumericNotEqualConnective.java | 12 +- .../parser/SemanticFilterRuleParser.java | 296 ++++++++++++++++++ .../klighd/test/SemanticFilteringTest.java | 51 +++ 10 files changed, 389 insertions(+), 36 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java create mode 100644 test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SemanticFilteringTest.java diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index 2a48d88d7..2eb533508 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin Export-Package: de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.actions, de.cau.cs.kieler.klighd.filtering, + de.cau.cs.kieler.klighd.filtering.parser, de.cau.cs.kieler.klighd.internal;x-friends:="de.cau.cs.kieler.klighd.piccolo,de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.lsp", de.cau.cs.kieler.klighd.internal.macrolayout;x-friends:="de.cau.cs.kieler.klighd.ui,de.cau.cs.kieler.klighd.piccolo", de.cau.cs.kieler.klighd.internal.preferences;x-internal:=true, diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java index bb0dc5a53..090230ed8 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterEqualsConnective.java @@ -32,7 +32,7 @@ public class GreaterEqualsConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ -public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { +public GreaterEqualsConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -42,7 +42,7 @@ public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRul * @param rightOperand right operand * @param defaultValue the default value */ -public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { +public GreaterEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -52,7 +52,7 @@ public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRul * @param rightOperand right operand * @param ruleName rule name */ -public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { +public GreaterEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -63,11 +63,11 @@ public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRul * @param defaultValue the default value * @param ruleName rule name */ -public GreaterEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { +public GreaterEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java index d6e44e2c4..f5ed294b5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/GreaterThanConnective.java @@ -31,7 +31,7 @@ public class GreaterThanConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ - public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + public GreaterThanConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -41,7 +41,7 @@ public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param rightOperand right operand * @param defaultValue the default value */ - public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + public GreaterThanConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -51,7 +51,7 @@ public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param rightOperand right operand * @param ruleName rule name */ - public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + public GreaterThanConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -62,11 +62,11 @@ public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param defaultValue the default value * @param ruleName rule name */ - public GreaterThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + public GreaterThanConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java index ce1a074f8..fe16b303a 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -33,7 +33,7 @@ public class LessEqualsConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ -public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { +public LessEqualsConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -43,7 +43,7 @@ public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule r * @param rightOperand right operand * @param defaultValue the default value */ -public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { +public LessEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -53,7 +53,7 @@ public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule r * @param rightOperand right operand * @param ruleName rule name */ -public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { +public LessEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -64,11 +64,11 @@ public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule r * @param defaultValue the default value * @param ruleName rule name */ -public LessEqualsConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { +public LessEqualsConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index d535b9bf7..4f77983ee 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -31,7 +31,7 @@ public class LessThanConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ - public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + public LessThanConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -41,7 +41,7 @@ public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rig * @param rightOperand right operand * @param defaultValue the default value */ - public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + public LessThanConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -51,7 +51,7 @@ public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rig * @param rightOperand right operand * @param ruleName rule name */ - public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + public LessThanConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -62,11 +62,11 @@ public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rig * @param defaultValue the default value * @param ruleName rule name */ - public LessThanConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + public LessThanConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java index e927a92b5..5f3f9cbd5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericConstantConnective.java @@ -64,5 +64,10 @@ public NumericConstantConnective(Boolean defaultValue, String ruleName, Double n this.name = NAME; this.num = num; } + + @Override + public String toString() { + return this.name + "(" + num + ")"; + } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java index f165d2879..dafba6b9b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericEqualConnective.java @@ -31,7 +31,7 @@ public class NumericEqualConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ - public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { + public NumericEqualConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -41,7 +41,7 @@ public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param rightOperand right operand * @param defaultValue the default value */ - public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { + public NumericEqualConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -51,7 +51,7 @@ public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param rightOperand right operand * @param ruleName rule name */ - public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { + public NumericEqualConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -62,11 +62,11 @@ public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule * @param defaultValue the default value * @param ruleName rule name */ - public NumericEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { + public NumericEqualConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java index aeffe5a25..1e832e6f2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericNotEqualConnective.java @@ -33,7 +33,7 @@ public class NumericNotEqualConnective extends BinaryConnective { * @param leftOperand left operand * @param rightOperand right operand */ -public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand) { +public NumericNotEqualConnective(NumericResult leftOperand, NumericResult rightOperand) { this(leftOperand, rightOperand, null, null); } @@ -43,7 +43,7 @@ public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterR * @param rightOperand right operand * @param defaultValue the default value */ -public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue) { +public NumericNotEqualConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue) { this(leftOperand, rightOperand, defaultValue, null); } @@ -53,7 +53,7 @@ public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterR * @param rightOperand right operand * @param ruleName rule name */ -public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) { +public NumericNotEqualConnective(NumericResult leftOperand, NumericResult rightOperand, String ruleName) { this(leftOperand, rightOperand, null, ruleName); } @@ -64,11 +64,11 @@ public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterR * @param defaultValue the default value * @param ruleName rule name */ -public NumericNotEqualConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, Boolean defaultValue, String ruleName) { +public NumericNotEqualConnective(NumericResult leftOperand, NumericResult rightOperand, Boolean defaultValue, String ruleName) { super(defaultValue, ruleName); this.name = NAME; - this.leftOperand = leftOperand; - this.rightOperand = rightOperand; + this.leftOperand = (SemanticFilterRule) leftOperand; + this.rightOperand = (SemanticFilterRule) rightOperand; } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java new file mode 100644 index 000000000..def06d934 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -0,0 +1,296 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering.parser; + +import static java.util.Map.entry; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Stack; +import java.util.StringTokenizer; + +import de.cau.cs.kieler.klighd.filtering.AndConnective; +import de.cau.cs.kieler.klighd.filtering.FalseConnective; +import de.cau.cs.kieler.klighd.filtering.GreaterEqualsConnective; +import de.cau.cs.kieler.klighd.filtering.GreaterThanConnective; +import de.cau.cs.kieler.klighd.filtering.LessEqualsConnective; +import de.cau.cs.kieler.klighd.filtering.LessThanConnective; +import de.cau.cs.kieler.klighd.filtering.LogicEqualConnective; +import de.cau.cs.kieler.klighd.filtering.NegationConnective; +import de.cau.cs.kieler.klighd.filtering.NumericAdditionConnective; +import de.cau.cs.kieler.klighd.filtering.NumericConstantConnective; +import de.cau.cs.kieler.klighd.filtering.NumericDivisionConnective; +import de.cau.cs.kieler.klighd.filtering.NumericEqualConnective; +import de.cau.cs.kieler.klighd.filtering.NumericMultiplicationConnective; +import de.cau.cs.kieler.klighd.filtering.NumericNotEqualConnective; +import de.cau.cs.kieler.klighd.filtering.NumericResult; +import de.cau.cs.kieler.klighd.filtering.NumericSubtractionConnective; +import de.cau.cs.kieler.klighd.filtering.OrConnective; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; +import de.cau.cs.kieler.klighd.filtering.TrueConnective; + +/** + * @author mka + * + */ +public class SemanticFilterRuleParser { + + private abstract class Node { + public String token; + // current return type of AST + // -1: unknown + // 0: boolean + // 1: numeric + public int type; + public Node(String token, int type) { + this.token = token; + this.type = type; + } + } + + private class OperatorNode extends Node { + private List children; + + public List getChildren() { return children; } + + public OperatorNode(String token, int type) { + super(token, type); + this.children = new ArrayList<>(); + } + public OperatorNode(String token, int type, List children) { + super(token, type); + this.children = children; + } + + public void addChild(Node child) { + this.children.add(child); + } + } + + private class OperandNode extends Node { + + public OperandNode(String token, int type) { + super(token, type); + } + } + + public class InvalidSyntaxException extends Exception { + + public InvalidSyntaxException(String message) { + super(message); + } + } + + private SemanticFilterRule convertAST(Node ast) throws InvalidSyntaxException { + try { + SemanticFilterRule result; + switch(ast.token) { + case "*": + result = new NumericMultiplicationConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "/": + result = new NumericDivisionConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "+": + result = new NumericAdditionConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "-": + result = new NumericSubtractionConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + // NUMERIC-TO-BOOLEAN + case "=": + if (ast.type == 0) { + result = new LogicEqualConnective( + convertAST(((OperatorNode)ast).getChildren().get(0)), + convertAST(((OperatorNode)ast).getChildren().get(1))); + } else { + result = new NumericEqualConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + } + break; + case "!=": + result = new NumericNotEqualConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case ">=": + result = new GreaterEqualsConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case ">": + result = new GreaterThanConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "<=": + result = new LessEqualsConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "<": + result = new LessThanConnective( + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(0)), + (NumericResult) convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + // BOOLEAN-TO-BOOLEAN + case "||": + result = new OrConnective( + convertAST(((OperatorNode)ast).getChildren().get(0)), + convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "&&": + result = new AndConnective( + convertAST(((OperatorNode)ast).getChildren().get(0)), + convertAST(((OperatorNode)ast).getChildren().get(1))); + break; + case "!": + result = new NegationConnective( + convertAST(((OperatorNode)ast).getChildren().get(0))); + break; + case "true": + result = new TrueConnective(); + break; + case "false": + result = new FalseConnective(); + default: + // variable or number + if (ast.token.charAt(0) == '$' || ast.token.charAt(0) == '#') { + result = new SemanticFilterTag(ast.token.substring(1)); + } else { + result = new NumericConstantConnective(Double.valueOf(ast.token)); + } + } + return result; + } catch (Exception e) { + throw new InvalidSyntaxException("Syntax error."); + } + } + + private static List OPERATORS = new ArrayList<>(Arrays.asList( + "*", "/", "+", "-", "=", "!=", ">=", ">", "<=", "<", "||", "&&", "!")); + private static Map PRECEDENCES = Map.ofEntries( + entry("*", 10), + entry("/", 10), + entry("+", 9), + entry("-", 9), + entry("=", 7), + entry("!=", 7), + entry(">=", 8), + entry(">", 8), + entry("<=", 8), + entry("<", 8), + entry("||", 3), + entry("&&", 4), + entry("!", 6)); + /** + * Parses a semantic filter rule expression and creates the abstract syntax tree i.e., {@link SemanticFilterRule}. + * @param ruleString expression + * @return AST + * @throws InvalidSyntaxException + */ + public SemanticFilterRule parse(String ruleString) throws InvalidSyntaxException { + + // Tokenize string + StringTokenizer tokenizer = new StringTokenizer(ruleString); + Stack operatorStack = new Stack<>(); + Stack outputStack = new Stack<>(); + + while (tokenizer.hasMoreTokens()) { + String token = tokenizer.nextToken(); + + if (OPERATORS.contains(token)) { + + while (!operatorStack.isEmpty() && !operatorStack.peek().token.equals("(") + && (PRECEDENCES.get(operatorStack.peek().token) > PRECEDENCES.get(token) + || PRECEDENCES.get(operatorStack.peek().token) == PRECEDENCES.get(token) + && !token.equals("!"))) { + popOperator(operatorStack, outputStack); + } + operatorStack.push(new OperatorNode(token,-1)); + + } else if (token.equals("(")) { + operatorStack.push(new OperatorNode(token, -1)); + } else if (token.equals(")")) { + if (operatorStack.isEmpty()) { + throw new InvalidSyntaxException("Mismatched parentheses."); + } + while (!operatorStack.peek().token.equals("(")) { + if (operatorStack.isEmpty()) { + throw new InvalidSyntaxException("Mismatched parentheses."); + } + popOperator(operatorStack, outputStack); + } + // discard final ( + operatorStack.pop(); + } else { + // Operand + if (token.startsWith("#") || token.equals("true") || token.equals("false")) { + outputStack.push(new OperandNode(token, 0)); + } else { + // number or variable starting with $ + outputStack.push(new OperandNode(token, 1)); + } + } + } + // pop remaining operators + while (!operatorStack.isEmpty()) { + popOperator(operatorStack, outputStack); + } + + return convertAST(outputStack.pop()); + } + + private void popOperator(Stack operatorStack, Stack outputStack) throws InvalidSyntaxException { + // remove operator from operator stack and create new node on output stack + OperatorNode operator = operatorStack.pop(); + if (operator.token.equals("(") || operator.token.equals(")")) { + throw new InvalidSyntaxException("Mismatched parentheses."); + } + if (operator.token.equals("!")) { + Node operand = outputStack.pop(); + operator.addChild(operand); + operator.type = 0; + outputStack.push(operator); + } else { + // all other operators are binary + Node operand1 = outputStack.pop(); + Node operand2 = outputStack.pop(); + // reverse order to get correct final order + operator.addChild(operand2); + operator.addChild(operand1); + if (operand1.type != operand2.type) { + throw new InvalidSyntaxException("Mixed use of boolean and numeric types in operator " + operator.token + "."); + } + operator.type = operand1.type; + outputStack.push(operator); + } + } + +} diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SemanticFilteringTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SemanticFilteringTest.java new file mode 100644 index 000000000..ed61b3461 --- /dev/null +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SemanticFilteringTest.java @@ -0,0 +1,51 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import org.junit.Test; + +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.parser.SemanticFilterRuleParser; +import de.cau.cs.kieler.klighd.filtering.parser.SemanticFilterRuleParser.InvalidSyntaxException; + +/** + * Tests of classes in {@link de.cau.cs.kieler.klighd.filtering} + * + * @author mka + * + */ +public class SemanticFilteringTest { + + @Test + public void testSimpleExpressions() { + try { + SemanticFilterRule rule1 = new SemanticFilterRuleParser().parse("#tag1 && #tag2 || #tag3"); + assertEquals("OR(AND((tag=tag1, num=null), (tag=tag2, num=null)), (tag=tag3, num=null))", rule1.toString()); + SemanticFilterRule rule2 = new SemanticFilterRuleParser().parse("( #tag1 )"); + assertEquals("(tag=tag1, num=null)", rule2.toString()); + SemanticFilterRule rule3 = new SemanticFilterRuleParser().parse("$tag1 + $tag2 > 4"); + assertEquals("GREATERTHAN(NUMERICADDITION((tag=tag1, num=null), (tag=tag2, num=null)), CONST(4.0))", rule3.toString()); + } catch (InvalidSyntaxException e) { + System.out.println(e.getMessage()); + fail(); + } + } + +} From e21c273d6a9b72580f2f937cbcca96117059e163 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 29 Aug 2022 13:34:47 +0200 Subject: [PATCH 26/76] Update buildAndTest.yml --- .github/workflows/buildAndTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 00608bc63..0a76e7086 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -17,7 +17,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 11 distribution: adopt - name: Cache Maven packages uses: actions/cache@v2 From 56c84f4c6ea719ec7e7368b313397997576c932d Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 29 Aug 2022 13:36:52 +0200 Subject: [PATCH 27/76] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e24a5e08b..476b0e054 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 1.7.0 - 1.8 + 11 2.22.0 0.8.1 From b13abc26410877e6bafec693d1dec2fd0c0455d4 Mon Sep 17 00:00:00 2001 From: fight4day Date: Mon, 29 Aug 2022 14:37:26 +0200 Subject: [PATCH 28/76] Rename --- .../src/de/cau/cs/kieler/klighd/util/KlighdProperties.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index b298d32c2..b17380e29 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -389,13 +389,13 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining whether this node should be rendered as a proxy. */ public static final IProperty PROXY_VIEW_RENDER_NODE_AS_PROXY = - new Property("de.cau.cs.kieler.klighd.proxy-view.renderNodeAsProxy", true); + new Property("de.cau.cs.kieler.klighd.proxyView.renderNodeAsProxy", true); /** * Property determining how a proxy of this node should be rendered. */ public static final IProperty> PROXY_VIEW_PROXY_RENDERING = - new Property>("de.cau.cs.kieler.klighd.proxy-view.proxyRendering", null); + new Property>("de.cau.cs.kieler.klighd.proxyView.proxyRendering", null); /** * Property determining depth of going into hierarchical off-screen nodes. @@ -405,7 +405,7 @@ public static boolean isSelectable(final EObject viewElement) { * Choose a value {@code x<0} to always show proxies for all layers. */ public static final IProperty PROXY_VIEW_HIERARCHICAL_OFF_SCREEN_DEPTH = - new Property("de.cau.cs.kieler.klighd.proxy-view.hierarchicalOffScreenDepth", 0); + new Property("de.cau.cs.kieler.klighd.proxyView.hierarchicalOffScreenDepth", 0); /** * Property determining an element's semantic filter tags. From 6c2b6e7380c90599572c2a5283e93852fd352693 Mon Sep 17 00:00:00 2001 From: fight4day Date: Mon, 29 Aug 2022 16:13:38 +0200 Subject: [PATCH 29/76] Wrote a util for parsing --- .../parser/SemanticFilterRuleParserUtil.java | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParserUtil.java diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParserUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParserUtil.java new file mode 100644 index 000000000..66ae95f99 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParserUtil.java @@ -0,0 +1,98 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2022 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + */ +package de.cau.cs.kieler.klighd.filtering.parser; + +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; +import de.cau.cs.kieler.klighd.filtering.SemanticFilterRuleUtil; +import de.cau.cs.kieler.klighd.filtering.parser.SemanticFilterRuleParser.InvalidSyntaxException; + +/** + * Util for easily parsing rules. + * + * @author tik + */ +public abstract class SemanticFilterRuleParserUtil { + + /** Instance of parser. Just one is enough. */ + private static final SemanticFilterRuleParser PARSER = new SemanticFilterRuleParser(); + + /** + * Parses a semantic filter rule expression and returns the {@link SemanticFilterRule}. + * + * @param ruleString + * The semantic filter rule expression + * @return The semantic filter rule + * @see SemanticFilterRuleParser#parse(String) + * @throws InvalidSyntaxException + */ + public static SemanticFilterRule parse(String ruleString) throws InvalidSyntaxException { + return PARSER.parse(ruleString); + } + + /** + * Parses a semantic filter rule expression and returns the {@link SemanticFilterRule} with + * given ruleName. + * + * @param ruleString + * The semantic filter rule expression + * @param ruleName + * The rule name + * @return The semantic filter rule + * @see SemanticFilterRuleParser#parse(String) + * @throws InvalidSyntaxException + */ + public static SemanticFilterRule parse(String ruleString, String ruleName) + throws InvalidSyntaxException { + return SemanticFilterRuleUtil.addRuleName(ruleName, PARSER.parse(ruleString)); + } + + /** + * Tries parsing a semantic filter rule expression. Returns the {@link SemanticFilterRule} or + * {@code null} if the syntax is invalid. + * + * @param ruleString + * The semantic filter rule expression + * @return The semantic filter rule or {@code null} if the syntax is invalid + * @see SemanticFilterRuleParser#parse(String) + */ + public static SemanticFilterRule tryParse(String ruleString) { + try { + return parse(ruleString); + } catch (InvalidSyntaxException e) { + return null; + } + } + + /** + * Tries parsing a semantic filter rule expression. Returns the {@link SemanticFilterRule} or + * {@code null} if the syntax is invalid. + * + * @param ruleString + * The semantic filter rule expression + * @param ruleName + * The rule name + * @return The semantic filter rule or {@code null} if the syntax is invalid + * @see SemanticFilterRuleParser#parse(String) + */ + public static SemanticFilterRule tryParse(String ruleString, String ruleName) { + try { + return parse(ruleString, ruleName); + } catch (InvalidSyntaxException e) { + return null; + } + } +} From 17c12374e4acd7c8042b4a874981f4de17c966d4 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Sat, 7 Jan 2023 00:29:12 +0100 Subject: [PATCH 30/76] github workflow: allow to run 'buildAndTest' for PRs to branch 'master' from forked repos --- .github/workflows/buildAndTest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 00608bc63..bb165134c 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -6,6 +6,9 @@ on: - '**' tags-ignore: - '**' + pull_request_target: # enables builds of PRs to branch 'master' from forked repos + branches: + - master workflow_dispatch: # enables manual triggering jobs: From 340b564d8714f1d94718760b6ce3ff28d9e4d53a Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 9 Jan 2023 15:13:22 +0100 Subject: [PATCH 31/76] github workflow: refined 'buildAndTest' workflow's PRs related trigger --- .github/workflows/buildAndTest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index bb165134c..bb0adeea4 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -7,6 +7,7 @@ on: tags-ignore: - '**' pull_request_target: # enables builds of PRs to branch 'master' from forked repos + types: [opened, reopened] # don't fire on 'synchronize', as that is covered by 'push'; default value is '[opened, synchronize, reopened]' branches: - master workflow_dispatch: # enables manual triggering From 91d77aedfda9b5a4628792613b439234753b54da Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 9 Jan 2023 19:16:12 +0100 Subject: [PATCH 32/76] github workflow: another much smarter definition of the 'buildAndTest' workflow's PRs related trigger --- .github/workflows/buildAndTest.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index bb0adeea4..b1596cd3f 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -6,16 +6,20 @@ on: - '**' tags-ignore: - '**' - pull_request_target: # enables builds of PRs to branch 'master' from forked repos - types: [opened, reopened] # don't fire on 'synchronize', as that is covered by 'push'; default value is '[opened, synchronize, reopened]' + pull_request_target: # enables builds of PRs to branch 'master' from forked repos, with the workflow being taken from the target revision, i.e. the 'master' branch branches: - master workflow_dispatch: # enables manual triggering jobs: build: + # suppress triggering this job on 'synchronize' events of PR's (i.e. branch updates) within the same repo, as that is covered by 'push' already, but fire on updates of PRs coming from outside + if: github.event_name != 'pull_request_target' || github.event.action != 'synchronize' || github.event.pull_request.base.repo.id != github.event.pull_request.head.repo.id runs-on: ubuntu-latest steps: +# this provides some extremly helpful insight into the meta data of the current execution, see also https://docs.github.com/en/actions/learn-github-actions/contexts#github-context and https://stackoverflow.com/questions/70104600/complete-list-of-github-actions-contexts +# - name: Dump GitHub context +# run: echo '${{ toJSON(github) }}' - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1.0.1 - name: Set up JDK From 2cf449450fe1d5d4aa062d5c42e4315f2d40518e Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Tue, 20 Dec 2022 11:24:35 +0100 Subject: [PATCH 33/76] klighd.piccolo.batik: trimmed compile classpath to those jars being actually required by our code, fixes #97 This avoids the 'The package org.w3c.dom is accessible from more than one module: , java.xml' error that is due to fact that classes of the 'org.w3c.dom' package are part of the JDK since Java9 (in module 'java.xml'), and also part of the packaged batik 1.7 distribution. At runtime classes of the JDK/JRE will take precedence (root class loader is asked first), so their counterparts in the provided jar won't be loaded. --- .../.classpath | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath index b48ccfc73..711341e8d 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath @@ -1,30 +1,12 @@ - - - - - - - - - - - - - - - - - - From 6584c595ebe99b721e0958ce07c9d1bbe69e86f5 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Tue, 20 Dec 2022 12:54:58 +0100 Subject: [PATCH 34/76] =?UTF-8?q?build:=20increased=20target=20platform=20?= =?UTF-8?q?to=20eclipse=20release=202021-06,=20which=20brings=20support=20?= =?UTF-8?q?for=20platform=20'macosx.aarch=5F64=E2=80=98,=20contributes=20t?= =?UTF-8?q?o=20#100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * increased Xtext version to 2.25 as also brought by eclipse 2021-06 * updated the various target platform definitions: switched to orbit release R20210223232630, since R20210602031627 brings 'com.google.inject:5.0.1' that I wanna exclude for now * updated the update site p2 repo setup definitions * switched to JDK 11 for the build container, as eclipse 2021-06 requires JavaSE-11 at runtime, and running the tycho surefire tests requires the launch of an equinox container * increased Tycho version to 2.5, as the 'aarch64' platform is not handled or broken in earlier versions, had to increase the version of 'org.jboss.tools.tycho-plugins:repository-utils' consistently because of an internal failure of v1.0.0 with Tycho v2.5 fixup targetplatform --- .github/workflows/buildAndTest.yml | 2 +- .../category.xml | 6 +++--- .../de.cau.cs.kieler.klighd.repository/pom.xml | 14 ++++++++++---- ...eler.klighd.targetplatform-elkNightly.target | 6 +++--- ...ghd.targetplatform-piccolo-elkNightly.target | 6 +++--- ....kieler.klighd.targetplatform-piccolo.target | 6 +++--- ...e.cau.cs.kieler.klighd.targetplatform.target | 6 +++--- pom.xml | 17 ++++++++++++++--- 8 files changed, 40 insertions(+), 23 deletions(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index b1596cd3f..4f8cc8f96 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -25,7 +25,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 11 distribution: adopt - name: Cache Maven packages uses: actions/cache@v2 diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index 3478191f4..2617736d5 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 6f2ddc983..63d88d068 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -32,10 +32,16 @@ which has been built meanwhile, doesn't work properly yet, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708#c34 so we have to stick to this plug-in --> + org.jboss.tools.tycho-plugins repository-utils - 1.0.0 + 2.5.0 generate-facade @@ -46,17 +52,17 @@ - https://download.eclipse.org/releases/2020-06/ + https://download.eclipse.org/releases/2021-06/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ https://download.eclipse.org/elk/updates/releases/0.8.1/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/ + https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/ https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 4ee5aacc6..b78d8fac2 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index ce981af0f..0e6e56c8e 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index 08f46ce70..9c7d6f0bd 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 6de8e5d65..0ef65c6da 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/pom.xml b/pom.xml index e24a5e08b..3def1d66f 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,8 @@ - 1.7.0 - 1.8 - 2.22.0 + 2.5.0 + 2.25.0 0.8.1 @@ -66,6 +65,13 @@ UTF-8 UTF-8 + + 1.8 + + + + -ea @@ -202,6 +208,11 @@ cocoa x86_64 + + macosx + cocoa + aarch64 + From 7be8d36db3904f10d7653e9d22772898ba6fc749 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Wed, 21 Dec 2022 19:48:26 +0100 Subject: [PATCH 35/76] klighd.test, klighd.piccolo.test: refinements in 'ViewChangedNotificationTest' to pass on linux again (font size diffs :-/ ), made 'FreeHEPSVGOffscreenRenderingTest' more robust wrt. non-determinisms caused by hash maps and the like, fixes #132 * dropped dependency to Xbase from 'kieler.kgraph.text' & '.ide', added JDT-free binding of 'IAllContainersState' in KGraphUiModule in 'kieler.kgraph.text.ui' --- .../META-INF/MANIFEST.MF | 6 +- .../kieler/kgraph/text/ui/KGraphUiModule.java | 6 + .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 +- .../FreeHEPSVGOffscreenRenderingTest.launch | 19 +- .../HighlightedEdgeToForegroundTest.launch | 206 ++++++++++++++---- .../FreeHEPSVGOffscreenRenderingTest.xtend | 82 +++++-- .../ViewChangedNotificationTest.launch | 204 +++++++++++++---- .../test/ViewChangedNotificationTest.java | 37 +++- 9 files changed, 439 insertions(+), 124 deletions(-) diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF index 547b97718..70f3ee94d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF @@ -7,9 +7,11 @@ Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.kgraph.text, org.eclipse.xtext.ide, - org.eclipse.xtext.xbase.ide + com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro Export-Package: de.cau.cs.kieler.kgraph.text.ide, de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr, de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr.internal Automatic-Module-Name: de.cau.cs.kieler.kgraph.text.ide - diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/KGraphUiModule.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/KGraphUiModule.java index a4d0bfe17..590d2a86f 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/KGraphUiModule.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/KGraphUiModule.java @@ -17,6 +17,9 @@ package de.cau.cs.kieler.kgraph.text.ui; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.xtext.resource.containers.IAllContainersState; + +import com.google.inject.Provider; /** * Use this class to register components to be used within the IDE. @@ -37,4 +40,7 @@ public KGraphUiModule(final AbstractUIPlugin plugin) { super(plugin); } + public Provider provideIAllContainersState() { + return org.eclipse.xtext.ui.shared.Access.getWorkspaceProjectsState(); + } } diff --git a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF index 9bcb637e6..b1a234bc5 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtext.util, org.antlr.runtime, org.eclipse.xtext.xbase.lib, - org.eclipse.xtext.xbase, org.eclipse.emf.ecore, org.eclipse.emf.common, org.eclipse.core.resources, diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF index 4d84614c1..63330c7d5 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD Piccolo2D Binding Tests Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.test;singleton:=true Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, org.eclipse.xtext.xbase.lib;bundle-version="2.4.2", diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch index fe0958f14..3a6c88b70 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch @@ -39,16 +39,17 @@ + + - - + - - + + @@ -63,9 +64,12 @@ + + + @@ -110,13 +114,17 @@ + + + + @@ -126,11 +134,9 @@ - - @@ -151,6 +157,7 @@ + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch index 14f807e0f..1eaf256d3 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch @@ -1,45 +1,167 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/freehep/FreeHEPSVGOffscreenRenderingTest.xtend b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/freehep/FreeHEPSVGOffscreenRenderingTest.xtend index 2ad88dccd..0b3c35e14 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/freehep/FreeHEPSVGOffscreenRenderingTest.xtend +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/freehep/FreeHEPSVGOffscreenRenderingTest.xtend @@ -29,11 +29,14 @@ import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil import de.cau.cs.kieler.klighd.krendering.KRenderingFactory import de.cau.cs.kieler.klighd.microlayout.PlacementUtil import de.cau.cs.kieler.klighd.piccolo.export.SVGOffscreenRenderer +import de.cau.cs.kieler.klighd.util.KlighdProperties import de.cau.cs.kieler.klighd.util.KlighdSemanticDiagramData import de.cau.cs.kieler.klighd.util.KlighdSynthesisProperties import java.io.ByteArrayOutputStream import java.util.EnumSet import java.util.regex.Pattern +import org.eclipse.elk.core.math.ElkPadding +import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.PortConstraints import org.eclipse.elk.core.options.PortLabelPlacement import org.eclipse.elk.core.options.PortSide @@ -53,10 +56,10 @@ import static extension org.junit.Assert.assertEquals /** * @author chsch */ - @FixMethodOrder(JVM) + @FixMethodOrder(NAME_ASCENDING) class FreeHEPSVGOffscreenRenderingTest { - extension KRenderingFactory = KRenderingFactory.eINSTANCE + static extension KRenderingFactory = KRenderingFactory.eINSTANCE @BeforeClass def static void initDisplay() { @@ -537,16 +540,17 @@ class FreeHEPSVGOffscreenRenderingTest { - def equalsSVGof(CharSequence expectation, (KNode) => void viewModelBuilder) { - expectation.equalsSVGof(viewModelBuilder, false) + def static equalsSVGof(CharSequence expectation, (KNode) => void viewModelBuilder) { + expectation.equalsSVGof(viewModelBuilder, false, false) } - def equalsSVGwithTextLengthsOf(CharSequence expectation, (KNode) => void viewModelBuilder) { - expectation.equalsSVGof(viewModelBuilder, true) + def static equalsSVGwithTextLengthsOf(CharSequence expectation, (KNode) => void viewModelBuilder) { + expectation.equalsSVGof(viewModelBuilder, false, true) } - def equalsSVGof(CharSequence expectation, (KNode) => void viewModelBuilder, boolean withTextLength) { + def static equalsSVGof(CharSequence expectation, (KNode) => void viewModelBuilder, boolean widthEdgesFirst, boolean withTextLength) { val root = KGraphUtil.createInitializedNode() + root.setProperty(CoreOptions.PADDING, new ElkPadding(10)) viewModelBuilder.apply(root) val output = new ByteArrayOutputStream() @@ -555,6 +559,7 @@ class FreeHEPSVGOffscreenRenderingTest { .setProperty(SVGOffscreenRenderer.GENERATOR, SVGOffscreenRenderer.GENERATOR_SVG_FREEHEP_EXTENDED) .setProperty(IOffscreenRenderer.TRANSPARENT_BACKGROUND, Boolean.TRUE) .setProperty(IOffscreenRenderer.SET_TEXT_LENGTHS, Boolean.valueOf(withTextLength)) + .setProperty(KlighdProperties.EDGES_FIRST, widthEdgesFirst) ) if (status.exception !== null) @@ -562,53 +567,54 @@ class FreeHEPSVGOffscreenRenderingTest { OK_STATUS.assertEquals(status) - expectation.toString.assertEquals( - output.toString.trimMetaInfos.maskFontSizeAndTextYPos + expectation.toString.sortProperties().assertEquals( + output.toString.trimMetaInfos.sortProperties().maskFontSizeAndTextYPos ) } static val END_OF_HEADER_MARKER = '' + static val END_OF_SVG_MARKER_LENGTH = ''.length - def trimMetaInfos(String svg) { + def static trimMetaInfos(String svg) { val trimmed = svg.trim switch endOfHeader : trimmed.indexOf(END_OF_HEADER_MARKER) + END_OF_HEADER_MARKER.length { - case trimmed.length > endOfHeader + 6: trimmed.substring(endOfHeader, trimmed.length - 6).trim + Klighd.LINE_SEPARATOR - case trimmed.length > endOfHeader: trimmed.substring(endOfHeader).trim + Klighd.LINE_SEPARATOR - default: trimmed + case trimmed.length > endOfHeader + END_OF_SVG_MARKER_LENGTH: trimmed.substring(endOfHeader, trimmed.length - END_OF_SVG_MARKER_LENGTH).trim + Klighd.LINE_SEPARATOR + case trimmed.length > endOfHeader: trimmed.substring(endOfHeader).trim + Klighd.LINE_SEPARATOR + default: trimmed } } static val P_FONT_SIZE = Pattern.compile('(font-size=")[^"]*(")') static val P_DY = Pattern.compile('(dy=")[^"]*(")') - static val P_TEXT_Y = Pattern.compile('($2') val textYMasked = P_TEXT_Y.matcher(fontSizeMasked).replaceAll('$1$2') P_DY.matcher(textYMasked).replaceAll('$1$2') } - def addKNodeWithSizeOf(KNode parent, float width, float height) { + def static addKNodeWithSizeOf(KNode parent, float width, float height) { val node = createInitializedNode node.setSize(width, height) parent.children += node node } - def addKPortWithSizeOf(KNode parent, float width, float height) { + def static addKPortWithSizeOf(KNode parent, float width, float height) { val port = createInitializedPort port.setSize(width, height) parent.ports += port port } - def addKRectangleWithStrokeOnlyColoring(KGraphElement kge) { + def static addKRectangleWithStrokeOnlyColoring(KGraphElement kge) { kge.data += createKRectangle kge } - def addKTextWithAssumedSizeOf(KLabel label, float width, float height) { + def static addKTextWithAssumedSizeOf(KLabel label, float width, float height) { createKText => [ label.data += it setProperty(KlighdInternalProperties.KLIGHD_TESTING_WIDTH, width) @@ -616,4 +622,42 @@ class FreeHEPSVGOffscreenRenderingTest { makePersistent // required as the PlacementUtil.getTestingTextSize(...) method inspects the list of persisted entries only ] } + + static val Pattern tagOrNonTag = Pattern.compile('<((?:[^<>]|<[^<>]*>)*)>|([^<]+)'); // a tag (group1) is enclosed in '<>' and may contain nested pairs of '<>' indicating the escapes of and ; non-tag content is captured as group2 + static val Pattern item = Pattern.compile('[^\\s=]+(\\=\\"[^\\"]*\\")?'); + + def static sortProperties(String input) { + input.lines().iterator().map[ line | + val matcher = tagOrNonTag.matcher(line); + val result = matcher.iterator.map[ + if (matcher.group(1).isNullOrEmpty) + matcher.group(2) + else + item.matcher(matcher.group(1)).iterator().toList().sortInplace[ + a, b | if (a.contains('=') && b.contains('=')) a.compareTo(b) else 0 + ].join('<', ' ', '>', [ it ]) + ].join(); + + // do some 'self testing' for each line to make sure we didn't swallow any characters, + // a diff of 1 is ok, as '..dfjskl"/>...' is converted to '..dfjskl" />...' by the above joining strategy + if (Math.abs(result.length() - line.length) > 1) + assertEquals('''Lengths differ («line.length» vs. «result.length»):''', line, result); + + return result; + + ].join(Klighd.LINE_SEPARATOR); + } + + def static java.util.Iterator iterator(java.util.regex.Matcher matcher) { + new java.util.Iterator() { + override hasNext() { + return matcher.find(); + } + + override next() { + return matcher.group(); + } + + } + } } diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch index 3e9cbb409..4067eb61c 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch @@ -1,45 +1,165 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java index 405db2ac9..4a90b7fa5 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java @@ -29,10 +29,13 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import org.junit.runners.MethodSorters; import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import de.cau.cs.kieler.klighd.IDiagramWorkbenchPart; @@ -46,6 +49,7 @@ import de.cau.cs.kieler.klighd.kgraph.KGraphElement; import de.cau.cs.kieler.klighd.kgraph.KNode; import de.cau.cs.kieler.klighd.piccolo.viewer.PiccoloViewer; +import de.cau.cs.kieler.klighd.syntheses.DiagramLayoutOptions; import de.cau.cs.kieler.klighd.util.KlighdSynthesisProperties; import de.cau.cs.kieler.klighd.viewers.ContextViewer; @@ -58,6 +62,8 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ViewChangedNotificationTest { + private static final boolean DEBUG_SYS_OUT = false; + private Shell shell = null; private ViewContext viewContext = null; private AssertionError failure = null; @@ -69,7 +75,7 @@ public class ViewChangedNotificationTest { public static void lookForElkLayered() { Assert.assertNotNull( "ELK Layered is not on the classpath, but it's required for properly executing the tests.", - LayoutMetaDataService.getInstance().getAlgorithmDataBySuffix("org.eclipse.elk.layered") + LayoutMetaDataService.getInstance().getAlgorithmDataBySuffix(DiagramLayoutOptions.ELK_LAYERED) ); } @@ -83,7 +89,7 @@ public void prepare() { // which is too high for some tests below 100, so I request the modelless style here // however, on linux the SWT.RESIZE flag is required to successfully run the tests 4-5b, so... shell = new Shell(Display.getDefault(), SWT.RESIZE); - shell.setSize(300, 200); + shell.setSize(400, 200); shell.setLocation(100, 100); shell.setLayout(new FillLayout()); @@ -93,7 +99,7 @@ public void prepare() { new ContextViewer(shell).setModel(viewContext, true); heightDelta = 200 - viewContext.getViewer().getControl().getSize().y; - shell.setSize(300, 200 + heightDelta); + shell.setSize(400, 200 + heightDelta); viewContext.update(null); @@ -106,6 +112,9 @@ public void prepare() { failure = null; } + @Rule + public TestName name= new TestName(); + /** * Process queued tasks delegated to the Display's thread, which is the one the tests are * executed, and clean up the employed {@link Shell}. @@ -158,8 +167,14 @@ public void run() { public void viewChanged(final ViewChange change) { - final Iterable l = Sets.newHashSet( - countNodesOnly ? change.visibleDiagramNodes() : change.visibleDiagramElements()); + final Iterable l = Sets.newLinkedHashSet( + () -> countNodesOnly ? Iterators.filter(change.visibleDiagramNodes(), KGraphElement.class) : change.visibleDiagramElements() + ); + + if (DEBUG_SYS_OUT) { + System.out.println(name.getMethodName() + ":\n" + String.join("\n", Iterables.transform(l, e -> e.toString()))); + } + try { MatcherAssert.assertThat("", l, IsIterableWithSize.iterableWithSize(expectedElementsNumber)); @@ -264,10 +279,10 @@ public void test04b() { public void test05() { viewContext.setZoomStyle(ZoomStyle.NONE); expectedElementsNumber = 4; - if (Klighd.IS_WINDOWS) - shell.setSize(150, shell.getSize().y); - else + if (Klighd.IS_MACOSX) shell.setSize(130, shell.getSize().y); + else + shell.setSize(140, shell.getSize().y); } /** @@ -278,9 +293,9 @@ public void test05b() { viewContext.setZoomStyle(ZoomStyle.NONE); countNodesOnly = false; expectedElementsNumber = 23; - if (Klighd.IS_WINDOWS) - shell.setSize(150, shell.getSize().y); - else + if (Klighd.IS_MACOSX) shell.setSize(130, shell.getSize().y); + else + shell.setSize(140, shell.getSize().y); } } From cb363e3902531b5fa0a912c62fed6b09d4095405 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 17 Nov 2022 14:40:07 +0100 Subject: [PATCH 36/76] Simplify classes in de.cau.cs.kieler.klighd.ui.printing.dialog --- .../ui/printing/dialog/ActionsBlock.java | 36 ++++----- .../ui/printing/dialog/AlignmentBlock.java | 19 ++--- .../ui/printing/dialog/CopiesBlock.java | 41 ++++------ .../ui/printing/dialog/KlighdPrintDialog.java | 6 +- .../ui/printing/dialog/OrientationBlock.java | 2 +- .../ui/printing/dialog/PrintPreviewTray.java | 52 +++++------- .../ui/printing/dialog/PrinterBlock.java | 42 ++++------ .../klighd/ui/printing/dialog/RangeBlock.java | 6 +- .../ui/printing/dialog/ScalingBlock.java | 79 +++++++------------ 9 files changed, 102 insertions(+), 181 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ActionsBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ActionsBlock.java index e7367bc61..58a26ed1e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ActionsBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ActionsBlock.java @@ -28,8 +28,7 @@ package de.cau.cs.kieler.klighd.ui.printing.dialog; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -80,29 +79,22 @@ public static Control createContents(final Composite parent, final KlighdPrintDi printPreview.setText(KlighdUIPrintingMessages.PrintDialog_Button_PrintPreview + arrows); printPreview.setEnabled(previewEnabled); - printPreview.addSelectionListener(new SelectionAdapter() { + printPreview.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> { + final PrintPreviewTray tray = printDialog.getTray(); - /** - * {@inheritDoc} - */ - @Override - public void widgetSelected(final SelectionEvent e) { - final PrintPreviewTray tray = printDialog.getTray(); + if (tray != null) { + printDialog.closeTray(); + printPreview.setText( + KlighdUIPrintingMessages.PrintDialog_Button_PrintPreview + OPEN_ARROWS); + DiagramPrintOptions.setInitiallyShowPreview(false); - if (tray != null) { - printDialog.closeTray(); - printPreview.setText( - KlighdUIPrintingMessages.PrintDialog_Button_PrintPreview + OPEN_ARROWS); - DiagramPrintOptions.setInitiallyShowPreview(false); - - } else { - printDialog.openPreview(); - printPreview.setText( - KlighdUIPrintingMessages.PrintDialog_Button_PrintPreview + CLOSE_ARROWS); - DiagramPrintOptions.setInitiallyShowPreview(true); - } + } else { + printDialog.openPreview(); + printPreview.setText( + KlighdUIPrintingMessages.PrintDialog_Button_PrintPreview + CLOSE_ARROWS); + DiagramPrintOptions.setInitiallyShowPreview(true); } - }); + })); return printPreview; } diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java index 5a447c377..ba870a45e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java @@ -25,9 +25,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; import de.cau.cs.kieler.klighd.ui.printing.KlighdUIPrintingMessages; import de.cau.cs.kieler.klighd.ui.printing.PrintOptions; @@ -82,24 +80,21 @@ public static Group createContents(final Composite parent, final DataBindingCont final Realm realm = bindings.getValidationRealm(); final IObservableValue centerHorValue = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_CENTER_HORIZONTALLY) + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_CENTER_HORIZONTALLY) .observe(realm, options); ISWTObservableValue horObservation = WidgetProperties.selection().observe(centerHorizontally); bindings.bindValue(horObservation, centerHorValue); - final IObservableValue centerVerValue = BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_CENTER_VERTICALLY) + final IObservableValue centerVerValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_CENTER_VERTICALLY) .observe(realm, options); ISWTObservableValue vertObservation = WidgetProperties.selection().observe(centerVertically); bindings.bindValue(vertObservation, centerVerValue); - result.addListener(SWT.Dispose, new Listener() { - - public void handleEvent(final Event event) { - // while the SWTObservableValues are disposed while disposing the corresponding widgets - // the Beans-based ones should be disposed explicitly - centerHorValue.dispose(); - centerVerValue.dispose(); - } + result.addListener(SWT.Dispose, event -> { + // while the SWTObservableValues are disposed while disposing the corresponding widgets + // the Beans-based ones should be disposed explicitly + centerHorValue.dispose(); + centerVerValue.dispose(); }); return result; diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java index c127d678f..f1d97db3c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java @@ -31,8 +31,6 @@ import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; -import org.eclipse.core.databinding.observable.value.IValueChangeListener; -import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.resource.ImageDescriptor; @@ -41,10 +39,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Spinner; import org.eclipse.swt.widgets.Widget; @@ -106,7 +102,7 @@ public static Group createContents(final Composite parent, final DataBindingCont final Spinner copiesSpinner = DialogUtil.spinner(result, 1, Integer.MAX_VALUE); final IObservableValue copiesValue = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_COPIES).observe(realm, options); + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_COPIES).observe(realm, options); ISWTObservableValue copiesObservation = WidgetProperties.selection().observe(copiesSpinner); bindings.bindValue(copiesObservation, copiesValue); @@ -123,34 +119,27 @@ public static Group createContents(final Composite parent, final DataBindingCont collateImageLabel.setImage(collateCheck.getSelection() ? collateOnImage : collateOffImage); final IObservableValue collateValue = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_COLLATE).observe(realm, options); + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_COLLATE).observe(realm, options); ISWTObservableValue collateObservation = WidgetProperties.selection().observe((Widget) collateCheck); bindings.bindValue(collateObservation, collateValue); - collateValue.addValueChangeListener(new IValueChangeListener() { - - public void handleValueChange(final ValueChangeEvent event) { - - // set image according to collate state - if (((Boolean) event.getObservableValue().getValue()).booleanValue()) { - collateImageLabel.setImage(collateOnImage); - } else { - collateImageLabel.setImage(collateOffImage); - } + collateValue.addValueChangeListener(event -> { + // set image according to collate state + if (((Boolean) event.getObservableValue().getValue()).booleanValue()) { + collateImageLabel.setImage(collateOnImage); + } else { + collateImageLabel.setImage(collateOffImage); } }); - result.addListener(SWT.Dispose, new Listener() { + result.addListener(SWT.Dispose, event -> { + collateOnImage.dispose(); + collateOffImage.dispose(); - public void handleEvent(final Event event) { - collateOnImage.dispose(); - collateOffImage.dispose(); - - // while the SWTObservableValues are disposed while disposing the corresponding widgets - // the Beans-based ones should be disposed explicitly - copiesValue.dispose(); - collateValue.dispose(); - } + // while the SWTObservableValues are disposed while disposing the corresponding widgets + // the Beans-based ones should be disposed explicitly + copiesValue.dispose(); + collateValue.dispose(); }); if (Klighd.IS_MACOSX) { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java index 7a4015ae9..04a26aa13 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java @@ -204,11 +204,7 @@ protected Control createDialogArea(final Composite parent) { // this asyncExec is employed in order to let the main dialog get build up properly; // for some reason its layout gets heavily corrupted if the preview is opened directly // some good soul might investigate this some day... - parent.getDisplay().asyncExec(new Runnable() { - public void run() { - openPreview(); - } - }); + parent.getDisplay().asyncExec(this::openPreview); } return result; diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java index 8515a96b7..44d124c09 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java @@ -88,7 +88,7 @@ public static Group createContents(final Composite parent, final DataBindingCont ISWTObservableValue observeLandscape = WidgetProperties.selection().observe(landscapeRadio); orientationGroupValue.addOption(PrinterData.LANDSCAPE, observeLandscape); - IObservableValue observeOrientation = BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_ORIENTATION) + IObservableValue observeOrientation = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_ORIENTATION) .observe(realm, options); bindings.bindValue(orientationGroupValue, observeOrientation); diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java index ec3610f76..8040332ef 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java @@ -26,7 +26,6 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IValueChangeListener; -import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.dialogs.DialogTray; @@ -37,9 +36,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import de.cau.cs.kieler.klighd.DiagramExportConfig; import de.cau.cs.kieler.klighd.ui.printing.DiagramPrintOptions; @@ -104,65 +101,57 @@ public Control createContents(final Composite parent) { updateComposite(); - final IValueChangeListener listener = new IValueChangeListener() { - - public void handleValueChange(final ValueChangeEvent event) { - updateComposite(); - } - }; + final IValueChangeListener listener = event -> updateComposite(); ISWTObservableValue observedSize = WidgetProperties.size().observe(body); final IObservableValue delayedResize = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedSize); delayedResize.addValueChangeListener(listener); IObservableValue observedData = - BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_PRINTER_DATA) + BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PRINTER_DATA) .observe(realm, options); final IObservableValue delayedPrinterData = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedData); delayedPrinterData.addValueChangeListener(listener); - IObservableValue observedScale = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_SCALE_FACTOR) + IObservableValue observedScale = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_SCALE_FACTOR) .observe(realm, options); final IObservableValue delayedScale = Observables.observeDelayedValue(OBSERVABLE_DELAY,observedScale); delayedScale.addValueChangeListener(listener); - IObservableValue observedPagesWide = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_PAGES_WIDE) + IObservableValue observedPagesWide = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_WIDE) .observe(realm, options); final IObservableValue delayedPagesWide = Observables.observeDelayedValue(OBSERVABLE_DELAY,observedPagesWide); delayedPagesWide.addValueChangeListener(listener); - IObservableValue observedScaleTall = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_PAGES_TALL) + IObservableValue observedScaleTall = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_TALL) .observe(realm, options); final IObservableValue delayedPagesTall = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedScaleTall); delayedPagesTall.addValueChangeListener(listener); - IObservableValue observedHorCenter = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_CENTER_HORIZONTALLY) + IObservableValue observedHorCenter = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_CENTER_HORIZONTALLY) .observe(realm, options); final IObservableValue delayedHorCentered = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedHorCenter); delayedHorCentered.addValueChangeListener(listener); - IObservableValue observedVertCenter = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_CENTER_VERTICALLY) + IObservableValue observedVertCenter = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_CENTER_VERTICALLY) .observe(realm, options); final IObservableValue delayedVerCentered = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedVertCenter); delayedVerCentered.addValueChangeListener(listener); - IObservableValue observedOrientation = BeanProperties.value(options.getClass().asSubclass(DiagramPrintOptions.class), PrintOptions.PROPERTY_ORIENTATION) + IObservableValue observedOrientation = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_ORIENTATION) .observe(realm, options); final IObservableValue delayedOrientation = Observables.observeDelayedValue(OBSERVABLE_DELAY, observedOrientation); delayedOrientation.addValueChangeListener(listener); - body.addListener(SWT.Dispose, new Listener() { - - public void handleEvent(final Event event) { - delayedResize.dispose(); - delayedPrinterData.dispose(); - delayedScale.dispose(); - delayedPagesWide.dispose(); - delayedPagesTall.dispose(); - delayedHorCentered.dispose(); - delayedVerCentered.dispose(); - delayedOrientation.dispose(); - } + body.addListener(SWT.Dispose, event -> { + delayedResize.dispose(); + delayedPrinterData.dispose(); + delayedScale.dispose(); + delayedPagesWide.dispose(); + delayedPagesTall.dispose(); + delayedHorCentered.dispose(); + delayedVerCentered.dispose(); + delayedOrientation.dispose(); }); return body; @@ -253,12 +242,7 @@ public void updateComposite() { final Label l = new Label(composite, SWT.NULL); l.setImage(pageImg); - l.addListener(SWT.Dispose, new Listener() { - - public void handleEvent(final Event event) { - pageImg.dispose(); - } - }); + l.addListener(SWT.Dispose, event -> pageImg.dispose()); } } } diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java index 82cd1085b..e9129185d 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java @@ -34,16 +34,13 @@ import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.printing.PrintDialog; import org.eclipse.swt.printing.PrinterData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import de.cau.cs.kieler.klighd.ui.printing.KlighdUIPrintingMessages; import de.cau.cs.kieler.klighd.ui.printing.PrintOptions; @@ -105,7 +102,7 @@ public static Group createContents(final Composite parent, final DataBindingCont protected String calculate() { final PrinterData data = (PrinterData) BeanProperties - .value( options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_PRINTER_DATA) + .value( PrintOptions.class, PrintOptions.PROPERTY_PRINTER_DATA) .observe(realm, options) .getValue(); if (data.printToFile) { @@ -123,31 +120,22 @@ protected String calculate() { DialogUtil.button(result, KlighdUIPrintingMessages.PrintDialog_PrinterSettings); propertiesButton.setEnabled(true); - propertiesButton.addSelectionListener(new SelectionAdapter() { + propertiesButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> { + // Open the system's native print dialog to gather printer specific settings. + // If no valid setting are returned (e.g. the user cancels the dialog), + // nothing is changed. + final PrintDialog systemPrintDialog = printDialog.getNativePrintDialog(); + systemPrintDialog.setPrinterData(options.getPrinterData()); - @Override - public void widgetSelected(final SelectionEvent e) { - // Open the system's native print dialog to gather printer specific settings. - // If no valid setting are returned (e.g. the user cancels the dialog), - // nothing is changed. - final PrintDialog systemPrintDialog = printDialog.getNativePrintDialog(); - systemPrintDialog.setPrinterData(options.getPrinterData()); - - final PrinterData data = systemPrintDialog.open(); - if (data != null) { - options.setPrinterData(data); - } + final PrinterData data = systemPrintDialog.open(); + if (data != null) { + options.setPrinterData(data); } - }); + })); - result.addListener(SWT.Dispose, new Listener() { - - public void handleEvent(final Event event) { - // while the SWTObservableValues are disposed while disposing the corresponding widgets - // the ComputedValue should be disposed explicitly - computedValue.dispose(); - } - }); + // while the SWTObservableValues are disposed while disposing the corresponding widgets + // the ComputedValue should be disposed explicitly + result.addListener(SWT.Dispose, event -> computedValue.dispose()); return result; } diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java index b27c6962f..ca71f88c6 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java @@ -91,7 +91,7 @@ public static Group createContents(final Composite parent, final DataBindingCont DialogUtil.layoutSpanHorizontal(allRadio, columns); final IObservableValue allValue = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_ALL_PAGES).observe(realm, options); + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_ALL_PAGES).observe(realm, options); ISWTObservableValue observedAllPages = WidgetProperties.selection().observe(allRadio); bindings.bindValue(observedAllPages, allValue); @@ -128,7 +128,7 @@ protected Boolean calculate() { final Text textFrom = DialogUtil.text(result, textWidth); final IObservableValue rangeFrom = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_RANGE_FROM).observe(realm, options); + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_RANGE_FROM).observe(realm, options); ISWTObservableValue observedModifiedTextFrom = WidgetProperties.text(SWT.Modify).observe(textFrom); bindings.bindValue(observedModifiedTextFrom, rangeFrom); ISWTObservableValue observedEnabledFrom = WidgetProperties.enabled().observe(textFrom); @@ -141,7 +141,7 @@ protected Boolean calculate() { final Text textTo = DialogUtil.text(result, textWidth); final IObservableValue rangeTo = - BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_RANGE_TO).observe(realm, options); + BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_RANGE_TO).observe(realm, options); ISWTObservableValue observedModifyTextTo = WidgetProperties.text(SWT.Modify).observe(textTo); bindings.bindValue(observedModifyTextTo, rangeTo); diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java index 8f2d0d14c..2a4c97af8 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java @@ -36,15 +36,12 @@ import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Spinner; import de.cau.cs.kieler.klighd.ui.printing.DiagramPrintOptions; @@ -150,70 +147,50 @@ public static Group createContents(final Composite parent, final DataBindingCont if (options instanceof DiagramPrintOptions) { dOptions = (DiagramPrintOptions) options; - oneToOneBtn.addSelectionListener(new SelectionAdapter() { + oneToOneBtn.addSelectionListener( + SelectionListener.widgetSelectedAdapter(e -> scaleOneToOne(dOptions))); - @Override - public void widgetSelected(final SelectionEvent e) { - scaleOneToOne(dOptions); - } - }); - - fitToPagesBtn.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(final SelectionEvent e) { - fitToPages(dOptions); - } - }); + fitToPagesBtn.addSelectionListener( + SelectionListener.widgetSelectedAdapter(e -> fitToPages(dOptions))); - adjustPagesBtn.addSelectionListener(new SelectionAdapter() { + adjustPagesBtn.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> { + // Calculate for both horizontal and vertical directions + // how many pages are necessary to fit the diagram in. - @Override - public void widgetSelected(final SelectionEvent e) { - // Calculate for both horizontal and vertical directions - // how many pages are necessary to fit the diagram in. + final PrintExporter exporter = dOptions.getExporter(); + final Dimension2D trimmedPrinterBounds = exporter.getTrimmedTileBounds(dOptions); + final Dimension2D diagramBounds = exporter.getDiagramBoundsIncludingTrim(); - final PrintExporter exporter = dOptions.getExporter(); - final Dimension2D trimmedPrinterBounds = exporter.getTrimmedTileBounds(dOptions); - final Dimension2D diagramBounds = exporter.getDiagramBoundsIncludingTrim(); + dOptions.setPagesWide((int) Math.ceil(diagramBounds.getWidth() + * dOptions.getScaleFactor() / trimmedPrinterBounds.getWidth())); - dOptions.setPagesWide((int) Math.ceil(diagramBounds.getWidth() - * dOptions.getScaleFactor() / trimmedPrinterBounds.getWidth())); - - dOptions.setPagesTall((int) Math.ceil(diagramBounds.getHeight() - * dOptions.getScaleFactor() / trimmedPrinterBounds.getHeight())); - } - }); + dOptions.setPagesTall((int) Math.ceil(diagramBounds.getHeight() + * dOptions.getScaleFactor() / trimmedPrinterBounds.getHeight())); + })); final Realm realm = bindings.getValidationRealm(); - final IObservableValue scalePercent = - BeanProperties.value(dOptions.getClass().asSubclass(DiagramPrintOptions.class), - PrintOptions.PROPERTY_SCALE_PERCENT).observe(realm, dOptions); + final IObservableValue scalePercent = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_SCALE_PERCENT) + .observe(realm, dOptions); ISWTObservableValue observerScaleSpinner = WidgetProperties.selection().observe(scaleSpinner); bindings.bindValue(observerScaleSpinner, scalePercent); - final IObservableValue pagesWide = - BeanProperties.value(dOptions.getClass().asSubclass(DiagramPrintOptions.class), - PrintOptions.PROPERTY_PAGES_WIDE).observe(realm, dOptions); + final IObservableValue pagesWide = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_WIDE) + .observe(realm, dOptions); ISWTObservableValue observerWideSpinner = WidgetProperties.selection().observe(spinnerWide); bindings.bindValue(observerWideSpinner, pagesWide); - final IObservableValue pagesTall = - BeanProperties.value(dOptions.getClass().asSubclass(DiagramPrintOptions.class), - PrintOptions.PROPERTY_PAGES_TALL).observe(realm, dOptions); + final IObservableValue pagesTall = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_TALL) + .observe(realm, dOptions); ISWTObservableValue observerTallSpinner = WidgetProperties.selection().observe(spinnerTall); bindings.bindValue(observerTallSpinner, pagesTall); - result.addListener(SWT.Dispose, new Listener() { - - public void handleEvent(final Event event) { - // while the SWTObservableValues are disposed while disposing the corresponding - // widgets the Beans-based ones should be disposed explicitly - scalePercent.dispose(); - pagesWide.dispose(); - pagesTall.dispose(); - } + result.addListener(SWT.Dispose, event -> { + // while the SWTObservableValues are disposed while disposing the corresponding + // widgets the Beans-based ones should be disposed explicitly + scalePercent.dispose(); + pagesWide.dispose(); + pagesTall.dispose(); }); } else { From cf326267ca12ff78b18f2f0572d0398d630bec6f Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 17 Nov 2022 14:44:59 +0100 Subject: [PATCH 37/76] Replace deprecated org.eclipse.jface.databinding.swt.WidgetProperties --- .../kieler/klighd/ui/printing/dialog/AlignmentBlock.java | 6 +++--- .../cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java | 7 +++---- .../klighd/ui/printing/dialog/OrientationBlock.java | 6 +++--- .../klighd/ui/printing/dialog/PrintPreviewTray.java | 2 +- .../cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java | 2 +- .../cs/kieler/klighd/ui/printing/dialog/RangeBlock.java | 6 +++--- .../cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java | 8 ++++---- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java index ba870a45e..3dedde9d7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -82,12 +82,12 @@ public static Group createContents(final Composite parent, final DataBindingCont final IObservableValue centerHorValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_CENTER_HORIZONTALLY) .observe(realm, options); - ISWTObservableValue horObservation = WidgetProperties.selection().observe(centerHorizontally); + ISWTObservableValue horObservation = WidgetProperties.widgetSelection().observe(centerHorizontally); bindings.bindValue(horObservation, centerHorValue); final IObservableValue centerVerValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_CENTER_VERTICALLY) .observe(realm, options); - ISWTObservableValue vertObservation = WidgetProperties.selection().observe(centerVertically); + ISWTObservableValue vertObservation = WidgetProperties.widgetSelection().observe(centerVertically); bindings.bindValue(vertObservation, centerVerValue); result.addListener(SWT.Dispose, event -> { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java index f1d97db3c..92a156de7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/CopiesBlock.java @@ -32,7 +32,7 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; @@ -42,7 +42,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Spinner; -import org.eclipse.swt.widgets.Widget; import de.cau.cs.kieler.klighd.Klighd; import de.cau.cs.kieler.klighd.ui.KlighdUIPlugin; @@ -103,7 +102,7 @@ public static Group createContents(final Composite parent, final DataBindingCont final IObservableValue copiesValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_COPIES).observe(realm, options); - ISWTObservableValue copiesObservation = WidgetProperties.selection().observe(copiesSpinner); + ISWTObservableValue copiesObservation = WidgetProperties.widgetSelection().observe(copiesSpinner); bindings.bindValue(copiesObservation, copiesValue); final Image collateOnImage = COLLATE_ON.createImage(); @@ -120,7 +119,7 @@ public static Group createContents(final Composite parent, final DataBindingCont final IObservableValue collateValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_COLLATE).observe(realm, options); - ISWTObservableValue collateObservation = WidgetProperties.selection().observe((Widget) collateCheck); + ISWTObservableValue collateObservation = WidgetProperties.widgetSelection().observe(collateCheck); bindings.bindValue(collateObservation, collateValue); collateValue.addValueChangeListener(event -> { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java index 44d124c09..fc5c34ac5 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/OrientationBlock.java @@ -22,7 +22,7 @@ import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.SelectObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.printing.PrinterData; import org.eclipse.swt.widgets.Button; @@ -83,9 +83,9 @@ public static Group createContents(final Composite parent, final DataBindingCont final SelectObservableValue orientationGroupValue = new SelectObservableValue<>(realm); - ISWTObservableValue observerPortrait = WidgetProperties.selection().observe(portraitRadio); + ISWTObservableValue observerPortrait = WidgetProperties. widgetSelection().observe(portraitRadio); orientationGroupValue.addOption(PrinterData.PORTRAIT, observerPortrait); - ISWTObservableValue observeLandscape = WidgetProperties.selection().observe(landscapeRadio); + ISWTObservableValue observeLandscape = WidgetProperties. widgetSelection().observe(landscapeRadio); orientationGroupValue.addOption(PrinterData.LANDSCAPE, observeLandscape); IObservableValue observeOrientation = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_ORIENTATION) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java index 8040332ef..df0782d23 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java @@ -27,7 +27,7 @@ import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.dialogs.DialogTray; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java index e9129185d..5ad563a74 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrinterBlock.java @@ -32,7 +32,7 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.ComputedValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.printing.PrintDialog; diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java index ca71f88c6..f69d36377 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/RangeBlock.java @@ -33,7 +33,7 @@ import org.eclipse.core.databinding.observable.value.ComputedValue; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -92,7 +92,7 @@ public static Group createContents(final Composite parent, final DataBindingCont final IObservableValue allValue = BeanProperties.value(PrintOptions.class, PrintOptions.PROPERTY_ALL_PAGES).observe(realm, options); - ISWTObservableValue observedAllPages = WidgetProperties.selection().observe(allRadio); + ISWTObservableValue observedAllPages = WidgetProperties.widgetSelection().observe(allRadio); bindings.bindValue(observedAllPages, allValue); // radio button for defining a print range @@ -118,7 +118,7 @@ protected Boolean calculate() { return ((Boolean) allValue.getValue()).booleanValue() ? Boolean.FALSE : Boolean.TRUE; } }; - ISWTObservableValue selection = WidgetProperties.selection().observe(rangeRadio); + ISWTObservableValue selection = WidgetProperties.widgetSelection().observe(rangeRadio); bindings.bindValue(selection, rangeValue); // range from (label & textfield) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java index 2a4c97af8..d6efc840d 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/ScalingBlock.java @@ -34,7 +34,7 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridLayout; @@ -172,17 +172,17 @@ public static Group createContents(final Composite parent, final DataBindingCont final IObservableValue scalePercent = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_SCALE_PERCENT) .observe(realm, dOptions); - ISWTObservableValue observerScaleSpinner = WidgetProperties.selection().observe(scaleSpinner); + ISWTObservableValue observerScaleSpinner = WidgetProperties.widgetSelection().observe(scaleSpinner); bindings.bindValue(observerScaleSpinner, scalePercent); final IObservableValue pagesWide = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_WIDE) .observe(realm, dOptions); - ISWTObservableValue observerWideSpinner = WidgetProperties.selection().observe(spinnerWide); + ISWTObservableValue observerWideSpinner = WidgetProperties.widgetSelection().observe(spinnerWide); bindings.bindValue(observerWideSpinner, pagesWide); final IObservableValue pagesTall = BeanProperties.value(DiagramPrintOptions.class, PrintOptions.PROPERTY_PAGES_TALL) .observe(realm, dOptions); - ISWTObservableValue observerTallSpinner = WidgetProperties.selection().observe(spinnerTall); + ISWTObservableValue observerTallSpinner = WidgetProperties.widgetSelection().observe(spinnerTall); bindings.bindValue(observerTallSpinner, pagesTall); result.addListener(SWT.Dispose, event -> { From 18215bc43fab3195ad9e479c827971a812cbd4a2 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 3 Mar 2023 11:18:29 +0100 Subject: [PATCH 38/76] klighd: moved example code for semantic filtering rules here. --- .../klighd/filtering/SemanticFilterRule.java | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java index fd4d29a81..fd8f3aa8c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/SemanticFilterRule.java @@ -19,6 +19,7 @@ /** * Semantic filter rules describe a filter that can be evaluated to include only elements tagged with certain tags. * The rules are constructed through the combination of filter rules with logical connectives. + * Complex example filters are provided in the comments of the source code below. * * @author mka * @author tik @@ -83,4 +84,66 @@ public String getRuleName() { public boolean getDefaultValue() { return this.defaultValue; } + +// /** +// * Rule to exclude elements that are either initial XOR final states. +// * +// * @example +// */ +// public static final SemanticFilterRule NO_INITIAL_XOR_FINAL_STATE = +// new AndConnective(SCChartsSemanticFilterTags.STATE, +// new LogicEqualConnective(SCChartsSemanticFilterTags.INITIAL, +// SCChartsSemanticFilterTags.FINAL), +// "Filter Initial XOR Final States"); +// +// /** +// * Rule to only include elements that are either initial states or regions. +// * +// * @example +// */ +// public static final SemanticFilterRule ONLY_INITIAL_STATES_OR_REGIONS = +// new IfThenElseConnective(SCChartsSemanticFilterTags.STATE, +// SCChartsSemanticFilterTags.INITIAL, SCChartsSemanticFilterTags.REGION, +// "Filter Everything but Initial States or Regions"); +// +// /** Rule to only include elements that have at least 3 declarations. */ +// public static final SemanticFilterRule ONLY_AT_LEAST_3_DECLARATIONS = +// new GreaterEqualsConnective(SCChartsSemanticFilterTags.DECLARATIONS(null), +// new NumericConstantConnective(3.0), +// "Filter Elements with less than 3 Declarations"); +// +// /** +// * Rule to only include elements that are initial, final or a region. +// * +// * @example +// */ +// public static final SemanticFilterRule ONLY_INITIAL_OR_FINAL_OR_REGION = SemanticFilterRuleUtil +// .getBigOrConnective("Filter Everything but Initial, Final or Regions", +// SCChartsSemanticFilterTags.INITIAL, SCChartsSemanticFilterTags.FINAL, +// SCChartsSemanticFilterTags.REGION); +// +// /** +// * Rule to exclude every element. +// * +// * @example +// */ +// public static final SemanticFilterRule NO_EVERYTHING = new FalseConnective("Filter Everything"); +// +// /** +// * Rule to only include every element. +// * +// * @example +// */ +// public static final SemanticFilterRule ONLY_EVERYTHING = new TrueConnective("Filter Nothing"); +// +// /** +// * Rule to only include elements with more input/output declarations than the total number of declarations. +// * +// * @example +// */ +// public static final SemanticFilterRule ONLY_MORE_IO_THAN_DECLARATIONS = new GreaterThanConnective( +// new NumericAdditionConnective(SCChartsSemanticFilterTags.INPUT_DECLARATIONS(null), +// SCChartsSemanticFilterTags.OUTPUT_DECLARATIONS(null)), +// SCChartsSemanticFilterTags.DECLARATIONS(null), +// "Filter Elements with #IO Declarations <= #Declarations"); } From 82e357733f5800f56ce72b9375ddd72ab091c62e Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 3 Mar 2023 15:50:24 +0100 Subject: [PATCH 39/76] removed some unused imports --- .../cs/kieler/klighd/standalone/KlighdStandaloneSetup.java | 2 -- .../src/de/cau/cs/kieler/klighd/KlighdOptions.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java index 3b7d06402..5127064ba 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java +++ b/plugins/de.cau.cs.kieler.klighd.standalone/src/de/cau/cs/kieler/klighd/standalone/KlighdStandaloneSetup.java @@ -15,8 +15,6 @@ import java.awt.Font; import java.awt.GraphicsEnvironment; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.util.Collection; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java index 9cbb1766e..fead2f59f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java @@ -16,9 +16,7 @@ */ package de.cau.cs.kieler.klighd; -import java.util.Collection; import java.util.EnumSet; -import java.util.List; import org.eclipse.elk.core.data.ILayoutMetaDataProvider; import org.eclipse.elk.core.data.LayoutOptionData; @@ -26,8 +24,6 @@ import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.Property; -import de.cau.cs.kieler.klighd.filtering.SemanticFilterRule; -import de.cau.cs.kieler.klighd.filtering.SemanticFilterTag; import de.cau.cs.kieler.klighd.labels.management.LabelManagementResult; import de.cau.cs.kieler.klighd.util.ExpansionAwareLayoutOption; From 3fd2b14ade1de090a3766ebe466bcf46f10a14ce Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 6 Mar 2023 09:22:38 +0100 Subject: [PATCH 40/76] add documentation for semantic filter rule parser and syntax --- .../parser/SemanticFilterRuleParser.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index def06d934..94a861ff2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -47,6 +47,30 @@ import de.cau.cs.kieler.klighd.filtering.TrueConnective; /** + * Provides a parser for the semantic filter language. The syntax is of the form + * for all binary operators. The most basic rule is a tag + * # that evaluates to true if an element has that tag and false otherwise. + * Tags may also contain numeric values in which case they are written as $. + * Constant values can be expressed as true, false or a number. Brackets may be used + * to override precedences. The full list of available operators is given in the table + * below. + * + * | Operator | Syntax | Input | Output | Precedence | + * |----------------|------------------------|-----------------|---------|------------| + * | And | \ && \ | boolean | boolean | 4 | + * | Or | \ \|\| \ | boolean | boolean | 3 | + * | Not | ! \ | boolean | boolean | 6 | + * | Addition | \ + \ | numeric | numeric | 9 | + * | Subtraction | \ - \ | numeric | numeric | 9 | + * | Multiplication | \ * \ | numeric | numeric | 10 | + * | Division | \ / \ | numeric | numeric | 10 | + * | GreaterEquals | \ >= \ | numeric | boolean | 8 | + * | GreaterThan | \ > \ | numeric | boolean | 8 | + * | LessEquals | \ <= \ | numeric | boolean | 8 | + * | LessThan | \ < \ | numeric | boolean | 8 | + * | Equals | \ = \ | numeric/boolean | boolean | 7 | + * | NotEqual | \ != \ | numeric/boolean | boolean | 7 | + * @author mka * */ From b8cf0c298fae3b9dc5694c1bd7d96748528b64e6 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Mon, 6 Mar 2023 09:25:04 +0100 Subject: [PATCH 41/76] add documentation for InvalidSyntaxException --- .../klighd/filtering/parser/SemanticFilterRuleParser.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index 94a861ff2..86131f4b0 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -114,7 +114,11 @@ public OperandNode(String token, int type) { super(token, type); } } - + /** + * Indicates that a parser encountered an invalid syntax. + * @author mka + * + */ public class InvalidSyntaxException extends Exception { public InvalidSyntaxException(String message) { From 5aebee41ab19a560f0b3884bf4dc0728d5d76153 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Thu, 5 Jan 2023 13:59:33 +0100 Subject: [PATCH 42/76] kgraph.text: improved 'KGraphResource' to look for all 'KlighdProperties' if available (via reflection) --- .../META-INF/MANIFEST.MF | 5 +- .../cs/kieler/kgraph/text/KGraphResource.java | 61 ++++++++++++------- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF index b1a234bc5..fd29d7870 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF @@ -18,8 +18,9 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.emf.common, org.eclipse.core.resources, org.eclipse.elk.core;visibility:=reexport, - de.cau.cs.kieler.klighd.kgraph, - de.cau.cs.kieler.klighd.krendering;visibility:=reexport + de.cau.cs.kieler.klighd.kgraph;visibility:=reexport, + de.cau.cs.kieler.klighd.krendering;visibility:=reexport, + de.cau.cs.kieler.klighd;resolution:=optional Import-Package: org.apache.log4j DynamicImport-Package: de.cau.cs.kieler.klighd.test Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java index 146a95b16..e8c562d11 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java @@ -19,23 +19,27 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.lang.reflect.Modifier; import java.util.Map; +import java.util.stream.Stream; import org.eclipse.elk.graph.properties.IProperty; -import org.eclipse.elk.graph.properties.Property; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.linking.lazy.LazyLinkingResource; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.resource.SaveOptions; -import com.google.common.collect.ImmutableList; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; -import de.cau.cs.kieler.klighd.kgraph.KGraphElement; +import de.cau.cs.kieler.klighd.kgraph.EMapPropertyHolder; +import de.cau.cs.kieler.klighd.kgraph.KLayoutData; import de.cau.cs.kieler.klighd.kgraph.KNode; import de.cau.cs.kieler.klighd.kgraph.PersistentEntry; import de.cau.cs.kieler.klighd.kgraph.util.KGraphDataUtil; import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil; +import de.cau.cs.kieler.klighd.krendering.KRendering; /** * A customized {@link LazyLinkingResource} handling the (de-) serialization of @@ -50,27 +54,41 @@ */ public class KGraphResource extends LazyLinkingResource { - /** - * Default values for {@link KGraphElement}'s, see - * {@link de.cau.cs.kieler.klighd.xtext.transformations.KGraphDiagramSynthesis - * KGraphDiagramSynthesis} - */ - private static final IProperty DEFAULTS = - new Property("de.cau.cs.kieler.kgraphsynthesis.defaults", false); - - /** - * KLighD offers the possibility to display tooltips that need to be parsed - * from persistent entries and added to the {@link KGraphElement}'s properties. - */ - private static final IProperty TOOLTIP = - new Property("klighd.tooltip"); - + private static final Predicate HANDLED_TYPES_FILTER = + e -> e instanceof KLayoutData || e instanceof KRendering; + /** * Additional properties known to the kgraph text format that are no layout options. However, * they are made available through content assist and are parsed properly. */ - public static final IProperty[] ADDITIONAL_PROPERTIES = ImmutableList.of(DEFAULTS, TOOLTIP).toArray( - new IProperty[2]); + public static final IProperty[] ADDITIONAL_PROPERTIES = getAdditionalProperties(); + + private static IProperty[] getAdditionalProperties() { + try { + // traditionally we didn't have a hard dependency from the textual syntax implementation + // to the KLighD base package, so try to access the 'KlighdProperties' and its members via reflection + // (the optional dependency on 'de.cau.cs.kieler.klighd' will bring it into the runtime class path) + return Stream.of( + Class.forName("de.cau.cs.kieler.klighd.util.KlighdProperties").getDeclaredFields() + ).filter( + f -> Modifier.isPublic(f.getModifiers()) && Modifier.isStatic(f.getModifiers()) + && IProperty.class.isAssignableFrom(f.getType()) + ).map( + f -> { + try { + return f.get(null); + } catch (IllegalArgumentException | IllegalAccessException e) { + return null; + } + } + ).filter( + Predicates.notNull() + ).toArray(IProperty[]::new); + + } catch (Throwable t) { + return new IProperty[0]; + } + }; /** * {@inheritDoc}
@@ -83,7 +101,7 @@ protected void doLoad(final InputStream inputStream, final Map options) th EObject o = this.getContents().get(0); if (o instanceof KNode) { // parse persisted key-value pairs using KIML's layout data service - KGraphDataUtil.loadDataElements((KNode) o, ADDITIONAL_PROPERTIES); + KGraphDataUtil.loadDataElements((KNode) o, HANDLED_TYPES_FILTER, ADDITIONAL_PROPERTIES); // validate layout data and references and fill in missing data KGraphUtil.validate((KNode) o); } @@ -119,6 +137,7 @@ public void update(final int offset, final int replacedTextLength, final String * {@link IProperty}s into * {@link PersistentEntry}s. */ + @SuppressWarnings("deprecation") public void doSave(final OutputStream outputStream, final Map options) throws IOException { if (!this.getContents().isEmpty()) { From 878e5a9a406ee880ba0767d2b216a130193aa4c2 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Thu, 5 Jan 2023 14:02:13 +0100 Subject: [PATCH 43/76] klighd.piccolo: replaced usage of deprecated method in 'KlighdImage' --- .../kieler/klighd/piccolo/internal/nodes/KlighdImage.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java index 9d40168b3..1ebf8a20c 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java @@ -245,7 +245,12 @@ public void setImage(final URL url) { setImage(url.openStream()).close(); KlighdPiccoloPlugin.getDefault().getImageRegistry().put(imageKey, - ImageDescriptor.createFromImageData(imageData)); + ImageDescriptor.createFromImageDataProvider( + // lambda resembles the behavior of deprecated constructor + // org.eclipse.jface.resource.ImageDataImageDescriptor#ImageDataImageDescriptor(ImageData) + i -> i == 100 ? imageData : null + ) + ); } catch (final Exception e) { final String msg = From 9b231e13ee05f31d7fb1b91ddbab548f7e4dcec4 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Thu, 5 Jan 2023 14:19:07 +0100 Subject: [PATCH 44/76] klighd.ui: a few non-breaking changes in 'DiagramViewPart' allowing to reload the diagram by reusing code of 'DiagramEditorPart', mainly for development purposes --- .../klighd/ui/parts/DiagramEditorPart.java | 25 +++++++--- .../klighd/ui/parts/DiagramViewPart.java | 46 +++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramEditorPart.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramEditorPart.java index 4229846b9..beb6aa786 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramEditorPart.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramEditorPart.java @@ -38,6 +38,7 @@ import org.eclipse.elk.graph.properties.IPropertyHolder; import org.eclipse.elk.graph.properties.MapPropertyHolder; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; @@ -544,10 +545,25 @@ public void doSaveAs() { * @return the loaded model for convenience */ protected Object loadModel() throws PartInitException { + final EObject model = loadModel(getEditorInput()); + this.model = model; + this.resourceSet = model.eResource().getResourceSet(); + configureResourceSet(this.resourceSet); + return model; + } + + /** + * Load a model from the editor input. The result is put into {@link #model}. + * + * @throws PartInitException + * if loading the model fails + * + * @return the loaded model for convenience + */ + protected static EObject loadModel(final IEditorInput input) throws PartInitException { // get a URI or an input stream from the editor input URI uri = null; InputStream inputStream = null; - final IEditorInput input = getEditorInput(); if (input instanceof IFileEditorInput) { final IFile file = ((IFileEditorInput) input).getFile(); uri = URI.createPlatformResourceURI(file.getFullPath().toString(), false); @@ -571,8 +587,7 @@ protected Object loadModel() throws PartInitException { final Resource resource; try { - resourceSet = new ResourceSetImpl(); - configureResourceSet(resourceSet); + final ResourceSet resourceSet = new ResourceSetImpl(); if (inputStream != null) { // load a stream-based resource uri = URI.createFileURI("temp.xmi"); @@ -593,9 +608,7 @@ protected Object loadModel() throws PartInitException { throw new PartInitException("The resource is empty."); } // default behavior: get the first element in the resource - model = resource.getContents().get(0); - - return model; + return resource.getContents().get(0); } /** diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java index 2194de7e2..5af18af2b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java @@ -33,13 +33,19 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ViewPart; import de.cau.cs.kieler.klighd.IDiagramWorkbenchPart; import de.cau.cs.kieler.klighd.IViewer; +import de.cau.cs.kieler.klighd.Klighd; import de.cau.cs.kieler.klighd.LightDiagramLayoutConfig; import de.cau.cs.kieler.klighd.ViewContext; import de.cau.cs.kieler.klighd.internal.ILayoutConfigProvider; @@ -48,6 +54,7 @@ import de.cau.cs.kieler.klighd.ui.internal.options.DiagramSideBar; import de.cau.cs.kieler.klighd.ui.printing.PrintAction; import de.cau.cs.kieler.klighd.ui.viewers.UiContextViewer; +import de.cau.cs.kieler.klighd.util.KlighdSynthesisProperties; import de.cau.cs.kieler.klighd.viewers.ContextViewer; /** @@ -314,9 +321,20 @@ protected void addButtons() { toolBar.add(new Action("Refresh diagram", KlighdUIPlugin.getImageDescriptorFromKlighdBase("icons/full/elcl16/refresh.gif")) { + final DiagramViewPart part = DiagramViewPart.this; + @Override public void run() { + if (part.getViewContext() == null) { + final Object model = part.loadModel(); + if (model != null) + part.initialize(model, DEFAULT_NAME, configureKlighdProperties()); + + return; + } + new LightDiagramLayoutConfig(DiagramViewPart.this.getViewContext()) + .model(part.loadModel()) .animate(false) .performUpdate(); } @@ -346,6 +364,34 @@ public void run() { menu.add(resetLayoutOptionsAction); } + protected Object loadModel() { + try { + final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + final IWorkbenchPage page = window.getActivePage() != null ? window.getActivePage() : window.getPages()[0]; + final IEditorInput input = page == null + ? null : page.getActiveEditor() != null + ? page.getActiveEditor().getEditorInput() : page.getEditorReferences().length == 0 + ? null : page.getEditorReferences()[0].getEditorInput(); + return input == null ? null : DiagramEditorPart.loadModel(input); + + } catch (PartInitException e) { + Klighd.handle(e, KlighdUIPlugin.PLUGIN_ID); + return null; + } + } + + /** + * Returns a configuration for the KLighD view. Override this method to use a custom + * configuration. + * + * @return KLighD configuration or null. + * + * @see {@link KlighdSynthesisProperties} for more details + */ + protected KlighdSynthesisProperties configureKlighdProperties() { + return null; + } + /** * Registers the default print support, may be overriden if necessary. */ From 721bf2fb431aa7594acdf637485ee04600a109cf Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 15 Mar 2023 13:50:45 +0100 Subject: [PATCH 45/76] klighd: fixed inset calculation. Previously insets were calculated wrong by offsetting all insets too much when renderings were inside renderigns with offsets. For the server this is an invisible fix, as all Piccolo-related rendering code do not directly use these insets, LSP rendering however directly use the insets for Sprotty, which are now fixed. --- .../src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java index a2f436f5e..fd949bef3 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java @@ -1570,6 +1570,9 @@ public static void calculateInsets(final KRendering rootRendering, final KInsets if (currentRendering instanceof KContainerRendering) { currentParent = (KContainerRendering) currentRendering; currentBounds = bounds; + // Reset current position to avoid adding top/left insets multiple times. + currentBounds.x = 0; + currentBounds.y = 0; } } From 5de0dd41f2570e25cde360ae56fe61c9ed6b6778 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Wed, 15 Mar 2023 16:00:10 +0100 Subject: [PATCH 46/76] add comment --- .../kieler/klighd/filtering/parser/SemanticFilterRuleParser.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index 86131f4b0..8fd380605 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -98,6 +98,7 @@ public OperatorNode(String token, int type) { super(token, type); this.children = new ArrayList<>(); } + // a reference to the passed children list is stored and no copy is made public OperatorNode(String token, int type, List children) { super(token, type); this.children = children; From dec560735689f7b28fcf3031697a7cebddca4cd9 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 15 Mar 2023 16:16:58 +0100 Subject: [PATCH 47/76] replaced some Java 9-requiring code in klighd with a Java 8-compatible variant. --- .../parser/SemanticFilterRuleParser.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index 8fd380605..ccb38b04d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -16,10 +16,10 @@ */ package de.cau.cs.kieler.klighd.filtering.parser; -import static java.util.Map.entry; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Stack; @@ -224,20 +224,22 @@ private SemanticFilterRule convertAST(Node ast) throws InvalidSyntaxException { private static List OPERATORS = new ArrayList<>(Arrays.asList( "*", "/", "+", "-", "=", "!=", ">=", ">", "<=", "<", "||", "&&", "!")); - private static Map PRECEDENCES = Map.ofEntries( - entry("*", 10), - entry("/", 10), - entry("+", 9), - entry("-", 9), - entry("=", 7), - entry("!=", 7), - entry(">=", 8), - entry(">", 8), - entry("<=", 8), - entry("<", 8), - entry("||", 3), - entry("&&", 4), - entry("!", 6)); + private static Map PRECEDENCES = new HashMap<>() {{ + put("*", 10); + put("/", 10); + put("+", 9); + put("-", 9); + put("=", 7); + put("!=", 7); + put(">=", 8); + put(">", 8); + put("<=", 8); + put("<", 8); + put("||", 3); + put("&&", 4); + put("!", 6); + }}; + /** * Parses a semantic filter rule expression and creates the abstract syntax tree i.e., {@link SemanticFilterRule}. * @param ruleString expression From f3b6b5174cd689d970eee59d1430ade4f7ef3ba3 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 15 Mar 2023 16:27:30 +0100 Subject: [PATCH 48/76] make Maven happy, as '<>' cannot be used with anonymous classes. --- .../klighd/filtering/parser/SemanticFilterRuleParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index ccb38b04d..2de6bdf99 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -224,7 +224,7 @@ private SemanticFilterRule convertAST(Node ast) throws InvalidSyntaxException { private static List OPERATORS = new ArrayList<>(Arrays.asList( "*", "/", "+", "-", "=", "!=", ">=", ">", "<=", "<", "||", "&&", "!")); - private static Map PRECEDENCES = new HashMap<>() {{ + private static Map PRECEDENCES = new HashMap() {{ put("*", 10); put("/", 10); put("+", 9); From 25cb87cdcdfd174e2bd16cc7ffeb19729f5174c6 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 22 Mar 2023 14:00:59 +0100 Subject: [PATCH 49/76] update build versions to Tycho 2.7.3, tycho-plugins 2.7.5, Xtext 2.28 and target platform to Eclipse 2022-09 and corresponding. --- build/de.cau.cs.kieler.klighd.repository/category.xml | 6 +++--- build/de.cau.cs.kieler.klighd.repository/pom.xml | 8 ++++---- ....cau.cs.kieler.klighd.targetplatform-elkNightly.target | 6 +++--- ...kieler.klighd.targetplatform-piccolo-elkNightly.target | 6 +++--- .../de.cau.cs.kieler.klighd.targetplatform-piccolo.target | 6 +++--- .../de.cau.cs.kieler.klighd.targetplatform.target | 8 ++++---- pom.xml | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index 2617736d5..86d6f3ea1 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 63d88d068..2cab35dd2 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -41,7 +41,7 @@ org.jboss.tools.tycho-plugins repository-utils - 2.5.0 + 2.7.5 generate-facade @@ -52,17 +52,17 @@ - https://download.eclipse.org/releases/2021-06/ + https://download.eclipse.org/releases/2022-09/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ https://download.eclipse.org/elk/updates/releases/0.8.1/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/ + https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/ https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index b78d8fac2..7c913547e 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index 0e6e56c8e..9fd6a5984 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index 9c7d6f0bd..5c4d0fff2 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 0ef65c6da..9d4a9872d 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -25,18 +25,18 @@ - + - + - + diff --git a/pom.xml b/pom.xml index 3def1d66f..dc7160ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ - 2.5.0 - 2.25.0 + 2.7.3 + 2.28.0 0.8.1 From d2c2fa5cb850c57f4feeed4c229214b21418e682 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 24 Mar 2023 14:53:05 +0100 Subject: [PATCH 50/76] lsp: make sure that decorator renderings (such as texts) had their size estimated before rendering. --- .../de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 6924f4c28..24a7ef1be 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -280,6 +280,7 @@ final class RenderingPreparer { bounds = PlacementUtil.evaluatePointPlacement(rendering, placementData, parentBounds) } KDecoratorPlacementData: { + PlacementUtil.basicEstimateSize(rendering, Bounds.of(0, 0)) // Decorator placements can only be evaluated if the path they should decorate is known. // to call KLighD's DecoratorPlacementUtil#evaluateDecoratorPlacement the points of the path of the // parent rendering have to be stored. From 58b43ef45d4b64ca1c971e9c53aceeca43fc5b36 Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Thu, 13 Apr 2023 17:51:27 +0200 Subject: [PATCH 51/76] Removed deadlock by removing synchronize and second object. --- .../cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend index da01539d6..7387439d4 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend @@ -188,8 +188,7 @@ class KGraphDiagramUpdater extends DiagramUpdater { * @param model The new model that should be shown for the server. * @param uri The identifying URI to access the diagram state maps. */ - synchronized def void prepareModel(KGraphDiagramServer server, Object model, String uri) { - + def void prepareModel(KGraphDiagramServer server, Object model, String uri) { val properties = new KlighdSynthesisProperties() var SprottyViewer viewer = null var String synthesisId @@ -285,7 +284,7 @@ class KGraphDiagramUpdater extends DiagramUpdater { * @param cancelIndicator The {@link CancelIndicator} used to tell the diagram translation to stop. * @return The generated SGraph */ - synchronized def SGraph createModel(ViewContext viewContext, String uri, CancelIndicator cancelIndicator) { + def SGraph createModel(ViewContext viewContext, String uri, CancelIndicator cancelIndicator) { // Generate the SGraph model from the KGraph model and store every later relevant part in the // diagram state. @@ -303,9 +302,10 @@ class KGraphDiagramUpdater extends DiagramUpdater { var diagramGenerator = incrementalDiagramGenerator ? incrementalDiagramGeneratorProvider.get : diagramGeneratorProvider.get - - val sGraph = diagramGenerator.toSGraph(viewContext.viewModel, uri, cancelIndicator) - + var SGraph sGraph = null; + synchronized (diagramState) { + sGraph = diagramGenerator.toSGraph(viewContext.viewModel, uri, cancelIndicator) + } if (incrementalDiagramGenerator) { val requestManager = new KGraphDiagramPieceRequestManager(diagramGenerator as KGraphIncrementalDiagramGenerator) synchronized (diagramState) { From 90a93e918b6b7e244c1a62051d05e934d06e0b2c Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 14 Apr 2023 16:26:22 +0200 Subject: [PATCH 52/76] lsp: estimate clip shape bounds for correct rendering. --- .../kieler/klighd/lsp/utils/RenderingPreparer.xtend | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 24a7ef1be..bcfda4bdf 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2018-2022 by + * Copyright 2018-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -31,6 +31,7 @@ import de.cau.cs.kieler.klighd.krendering.KAreaPlacementData import de.cau.cs.kieler.klighd.krendering.KContainerRendering import de.cau.cs.kieler.klighd.krendering.KDecoratorPlacementData import de.cau.cs.kieler.klighd.krendering.KGridPlacement +import de.cau.cs.kieler.klighd.krendering.KImage import de.cau.cs.kieler.klighd.krendering.KPlacement import de.cau.cs.kieler.klighd.krendering.KPointPlacementData import de.cau.cs.kieler.klighd.krendering.KPolygon @@ -164,6 +165,14 @@ final class RenderingPreparer { decorationMap, element) } } + + // Calculate the bounds for the clip shape. + if (rendering instanceof KImage) { + if (rendering.clipShape !== null) { + handleAreaAndPointAndDecoratorPlacementRendering(rendering.clipShape, bounds, boundsMap, decorationMap, + element) + } + } } /** From 694198471fe161442e604b48f5ae73846176608c Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Tue, 25 Apr 2023 17:29:53 +0200 Subject: [PATCH 53/76] lsp: calculate size and layout of proxies. --- .../cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 1dab7f420..f4c652245 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -154,8 +154,14 @@ final class RenderingPreparer { KRendering: { // every rendering needs an ID, generate it here KRenderingIdGenerator.generateIdsRecursive(data) - if (data.eContainer instanceof KGraphElement) { - handleKRendering(data.eContainer as KGraphElement, data, null, null) + if (data.eContainer instanceof KNode) { + // Calculate the size and layout of the proxy first. + val parent = data.eContainer as KNode + val minSize = parent.getProperty(KlighdProperties.MINIMAL_NODE_SIZE) + val bounds = PlacementUtil.basicEstimateSize(data, new Bounds(minSize.x, minSize.y)) + parent.width = bounds.width + parent.height = bounds.height + handleKRendering(parent, data, null, null) } } } From d4e29a9fa0792953c8500f353a87d786c8647406 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 10 May 2023 16:20:24 +0200 Subject: [PATCH 54/76] all: transformed plugins to be usable as plain Maven plugins. This involves a few changes: - All KLighD plugins are still built as Eclipse-Plugins to be usable in P2 Update sites - All plugins are recognized in Eclipse as Maven artifacts to allow the dependency handling to consider Maven-related dependencies - added binding to language server to avoid an error in derived language servers, stemming from a newer Xtext 2.28 release. Fixes #144. - In the .lsp artifact: replace swt, eclipse.ui and jface dependencies by a mock implementation providing the interface for KLighD's internals but no functionality (as that is not needed in the language server case). Allows to build a platform-independent LS. - In the klighd plugin: added two separate poms for launching with the SWT mock from Eclipse. The main one will build correctly with plain Maven using the SWT mock dependencies, but launched from Eclipse it would still use the real SWT dependencies from the P2 target platform, the alternative pom.xml forces Eclipse to use SWT (but should not be used in a Maven build). - configure to not publish interim pom artifacts such as repository, target platform, and features - reorganize parent pom artifact of all plugins to be the main build parent to avoid needing to publish the interim plugins pom.xml that does not contribute anything. - removed specific piccolo offscreen renderers from klighd.standalone. These offscreen renderers can instead by registered by simply including the corresponding piccolo artifact as a dependency, then it will be automatically registered via service loader. This requires applications to use the offscreen renderer to explicitly list piccolo as a dependency now. This change will allow to release Maven artifacts and therefore fix #78. This change will make it not necessary anymore to completely remove all SWT and alike dependencies from KLighD, invalidating #63. Closes #63. Other: - removed Batik feature and plugins from the build process. Fixes #109 and #134 - there is no guarantee yet that all artifacts on their own have the correct Maven dependencies to be fully working as intended, mainly the LSP is in focus here. Missing dependencies may be added later. --- .../category.xml | 6 +- .../pom.xml | 7 + .../pom.xml | 12 ++ .../pom.xml | 12 ++ .../pom.xml | 12 ++ .../de.cau.cs.kieler.klighd.feature/pom.xml | 12 ++ .../pom.xml | 12 ++ .../pom.xml | 12 ++ .../pom.xml | 12 ++ .../pom.xml | 12 ++ features/pom.xml | 9 +- .../.classpath | 2 +- .../de.cau.cs.kieler.kgraph.text.ide/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../de.cau.cs.kieler.kgraph.text.ide/pom.xml | 22 +- .../.classpath | 8 +- .../de.cau.cs.kieler.kgraph.text.ui/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../de.cau.cs.kieler.kgraph.text.ui/pom.xml | 3 +- .../de.cau.cs.kieler.kgraph.text/.classpath | 8 +- plugins/de.cau.cs.kieler.kgraph.text/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + plugins/de.cau.cs.kieler.kgraph.text/pom.xml | 63 +++++- .../de.cau.cs.kieler.klighd.ide/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd.ide/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 54 +++-- .../.classpath | 2 +- .../.project | 12 ++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 29 ++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 21 +- .../de.cau.cs.kieler.klighd.kgraph/.classpath | 5 +- .../de.cau.cs.kieler.klighd.kgraph/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../de.cau.cs.kieler.klighd.kgraph/pom.xml | 31 ++- .../.classpath | 2 +- .../.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../pom.xml | 36 +++- .../extensions/KEdgeExtensions.xtend | 2 +- .../extensions/KLabelExtensions.xtend | 2 +- .../extensions/KNodeExtensions.xtend | 2 +- .../extensions/KPolylineExtensions.xtend | 7 +- .../extensions/KPortExtensions.xtend | 2 +- .../.classpath | 8 +- .../.project | 6 + .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../pom.xml | 41 +++- .../de.cau.cs.kieler.klighd.lsp/.classpath | 13 +- plugins/de.cau.cs.kieler.klighd.lsp/.project | 17 ++ .../org.eclipse.core.resources.prefs | 3 + .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../META-INF/MANIFEST.MF | 3 +- plugins/de.cau.cs.kieler.klighd.lsp/pom.xml | 193 +++++++++++++++++- .../lsp/launch/AbstractLanguageServer.xtend | 14 +- .../klighd/lsp/launch/AbstractLsCreator.xtend | 12 +- .../klighd/lsp/utils/RenderingPreparer.xtend | 10 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../.classpath | 2 +- .../de.cau.cs.kieler.klighd.piccolo/.project | 12 ++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + ...de.cau.cs.kieler.klighd.IKlighdStartupHook | 1 + .../plugin.xml | 13 +- .../de.cau.cs.kieler.klighd.piccolo/pom.xml | 31 ++- .../klighd/piccolo/export/PiccoloSetup.java | 41 ++++ .../.classpath | 4 +- .../.project | 12 ++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 35 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + .../pom.xml | 66 +++++- .../standalone/KlighdStandaloneSetup.java | 17 +- .../pom.xml | 3 +- .../de.cau.cs.kieler.klighd.ui.emf/pom.xml | 3 +- .../de.cau.cs.kieler.klighd.ui.view/pom.xml | 3 +- .../de.cau.cs.kieler.klighd.ui.wizard/pom.xml | 3 +- plugins/de.cau.cs.kieler.klighd.ui/pom.xml | 21 +- plugins/de.cau.cs.kieler.klighd/.classpath | 10 +- plugins/de.cau.cs.kieler.klighd/.project | 6 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 38 +++- .../org.eclipse.xtend.core.Xtend.prefs | 6 + plugins/de.cau.cs.kieler.klighd/plugin.xml | 6 +- .../de.cau.cs.kieler.klighd/pom.eclipse.xml | 80 ++++++++ plugins/de.cau.cs.kieler.klighd/pom.lsp.xml | 99 +++++++++ plugins/de.cau.cs.kieler.klighd/pom.xml | 70 ++++++- plugins/pom.xml | 12 ++ pom.xml | 72 +++++-- .../pom.xml | 7 + test/de.cau.cs.kieler.klighd.test/pom.xml | 7 + test/pom.xml | 12 ++ 113 files changed, 1638 insertions(+), 227 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.m2e.core.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook create mode 100644 plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/PiccoloSetup.java create mode 100644 plugins/de.cau.cs.kieler.klighd.standalone/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.standalone/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml create mode 100644 plugins/de.cau.cs.kieler.klighd/pom.lsp.xml diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index 86d6f3ea1..7a6c16389 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -1,7 +1,7 @@ - + Update site for KIELER Lightweight Diagrams nightly builds. @@ -18,12 +18,12 @@ - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 2cab35dd2..c3748ca98 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -76,6 +76,13 @@ + + + maven-deploy-plugin + + true + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml b/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml index b02056db7..a1398f4a5 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml +++ b/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml @@ -14,4 +14,16 @@ ../../pom.xml + + + + + maven-deploy-plugin + + true + + + + + diff --git a/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml b/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml index 1e43f85c8..f3809224d 100644 --- a/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.batik.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml b/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml index ec27d6bc0..0bedb7f16 100644 --- a/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.draw2d.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.feature/pom.xml b/features/de.cau.cs.kieler.klighd.feature/pom.xml index 44475fc10..76c0a876b 100644 --- a/features/de.cau.cs.kieler.klighd.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml b/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml index 9e2971941..e1f10e415 100644 --- a/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.freehep.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml b/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml index a9d29babc..a29092e53 100644 --- a/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.ide.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml b/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml index 8735c7cfe..b785b81bf 100644 --- a/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.sdk.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/de.cau.cs.kieler.klighd.view.feature/pom.xml b/features/de.cau.cs.kieler.klighd.view.feature/pom.xml index b931f2dd1..6c98bd618 100644 --- a/features/de.cau.cs.kieler.klighd.view.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.view.feature/pom.xml @@ -11,4 +11,16 @@ de.cau.cs.kieler.klighd.view.feature 2.2.1-SNAPSHOT eclipse-feature + + + + + + maven-deploy-plugin + + true + + + + diff --git a/features/pom.xml b/features/pom.xml index b0b180d47..efe0be71e 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ - + org.eclipse.tycho.extras @@ -25,6 +25,13 @@ tycho-p2-plugin ${tycho-version} + + + maven-deploy-plugin + + true + + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath index abe597016..ad52d9d4d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath @@ -5,5 +5,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.project b/plugins/de.cau.cs.kieler.kgraph.text.ide/.project index 735be867b..859cf4561 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/.project +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml index ef495acac..99dbe695e 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd @@ -13,6 +14,25 @@ 2.2.1-SNAPSHOT eclipse-plugin + + + + ${project.groupId} + de.cau.cs.kieler.kgraph.text + ${project.version} + + + org.eclipse.xtext + org.eclipse.xtext.ide + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase.ide + ${xtext-version} + + + src diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath index c3bdea4c0..0377d772d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.project b/plugins/de.cau.cs.kieler.kgraph.text.ui/.project index 946fb731e..9fc1b653a 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/.project +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml index c6e35b8cf..c44b61b1d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.classpath b/plugins/de.cau.cs.kieler.kgraph.text/.classpath index c3bdea4c0..0377d772d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.project b/plugins/de.cau.cs.kieler.kgraph.text/.project index 81339bce6..860f50fe1 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/.project +++ b/plugins/de.cau.cs.kieler.kgraph.text/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.kgraph.text/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml index d59979eca..df113db21 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd @@ -13,6 +14,66 @@ 2.2.1-SNAPSHOT eclipse-plugin + + + org.eclipse.xtext + org.eclipse.xtext + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + ${xtext-version} + compile + true + + + org.eclipse.xtext + org.eclipse.xtext.util + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase + ${xtext-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.emf + org.eclipse.emf.common + ${emf-common-version} + + + org.eclipse.platform + org.eclipse.core.resources + ${core-resources-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + src diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.classpath b/plugins/de.cau.cs.kieler.klighd.ide/.classpath index 428337e56..2f5ffb21d 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ide/.classpath @@ -4,5 +4,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.project b/plugins/de.cau.cs.kieler.klighd.ide/.project index 87f251237..5f50baba9 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/.project +++ b/plugins/de.cau.cs.kieler.klighd.ide/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml index 81cd1f3ba..cec111d7e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd @@ -13,25 +14,40 @@ 2.2.1-SNAPSHOT eclipse-plugin + + + ${project.groupId} + de.cau.cs.kieler.klighd + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase + ${xtext-version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + org.eclipse.elk + org.eclipse.elk.alg.layered + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + src - - - org.eclipse.tycho - target-platform-configuration - - - - ignore - - - - diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath index eca7bdba8..43b986286 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath @@ -3,5 +3,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.project b/plugins/de.cau.cs.kieler.klighd.incremental/.project index 7a18dc575..1bc394dcf 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/.project +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -20,9 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.xtext.ui.shared.xtextNature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.jdt.core.prefs index 757c0d10a..d89fda210 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.jdt.core.prefs @@ -4,9 +4,11 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -14,19 +16,22 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -115,11 +120,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -150,6 +156,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -174,13 +182,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -228,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -264,9 +278,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -302,9 +319,13 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF index b96f53fc4..7d0b2cce8 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.klighd, - de.cau.cs.kieler.klighd.krendering.extensions;bundle-version="0.8.0", + de.cau.cs.kieler.klighd.kgraph, com.google.guava Export-Package: de.cau.cs.kieler.klighd.incremental Automatic-Module-Name: de.cau.cs.kieler.klighd.incremental diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml index 1a7cbd91f..79d84f37a 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml @@ -4,11 +4,30 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.incremental 2.2.1-SNAPSHOT eclipse-plugin + + + + ${project.groupId} + de.cau.cs.kieler.klighd + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + com.google.guava + guava + ${guava-version} + + diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath index cfe5615c2..cf36b5611 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath @@ -2,7 +2,6 @@ - - - + + diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.project b/plugins/de.cau.cs.kieler.klighd.kgraph/.project index 355bf4e21..d7831de5c 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/.project +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.m2e.core.prefs b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml index 563d9f8dc..b5d9be0e7 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml @@ -4,12 +4,41 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.kgraph 2.2.1-SNAPSHOT eclipse-plugin + + + + com.google.guava + guava + ${guava-version} + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.graph + ${elk-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath index 428337e56..2f5ffb21d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath @@ -4,5 +4,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.project b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.project index b33a08126..31e4d7465 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.project +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml index 0665c6a6e..94d6b8e81 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd @@ -13,6 +14,39 @@ 2.2.1-SNAPSHOT eclipse-plugin + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + com.google.inject + guice + ${guice-version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + ${xtext-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + src diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend index 85cba3538..727f24ffe 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.krendering.extensions +import com.google.inject.Inject import com.google.inject.Injector import com.google.inject.Scope import de.cau.cs.kieler.klighd.kgraph.KEdge @@ -26,7 +27,6 @@ import de.cau.cs.kieler.klighd.krendering.KRoundedBendsPolyline import de.cau.cs.kieler.klighd.krendering.KSpline import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared import java.util.List -import javax.inject.Inject import org.eclipse.elk.graph.properties.IProperty /** diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLabelExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLabelExtensions.xtend index 61e5e8723..c05afe1fe 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLabelExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLabelExtensions.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.krendering.extensions +import com.google.inject.Inject import com.google.inject.Injector import com.google.inject.Scope import de.cau.cs.kieler.klighd.kgraph.KEdge @@ -31,7 +32,6 @@ import de.cau.cs.kieler.klighd.krendering.KRenderingFactory import de.cau.cs.kieler.klighd.krendering.KText import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared import java.util.EnumSet -import javax.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.EdgeLabelPlacement import org.eclipse.elk.core.options.NodeLabelPlacement diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KNodeExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KNodeExtensions.xtend index df8c65b3d..cc0031736 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KNodeExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KNodeExtensions.xtend @@ -16,13 +16,13 @@ */ package de.cau.cs.kieler.klighd.krendering.extensions +import com.google.inject.Inject import com.google.inject.Injector import com.google.inject.Scope import de.cau.cs.kieler.klighd.kgraph.KGraphElement import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared -import javax.inject.Inject import org.eclipse.elk.core.math.KVector import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.NodeLabelPlacement diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPolylineExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPolylineExtensions.xtend index d53f7958b..8f67238e1 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPolylineExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPolylineExtensions.xtend @@ -16,18 +16,17 @@ */ package de.cau.cs.kieler.klighd.krendering.extensions -import javax.inject.Inject - +import com.google.inject.Inject +import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment import de.cau.cs.kieler.klighd.krendering.KPolyline import de.cau.cs.kieler.klighd.krendering.KPosition import de.cau.cs.kieler.klighd.krendering.KRendering import de.cau.cs.kieler.klighd.krendering.KRenderingFactory +import de.cau.cs.kieler.klighd.krendering.KText import de.cau.cs.kieler.klighd.krendering.KXPosition import de.cau.cs.kieler.klighd.krendering.KYPosition import de.cau.cs.kieler.klighd.krendering.LineCap -import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment import de.cau.cs.kieler.klighd.krendering.VerticalAlignment -import de.cau.cs.kieler.klighd.krendering.KText /** * @author chsch, alb diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPortExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPortExtensions.xtend index be5315adf..fccd53ac6 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPortExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KPortExtensions.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.krendering.extensions +import com.google.inject.Inject import com.google.inject.Injector import com.google.inject.Scope import de.cau.cs.kieler.klighd.kgraph.KNode @@ -30,7 +31,6 @@ import de.cau.cs.kieler.klighd.krendering.KText import de.cau.cs.kieler.klighd.krendering.VerticalAlignment import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared import java.util.ArrayList -import javax.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.PortSide import org.eclipse.elk.core.util.Maybe diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath index 331ef7b4c..8d0c758d4 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.project b/plugins/de.cau.cs.kieler.klighd.krendering/.project index 80b683b0b..4f35e1a82 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.project +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.core.resources.prefs index d21086fd2..37c5425ac 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.core.resources.prefs +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.core.resources.prefs @@ -1,7 +1,7 @@ -#Wed Mar 14 16:03:33 CET 2012 eclipse.preferences.version=1 encoding//model/krendering_all.ecorediag=UTF-8 encoding//model/krendering_core.ecorediag=UTF-8 encoding//model/krendering_placement.ecorediag=UTF-8 encoding//model/krendering_renderings.ecorediag=UTF-8 encoding//model/krendering_styles.ecorediag=UTF-8 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.jdt.core.prefs index c684e86e0..5dddc113e 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +15,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +114,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +176,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +234,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +272,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +303,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml index d1118f04b..6ff52660a 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd @@ -13,6 +14,44 @@ 2.2.1-SNAPSHOT eclipse-plugin + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + com.google.guava + guava + ${guava-version} + + + com.google.inject + guice + ${guice-version} + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.graph + ${elk-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + src diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.classpath b/plugins/de.cau.cs.kieler.klighd.lsp/.classpath index 2b97fef5b..7cd7b128b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.lsp/.classpath @@ -1,9 +1,12 @@ - - + + + + + - - - + + + diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.project b/plugins/de.cau.cs.kieler.klighd.lsp/.project index f967bc564..27cf23a80 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/.project +++ b/plugins/de.cau.cs.kieler.klighd.lsp/.project @@ -15,9 +15,26 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF index e0e0efef2..dd80b0673 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams as Language Server Bundle-SymbolicName: de.cau.cs.kieler.klighd.lsp;singleton:=true Bundle-Version: 2.2.1.qualifier Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.lsp, de.cau.cs.kieler.klighd.lsp.gson_utils, de.cau.cs.kieler.klighd.lsp.interactive, @@ -12,7 +12,6 @@ Export-Package: de.cau.cs.kieler.klighd.lsp, de.cau.cs.kieler.klighd.lsp.interactive.rectpacking, de.cau.cs.kieler.klighd.lsp.launch, de.cau.cs.kieler.klighd.lsp.model, - de.cau.cs.kieler.klighd.lsp.setup, de.cau.cs.kieler.klighd.lsp.utils Bundle-Vendor: Kiel University Bundle-Localization: plugin diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml index 76a30f44a..eb1f1d8d6 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml @@ -4,17 +4,204 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml - de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.lsp - 2.2.1-SNAPSHOT eclipse-plugin + + + + + com.google.code.gson + gson + ${gson-version} + + + com.google.guava + guava + ${guava-version} + + + com.google.inject + guice + ${guice-version} + + + ${project.groupId} + de.cau.cs.kieler.kgraph.text + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd.ide + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering.extensions + ${project.version} + jar + + + ${project.groupId} + de.cau.cs.kieler.klighd.standalone + ${project.version} + jar + + + org.eclipse.elk + org.eclipse.elk.alg.layered + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.alg.rectpacking + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.core + ${elk-version} + + + org.eclipse.elk + org.eclipse.elk.graph + ${elk-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.lsp4j + org.eclipse.lsp4j + ${lsp4j-version} + + + org.eclipse.lsp4j + org.eclipse.lsp4j.generator + ${lsp4j-version} + + + org.eclipse.lsp4j + org.eclipse.lsp4j.jsonrpc + ${lsp4j-version} + + + org.eclipse.sprotty + org.eclipse.sprotty.xtext + ${sprotty-version} + + + org.eclipse.sprotty + org.eclipse.sprotty.layout + ${sprotty-version} + + + org.eclipse.xtend + org.eclipse.xtend.lib + ${xtend-version} + + + org.eclipse.xtext + org.eclipse.xtext + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.ide + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.util + ${xtext-version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + ${xtext-version} + + + + de.cau.cs.kieler.swt.mock + org.eclipse.swt + ${swt-mock-version} + + + de.cau.cs.kieler.swt.mock + org.eclipse.ui + ${swt-mock-version} + + + de.cau.cs.kieler.swt.mock + org.eclipse.jface + ${swt-mock-version} + + + + + + + + ${project.groupId} + de.cau.cs.kieler.klighd + ${project.version} + + + org.eclipse.platform + org.eclipse.swt + + + org.eclipse.platform + org.eclipse.ui + + + org.eclipse.platform + org.eclipse.jface + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + src + + + src/resources + + diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLanguageServer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLanguageServer.xtend index ccb83b895..8f7f4b28c 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLanguageServer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLanguageServer.xtend @@ -25,9 +25,7 @@ import java.util.concurrent.BlockingQueue import java.util.concurrent.Executors import java.util.concurrent.LinkedBlockingQueue import java.util.function.Consumer -import org.apache.log4j.Logger import org.eclipse.elk.core.util.Maybe -import org.eclipse.lsp4j.services.LanguageServer import org.eclipse.xtext.ide.server.LanguageServerImpl /** @@ -50,8 +48,6 @@ abstract class AbstractLanguageServer implements Runnable { static val defaultHost = "localhost" - static val LOG = Logger.getLogger(LanguageServer) - extension ILanguageRegistration languageRegistration extension ILsCreator creator @@ -139,15 +135,15 @@ abstract class AbstractLanguageServer implements Runnable { println(e.stackTrace) return } - LOG.info("Connection to: " + host + ":" + port) + println("Connection to: " + host + ":" + port) // Register all languages - LOG.info("Starting language server socket") + println("Starting language server socket") bindAndRegisterLanguages() val serverSocket = AsynchronousServerSocketChannel.open.bind(new InetSocketAddress(host, port)) val threadPool = Executors.newCachedThreadPool() - LOG.info("Language Server Socket ready!") + println("Language Server Socket ready!") while (true) { val socketChannel = serverSocket.accept.get @@ -155,9 +151,9 @@ abstract class AbstractLanguageServer implements Runnable { val out = Channels.newOutputStream(socketChannel) val injector = Guice.createInjector(createLSModules(true)) val ls = injector.getInstance(LanguageServerImpl) - LOG.info("Starting language server for client " + socketChannel.remoteAddress) + println("Starting language server for client " + socketChannel.remoteAddress) buildAndStartLS(injector, ls, in, out, threadPool, [new ReflectiveMessageValidatorExcludingSKGraph(it)], true) - LOG.info("Finished language server for client " + socketChannel.remoteAddress) + println("Finished language server for client " + socketChannel.remoteAddress) } } else { LanguageServerLauncher.launch(languageRegistration, creator) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend index e7cc65ab4..5288abf61 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend @@ -19,6 +19,8 @@ package de.cau.cs.kieler.klighd.lsp.launch import com.google.common.base.Throwables import com.google.gson.GsonBuilder import com.google.inject.Injector +import com.google.inject.name.Names +import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess import de.cau.cs.kieler.klighd.IKlighdStatusManager import de.cau.cs.kieler.klighd.Klighd import de.cau.cs.kieler.klighd.KlighdDataManager @@ -29,11 +31,6 @@ import de.cau.cs.kieler.klighd.lsp.LSPUtil import de.cau.cs.kieler.klighd.lsp.SprottyViewer import de.cau.cs.kieler.klighd.lsp.gson_utils.KGraphTypeAdapterUtil import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup -import java.awt.Font -import java.awt.FontFormatException -import java.awt.GraphicsEnvironment -import java.io.File -import java.io.IOException import java.io.InputStream import java.io.OutputStream import java.util.Collection @@ -48,6 +45,8 @@ import org.eclipse.lsp4j.jsonrpc.Launcher.Builder import org.eclipse.lsp4j.jsonrpc.MessageConsumer import org.eclipse.lsp4j.services.LanguageClient import org.eclipse.sprotty.xtext.launch.DiagramServerLauncher.LanguageClientAppender +import org.eclipse.xtext.Constants +import org.eclipse.xtext.IGrammarAccess import org.eclipse.xtext.ide.server.ILanguageServerExtension import org.eclipse.xtext.ide.server.IMultiRootWorkspaceConfigFactory import org.eclipse.xtext.ide.server.LanguageServerImpl @@ -90,6 +89,9 @@ abstract class AbstractLsCreator implements ILsCreator { // the WorkspaceConfigFactory is overridden to disable the creation of a folder with Xtext nature. bind(IMultiRootWorkspaceConfigFactory).to(BasicProjectWorkspaceConfigFactory) + + bind(IGrammarAccess).to(KGraphGrammarAccess) + bind(String).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("de.cau.cs.kieler.kgraph.text.KGraph"); ], // Diagram related bindings new KGraphDiagramModule(), diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index bcfda4bdf..3eefee9ab 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -325,16 +325,16 @@ final class RenderingPreparer { } else if (parentRendering instanceof KPolyline) { // For a KPolyline as the parent rendering the points have to be extracted from the parent edge, // if it is one or the point list of the polyline (preference to the parent's edge points). - var List pointList = new ArrayList() + var List pointList = new ArrayList() if (parent instanceof KEdge) { val edge = parent as KEdge - pointList.add(edge.sourcePoint) - pointList.addAll(edge.bendPoints) - pointList.add(edge.targetPoint) + pointList.add(new Point2D.Float(edge.sourcePoint.x, edge.sourcePoint.y)) + pointList.addAll(edge.bendPoints.map[ new Point2D.Float(it.x, it.y) ]) + pointList.add(new Point2D.Float(edge.targetPoint.x, edge.targetPoint.y)) } else if (!parentRendering.points.empty) { pointList.addAll(parentRendering.points.map[position | - PlacementUtil.evaluateKPosition(position, parentBounds, true)]) + PlacementUtil.evaluateKPosition(position, parentBounds, true).toPoint2D]) } else { throw new IllegalArgumentException("The parent element of the KPolyline is not a KEdge or " + "the pointList of the KPolyline rendering is empty") diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml index 75e1160a5..0c365cca2 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml index 97e0e1074..98b151d07 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml index a1275c242..611dfbe16 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml @@ -4,8 +4,9 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath index eca7bdba8..43b986286 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath @@ -3,5 +3,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.project b/plugins/de.cau.cs.kieler.klighd.piccolo/.project index 2db7722a0..7bb0fef5a 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/.project +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -20,9 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.xtext.ui.shared.xtextNature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.jdt.core.prefs index d893d69cc..684b002cf 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -18,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -99,7 +104,10 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +115,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -203,11 +214,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -238,6 +250,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -262,13 +276,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -316,6 +334,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -352,9 +372,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -380,7 +403,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook new file mode 100644 index 000000000..a7cd67c82 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook @@ -0,0 +1 @@ +de.cau.cs.kieler.klighd.piccolo.export.PiccoloSetup \ No newline at end of file diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/plugin.xml b/plugins/de.cau.cs.kieler.klighd.piccolo/plugin.xml index 9debd1af2..161285ef0 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/plugin.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/plugin.xml @@ -27,16 +27,9 @@ subFormat="png" supportsTiling="true"> - - - - + + - ignore - - - - diff --git a/plugins/de.cau.cs.kieler.klighd/.classpath b/plugins/de.cau.cs.kieler.klighd/.classpath index eca7bdba8..6122403cc 100644 --- a/plugins/de.cau.cs.kieler.klighd/.classpath +++ b/plugins/de.cau.cs.kieler.klighd/.classpath @@ -1,7 +1,11 @@ - + + + + + - - + + diff --git a/plugins/de.cau.cs.kieler.klighd/.project b/plugins/de.cau.cs.kieler.klighd/.project index 9cffa914d..9fc582929 100644 --- a/plugins/de.cau.cs.kieler.klighd/.project +++ b/plugins/de.cau.cs.kieler.klighd/.project @@ -25,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.jdt.core.prefs index c684e86e0..de96c6c21 100644 --- a/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,16 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -7,17 +18,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -103,11 +117,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -138,6 +153,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,13 +179,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -216,6 +237,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -252,9 +275,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -280,7 +306,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 000000000..56e3bbe88 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/de.cau.cs.kieler.klighd/plugin.xml b/plugins/de.cau.cs.kieler.klighd/plugin.xml index 202010ac0..ba2be248e 100644 --- a/plugins/de.cau.cs.kieler.klighd/plugin.xml +++ b/plugins/de.cau.cs.kieler.klighd/plugin.xml @@ -69,12 +69,8 @@ class="de.cau.cs.kieler.klighd.actions.ScaleResetAction" id="de.cau.cs.kieler.klighd.actions.ScaleResetAction"> - - + class="de.cau.cs.kieler.klighd.KlighdSetup"> diff --git a/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml b/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml new file mode 100644 index 000000000..25d1fb574 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml @@ -0,0 +1,80 @@ + + + 4.0.0 + + de.cau.cs.kieler.klighd + parent + 2.2.1-SNAPSHOT + ../../pom.xml + + + + + de.cau.cs.kieler.klighd + de.cau.cs.kieler.klighd + 2.2.1-SNAPSHOT + eclipse-plugin + + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + org.eclipse.elk + org.eclipse.elk.core.service + ${elk-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.emf + org.eclipse.emf.edit + ${emf-edit-version} + + + org.eclipse.platform + org.eclipse.jface + ${jface-version} + + + org.eclipse.platform + org.eclipse.swt + ${swt-version} + + + org.eclipse.platform + org.eclipse.ui.workbench + ${ui-workbench-version} + + + com.google.inject + guice + ${guice-version} + + + com.google.guava + guava + ${guava-version} + + + + + src + + diff --git a/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml b/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml new file mode 100644 index 000000000..3bc06649b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + de.cau.cs.kieler.klighd + parent + 2.2.1-SNAPSHOT + ../../pom.xml + + + + + de.cau.cs.kieler.klighd + de.cau.cs.kieler.klighd + 2.2.1-SNAPSHOT + + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + org.eclipse.elk + org.eclipse.elk.core.service + ${elk-version} + + + org.eclipse.platform + org.eclipse.ui.workbench + + + org.eclipse.platform + org.eclipse.jface + + + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.emf + org.eclipse.emf.edit + ${emf-edit-version} + + + de.cau.cs.kieler.swt.mock + org.eclipse.jface + ${swt-mock-version} + + + de.cau.cs.kieler.swt.mock + org.eclipse.swt + ${swt-mock-version} + + + de.cau.cs.kieler.swt.mock + org.eclipse.ui + ${swt-mock-version} + + + com.google.inject + guice + ${guice-version} + + + com.google.guava + guava + ${guava-version} + + + + + src + + \ No newline at end of file diff --git a/plugins/de.cau.cs.kieler.klighd/pom.xml b/plugins/de.cau.cs.kieler.klighd/pom.xml index 8185e9d1f..25d1fb574 100644 --- a/plugins/de.cau.cs.kieler.klighd/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd/pom.xml @@ -4,23 +4,77 @@ 4.0.0 de.cau.cs.kieler.klighd - plugins + parent 2.2.1-SNAPSHOT + ../../pom.xml + + de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd 2.2.1-SNAPSHOT eclipse-plugin + + + ${project.groupId} + de.cau.cs.kieler.klighd.kgraph + ${project.version} + + + ${project.groupId} + de.cau.cs.kieler.klighd.krendering + ${project.version} + + + org.eclipse.platform + org.eclipse.core.runtime + ${core-runtime-version} + + + org.eclipse.elk + org.eclipse.elk.core.service + ${elk-version} + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.emf + org.eclipse.emf.edit + ${emf-edit-version} + + + org.eclipse.platform + org.eclipse.jface + ${jface-version} + + + org.eclipse.platform + org.eclipse.swt + ${swt-version} + + + org.eclipse.platform + org.eclipse.ui.workbench + ${ui-workbench-version} + + + com.google.inject + guice + ${guice-version} + + + com.google.guava + guava + ${guava-version} + + + src - - - - diff --git a/plugins/pom.xml b/plugins/pom.xml index 72a8d66bd..51e7be334 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -12,4 +12,16 @@ 2.2.1-SNAPSHOT + + + + + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index dc7160ca2..0eb620597 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ plugins/de.cau.cs.kieler.klighd.standalone test/de.cau.cs.kieler.klighd.test test/de.cau.cs.kieler.klighd.piccolo.test - plugins/de.cau.cs.kieler.klighd.piccolo.batik + plugins/de.cau.cs.kieler.klighd.piccolo.draw2d plugins/de.cau.cs.kieler.klighd.piccolo.freehep plugins/de.cau.cs.kieler.klighd.ui @@ -39,7 +39,7 @@ plugins/de.cau.cs.kieler.kgraph.text.ui features/de.cau.cs.kieler.klighd.feature - features/de.cau.cs.kieler.klighd.batik.feature + features/de.cau.cs.kieler.klighd.draw2d.feature features/de.cau.cs.kieler.klighd.freehep.feature features/de.cau.cs.kieler.klighd.ide.feature @@ -51,9 +51,24 @@ + 3.18.0 + 3.26.0 + 0.8.1 + 2.26.0 + 2.28.0 + 2.17.0 + 2.9.0 + 31.1-jre + 5.1.0 + 3.27.0 + 0.15.0 + 0.9.0 + 0.1.0-SNAPSHOT + 3.121.0 2.7.3 + 3.126.0 + 2.28.0 2.28.0 - 0.8.1 @@ -94,26 +109,22 @@ - + + + + - - - - de.cau.cs.kieler.klighd - edu.umd.cs.piccolo - 1.3.4.v20200330 - - - - + org.eclipse.platform org.eclipse.ui.workbench @@ -136,6 +147,22 @@ + + + org.eclipse.emf + org.eclipse.emf.ecore + ${emf-ecore-version} + + + org.eclipse.platform + org.eclipse.e4.ui.workbench.renderers.swt + 0.15.600 + + + org.eclipse.emf + org.eclipse.emf.ecore.change + 2.14.0 + @@ -152,6 +179,7 @@ + src @@ -217,6 +245,16 @@ + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + true + + + org.eclipse.xtend diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml index 5befbc459..dbeb819f7 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml @@ -49,6 +49,13 @@ + + + maven-deploy-plugin + + true + + diff --git a/test/de.cau.cs.kieler.klighd.test/pom.xml b/test/de.cau.cs.kieler.klighd.test/pom.xml index c602dbbac..eb938280e 100644 --- a/test/de.cau.cs.kieler.klighd.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.test/pom.xml @@ -40,6 +40,13 @@ + + + maven-deploy-plugin + + true + + diff --git a/test/pom.xml b/test/pom.xml index 3bf23d411..9e7f0d2c5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -12,4 +12,16 @@ 2.2.1-SNAPSHOT + + + + + maven-deploy-plugin + + true + + + + + \ No newline at end of file From 27e37be3ee7f84c5ac2215ca64e36a7edcf19b94 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 17 May 2023 17:44:01 +0200 Subject: [PATCH 55/76] build: added required information for publishing to OSSRH. --- .../de.cau.cs.kieler.kgraph.text.ide/pom.xml | 4 + .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.kgraph.text.ui/pom.xml | 4 + plugins/de.cau.cs.kieler.kgraph.text/pom.xml | 4 + plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 4 + .../pom.xml | 4 + .../de.cau.cs.kieler.klighd.kgraph/pom.xml | 4 + .../pom.xml | 4 + .../pom.xml | 4 + plugins/de.cau.cs.kieler.klighd.lsp/pom.xml | 3 + .../pom.xml | 4 + .../pom.xml | 4 + .../pom.xml | 4 + .../de.cau.cs.kieler.klighd.piccolo/pom.xml | 4 + .../pom.xml | 4 + .../pom.xml | 4 + .../de.cau.cs.kieler.klighd.ui.emf/pom.xml | 4 + .../de.cau.cs.kieler.klighd.ui.view/pom.xml | 4 + .../de.cau.cs.kieler.klighd.ui.wizard/pom.xml | 4 + plugins/de.cau.cs.kieler.klighd.ui/pom.xml | 4 + .../de.cau.cs.kieler.klighd/pom.eclipse.xml | 4 + plugins/de.cau.cs.kieler.klighd/pom.lsp.xml | 4 + plugins/de.cau.cs.kieler.klighd/pom.xml | 4 + pom.xml | 144 ++++++++++++++++++ 24 files changed, 232 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml index 99dbe695e..144fd70ee 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER KGraph Text Ide + KIELER KGraph Text Ide + https://github.com/kieler/KLighD + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF index 4bb12736d..be26dc4fe 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: KIELER Textual ELK KGraph Language UI +Bundle-Name: KIELER Textual KGraph Language UI Bundle-Vendor: Kiel University Bundle-Version: 2.2.1.qualifier Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ui; singleton:=true diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml index c44b61b1d..a6474d218 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Textual KGraph Language UI + KIELER Textual KGraph Language UI + https://github.com/kieler/KLighD + src diff --git a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml index df113db21..2e63efd3f 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Textual KGraph Language + KIELER Textual KGraph Language + https://github.com/kieler/KLighD + org.eclipse.xtext diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml index cec111d7e..a1dc8179b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams Ide Components + KIELER Lightweight Diagrams Ide Components + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml index 79d84f37a..33fbaf509 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml @@ -13,6 +13,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KlighD incremental update extension + KlighD incremental update extension + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml index b5d9be0e7..7384cf43b 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams Graph Model + KIELER Lightweight Diagrams Graph Model + https://github.com/kieler/KLighD + com.google.guava diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml index 94d6b8e81..dea1bcd61 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams Xtend-based Extension Library + KIELER Lightweight Diagrams Xtend-based Extension Library + https://github.com/kieler/KLighD + org.eclipse.platform diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml index 6ff52660a..d86f61582 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Transient Diagram Format Definition + KIELER Transient Diagram Format Definition + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml index eb1f1d8d6..e19172042 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml @@ -12,6 +12,9 @@ de.cau.cs.kieler.klighd.lsp eclipse-plugin + KIELER Lightweight Diagrams as Language Server + KIELER Lightweight Diagrams as Language Server + https://github.com/kieler/KLighD diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml index 0c365cca2..f38782fff 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/pom.xml @@ -13,4 +13,8 @@ de.cau.cs.kieler.klighd.piccolo.batik 2.2.1-SNAPSHOT eclipse-plugin + + KIELER Lightweight Diagrams Vector Graphics Export Powered by Batik + KIELER Lightweight Diagrams Vector Graphics Export Powered by Batik + https://github.com/kieler/KLighD diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml index 98b151d07..c687b625c 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml @@ -13,4 +13,8 @@ de.cau.cs.kieler.klighd.piccolo.draw2d 2.2.1-SNAPSHOT eclipse-plugin + + KLighD Piccolo Binding Extension Supporting Draw2d Figures + KLighD Piccolo Binding Extension Supporting Draw2d Figures + https://github.com/kieler/KLighD diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml index 611dfbe16..e77794435 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml @@ -13,4 +13,8 @@ de.cau.cs.kieler.klighd.piccolo.freehep 2.2.1-SNAPSHOT eclipse-plugin + + KIELER Lightweight Diagrams Vector Graphics Export Powered by FreeHEP + KIELER Lightweight Diagrams Vector Graphics Export Powered by FreeHEP + https://github.com/kieler/KLighD diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml index c8d095822..7072ed8e9 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams Powered by Piccolo2D + KIELER Lightweight Diagrams Powered by Piccolo2D + https://github.com/kieler/KLighD + com.google.guava diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml b/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml index e66d4f3c5..6bf328f7f 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams Standalone Setup + KIELER Lightweight Diagrams Standalone Setup + https://github.com/kieler/KLighD + com.google.inject diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml index 9bded6eff..23a709c8a 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml @@ -13,4 +13,8 @@ de.cau.cs.kieler.klighd.ui.contrib3x 2.2.1-SNAPSHOT eclipse-plugin + + KLighD-specific Eclipse 3x UI contributions + KLighD-specific Eclipse 3x UI contributions + https://github.com/kieler/KLighD diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml index 0130d7cf1..fd47b7ac4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml @@ -13,4 +13,8 @@ de.cau.cs.kieler.klighd.ui.emf 2.2.1-SNAPSHOT eclipse-plugin + + KLighD Model Modification Extensions for EMF Domains + KLighD Model Modification Extensions for EMF Domains + https://github.com/kieler/KLighD \ No newline at end of file diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml index c9e6ec81d..0716f9242 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Diagram View + KIELER Diagram View + https://github.com/kieler/KLighD + src diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml index 5b5b26c58..61d31ddb3 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Plug-In Wizard for KLighD-Based Projects + KIELER Plug-In Wizard for KLighD-Based Projects + https://github.com/kieler/KLighD + src diff --git a/plugins/de.cau.cs.kieler.klighd.ui/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui/pom.xml index a634ad7be..20c60de58 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui/pom.xml @@ -14,6 +14,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams UI Components + KIELER Lightweight Diagrams UI Components + https://github.com/kieler/KLighD + src diff --git a/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml b/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml index 25d1fb574..046c8845d 100644 --- a/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml +++ b/plugins/de.cau.cs.kieler.klighd/pom.eclipse.xml @@ -16,6 +16,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams (KLighD) + KIELER Lightweight Diagrams (KLighD) + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml b/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml index 3bc06649b..a6f3792cb 100644 --- a/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml +++ b/plugins/de.cau.cs.kieler.klighd/pom.lsp.xml @@ -25,6 +25,10 @@ de.cau.cs.kieler.klighd 2.2.1-SNAPSHOT + KIELER Lightweight Diagrams (KLighD) + KIELER Lightweight Diagrams (KLighD) + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/plugins/de.cau.cs.kieler.klighd/pom.xml b/plugins/de.cau.cs.kieler.klighd/pom.xml index 25d1fb574..046c8845d 100644 --- a/plugins/de.cau.cs.kieler.klighd/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd/pom.xml @@ -16,6 +16,10 @@ 2.2.1-SNAPSHOT eclipse-plugin + KIELER Lightweight Diagrams (KLighD) + KIELER Lightweight Diagrams (KLighD) + https://github.com/kieler/KLighD + ${project.groupId} diff --git a/pom.xml b/pom.xml index 0eb620597..8faf5c2ff 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,39 @@ + + KLighD + KIELER Lightweight Diagams + https://github.com/kieler/KLighD + + + + EPL-2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + + Christian Schneider + christian.schneider@typefox.io + TypeFox + https://www.typefox.io/ + + + Niklas Rentz + nre@informatik.uni-kiel.de + Kiel University + https://www.rtsys.informatik.uni-kiel.de/ + + + + + scm:git:git://github.com:kieler/KLighD.git + scm:git:ssh://github.com:kieler/KLighD.git + https://github.com/kieler/KLighD + + os-macosx @@ -106,6 +139,49 @@ -XstartOnFirstThread + + + release + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + false + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + 0x22B04AC3 + + + + + + + + + @@ -176,6 +252,17 @@ file://klighd + + @@ -318,6 +405,63 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + + + generated + a + EMF generated code + + + model + a + EMF model element + + + ordered + a + EMF ordered element + + + + implSpec + a + Implementation Specification: + + + + containsExtensions + a + This class contains Xtend extension methods. + + + extensionCategory + a + Extension Category: + + + example + a + Code Example: + + + + + + attach-javadocs + + jar + + + + From 8e79a551801e44abc8efea84ba2bcc3753a151b3 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 17 May 2023 19:04:09 +0200 Subject: [PATCH 56/76] all: fixed all Javadoc errors. Removed legacy uses of kieler.design tags. Updated legacy references to KIML to ELK. --- .../contentassist/KGraphProposalProvider.java | 2 +- .../ui/outline/KGraphOutlineTreeProvider.java | 2 +- .../cs/kieler/kgraph/text/KGraphResource.java | 6 +-- .../kgraph/text/KGraphRuntimeModule.java | 4 +- .../KGraphTransientValueService.java | 2 - .../kieler/klighd/ide/model/ErrorModel.java | 3 -- .../kieler/klighd/ide/model/MessageModel.java | 3 -- .../syntheses/EObjectFallbackSynthesis.xtend | 3 -- .../ide/syntheses/ErrorModelSynthesis.xtend | 3 -- .../ide/syntheses/MessageModelSynthesis.xtend | 3 -- .../action/EcoreModelExpandDetailsAction.java | 2 - .../klighd/incremental/diff/KComparison.java | 2 +- .../klighd/incremental/util/UIDAdapter.java | 4 +- .../klighd/kgraph/EMapPropertyHolder.java | 2 +- .../kieler/klighd/kgraph/KGraphPackage.java | 2 +- .../kgraph/impl/EMapPropertyHolderImpl.java | 2 +- .../kgraph/util/DefaultSelectionIterator.java | 2 +- .../klighd/kgraph/util/KGraphDataUtil.java | 3 +- .../kieler/klighd/kgraph/util/KGraphUtil.java | 30 ++++++------ .../klighd/kgraph/util/SelectionIterator.java | 2 +- .../KContainerRenderingExtensions.xtend | 4 +- .../extensions/KEdgeExtensions.xtend | 2 +- .../model/krendering.ecore | 46 +++++++++---------- .../klighd/krendering/KRenderingUtil.java | 6 +-- .../krendering/ViewSynthesisShared.java | 2 +- .../cau/cs/kieler/klighd/krendering/Arc.java | 8 ++-- .../cs/kieler/klighd/krendering/KAction.java | 4 +- .../kieler/klighd/krendering/KColoring.java | 34 +++++++------- .../klighd/krendering/KGridPlacement.java | 2 +- .../klighd/krendering/KGridPlacementData.java | 4 +- .../klighd/lsp/KGraphDiagramGenerator.xtend | 10 ++-- .../klighd/lsp/KGraphDiagramServer.xtend | 2 +- .../klighd/lsp/KGraphDiagramUpdater.xtend | 8 ++-- .../lsp/KGraphLanguageServerExtension.xtend | 4 +- .../de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend | 2 +- .../lsp/gson_utils/EObjectSerializer.xtend | 5 +- ...ngInteractiveLanguageServerExtension.xtend | 2 +- .../klighd/lsp/launch/AbstractLsCreator.xtend | 2 +- .../lsp/utils/KGraphElementIDGenerator.xtend | 2 +- .../klighd/lsp/utils/RenderingPreparer.xtend | 2 +- .../klighd/lsp/utils/SprottyProperties.xtend | 2 +- .../klighd/piccolo/draw2d/Draw2DNode.java | 2 - .../piccolo/freehep/FreeHEPSVGGraphics.java | 2 +- .../freehep/SemanticFreeHEPSVGGraphics.java | 2 +- .../cs/kieler/klighd/piccolo/KlighdNode.java | 6 +-- .../klighd/piccolo/KlighdSWTGraphics.java | 8 ++-- .../export/AbstractDiagramExporter.java | 6 +-- .../export/AbstractExportBranding.java | 8 ++-- .../export/KlighdAbstractSVGGraphics.java | 6 +-- .../piccolo/export/KlighdCanvasExporter.java | 6 +-- .../klighd/piccolo/export/SVGExporter.java | 3 +- .../klighd/piccolo/internal/KlighdCanvas.java | 8 ++-- .../piccolo/internal/KlighdSWTGraphicsEx.java | 2 +- .../internal/KlighdSWTGraphicsImpl.java | 2 +- .../activities/ApplyBendPointsActivity.java | 2 +- .../AbstractKGERenderingController.java | 2 +- .../controller/DiagramController.java | 2 - .../controller/DiagramZoomController.java | 2 +- .../DiagramZoomControllerBoundsComputer.java | 6 +-- .../internal/controller/PNodeController.java | 4 +- .../events/KlighdBasicInputEventHandler.java | 2 +- .../events/KlighdSelectionEventHandler.java | 2 +- .../piccolo/internal/nodes/KEdgeNode.java | 2 +- .../piccolo/internal/nodes/KLabelNode.java | 2 +- .../piccolo/internal/nodes/KNodeNode.java | 12 ++--- .../piccolo/internal/nodes/KPortNode.java | 2 +- .../piccolo/internal/nodes/KlighdImage.java | 22 +++------ .../piccolo/internal/nodes/KlighdPath.java | 2 +- .../piccolo/internal/nodes/KlighdPaths.java | 2 +- .../internal/nodes/KlighdStyledText.java | 21 ++++----- .../internal/util/KlighdPaintContext.java | 8 ++-- .../piccolo/internal/util/NodeUtil.java | 2 +- .../piccolo/internal/util/PolylineUtil.java | 9 ++-- .../piccolo/viewer/PiccoloOutlinePage.java | 6 +-- .../klighd/piccolo/viewer/PiccoloTooltip.java | 2 +- .../umd/cs/piccolox/swt/SWTTimerQueue.java | 2 +- .../cs/kieler/klighd/ui/view/DiagramView.java | 3 -- .../ui/view/DiagramViewEditorAdapter.java | 3 -- .../ui/view/SynthesisOptionsPersistence.java | 2 - .../AbstractViewUpdateController.java | 4 +- .../ViewUpdateControllerFactory.java | 3 -- .../EcoreXtextSaveUpdateController.java | 3 -- .../view/controllers/EditorSaveAdapter.java | 3 -- .../ui/view/controllers/EditorUtil.java | 5 -- .../XtextChangeUpdateController.java | 3 -- .../XtextEditorModelChangeAdapter.java | 3 -- .../XtextSelectionHighlighter.java | 2 - .../ui/view/menu/SynthesisSelectionMenu.java | 9 +--- .../action/ErrorModelShowExceptionAction.java | 3 -- .../ui/wizard/KlighdProjectCreator.java | 2 +- .../handlers/KlighdLayoutHandler.java | 3 -- .../internal/handlers/SaveAsImageDialog.java | 2 +- .../ui/internal/options/DiagramSideBar.java | 2 +- .../klighd/ui/parts/DiagramViewPart.java | 2 +- .../ui/printing/DiagramPrintOptions.java | 8 ++-- .../klighd/ui/printing/PrintOptions.java | 18 ++++---- .../ui/printing/dialog/KlighdPrintDialog.java | 2 +- .../ui/printing/dialog/PrintPreviewTray.java | 6 +-- .../klighd/ui/viewers/PiccoloViewerUI.java | 4 +- .../cs/kieler/klighd/DiagramExportConfig.java | 8 ++-- .../cs/kieler/klighd/DisplayedActionData.java | 3 -- .../src/de/cau/cs/kieler/klighd/IAction.java | 9 ++-- .../cs/kieler/klighd/IDiagramExporter.java | 9 ++-- .../kieler/klighd/IDiagramWorkbenchPart.java | 3 -- .../cau/cs/kieler/klighd/IExportBranding.java | 4 +- .../cs/kieler/klighd/IKlighdSelection.java | 3 -- .../klighd/IModelModificationHandler.java | 10 ++-- .../cs/kieler/klighd/IOffscreenRenderer.java | 3 -- .../de/cau/cs/kieler/klighd/ISourceProxy.java | 2 +- .../cau/cs/kieler/klighd/IStyleModifier.java | 3 -- .../cau/cs/kieler/klighd/IUpdateStrategy.java | 3 -- .../cs/kieler/klighd/IViewChangeListener.java | 3 -- .../src/de/cau/cs/kieler/klighd/IViewer.java | 17 ++----- .../cau/cs/kieler/klighd/IViewerProvider.java | 3 -- .../cau/cs/kieler/klighd/KlighdConstants.java | 7 +-- .../cs/kieler/klighd/KlighdDataManager.java | 4 +- .../de/cau/cs/kieler/klighd/KlighdPlugin.java | 3 -- .../cs/kieler/klighd/KlighdPreferences.java | 3 -- .../klighd/LightDiagramLayoutConfig.java | 18 ++++---- .../kieler/klighd/LightDiagramServices.java | 3 -- .../cau/cs/kieler/klighd/SynthesisOption.java | 27 +++++------ .../cau/cs/kieler/klighd/ViewChangeType.java | 3 -- .../de/cau/cs/kieler/klighd/ViewContext.java | 3 -- .../de/cau/cs/kieler/klighd/ZoomStyle.java | 3 -- .../klighd/actions/ClipParentAction.java | 3 -- .../klighd/actions/ClipResetAction.java | 3 -- .../klighd/actions/ClipSelectionAction.java | 3 -- .../actions/ClipTowardsSelectionAction.java | 3 -- .../klighd/actions/CollapseExpandAction.java | 3 -- .../klighd/actions/FocusAndContextAction.java | 2 +- .../klighd/actions/ScaleDownAction.java | 3 -- .../klighd/actions/ScaleResetAction.java | 3 -- .../kieler/klighd/actions/ScaleUpAction.java | 3 -- .../klighd/internal/IDiagramOutlinePage.java | 5 +- .../internal/ILayoutConfigProvider.java | 3 -- .../klighd/internal/ILayoutRecorder.java | 9 ++-- .../cs/kieler/klighd/internal/ISynthesis.java | 5 +- .../internal/macrolayout/AnchorUtil.java | 5 +- .../KlighdDiagramLayoutConnector.java | 20 ++++---- .../KlighdLayoutConfigurationStore.java | 3 -- .../preferences/PreferenceInitializer.java | 3 -- .../util/KlighdInternalProperties.java | 16 +++---- .../util/SourceModelTrackingAdapter.java | 7 +-- .../KCustomRenderingWrapperFactory.java | 3 -- .../kieler/klighd/krendering/KTextUtil.java | 3 -- .../krendering/SimpleUpdateStrategy.java | 3 -- .../LabelDecorationConfigurator.java | 6 +-- .../AbstractKlighdLabelManager.java | 12 ++--- .../management/LabelManagementUtil.java | 4 +- .../management/TruncatingLabelManager.java | 8 +--- .../cs/kieler/klighd/microlayout/Bounds.java | 3 -- .../klighd/microlayout/GridPlacementUtil.java | 5 +- .../klighd/microlayout/PlacementUtil.java | 11 ++--- .../modifiers/PortRotationModifier.java | 5 +- .../syntheses/AbstractDiagramSynthesis.java | 19 ++++---- .../syntheses/DiagramLayoutOptions.java | 20 ++++---- .../klighd/syntheses/DiagramSyntheses.java | 16 +++---- .../DuplicatingDiagramSynthesis.java | 3 -- .../syntheses/GuiceBasedSynthesisFactory.java | 3 -- .../ReinitializingDiagramSynthesisProxy.java | 3 -- .../util/AbstractRunnableWithResult.java | 1 - .../util/CrossDocumentContentAdapter.java | 3 +- .../util/ExpansionAwareLayoutOption.java | 9 ++-- .../cau/cs/kieler/klighd/util/Iterables2.java | 8 +--- .../kieler/klighd/util/KlighdPredicates.java | 16 +++---- .../kieler/klighd/util/KlighdProperties.java | 28 +++++------ .../util/KlighdSemanticDiagramData.java | 3 -- .../util/KlighdSynthesisProperties.java | 32 ++++++------- .../util/LimitedKGraphContentAdapter.java | 3 -- .../cs/kieler/klighd/util/ModelingUtil.java | 3 -- .../klighd/util/RenderingContextData.java | 7 +-- .../klighd/util/RunnableWithResult.java | 4 +- .../kieler/klighd/viewers/AbstractViewer.java | 3 -- .../kieler/klighd/viewers/ContextViewer.java | 7 +-- ...lipGlobalPortLabelVisiblityConfigTest.java | 4 +- .../DiagramClipPortLabelVisibilityTest.java | 4 +- .../klighd/piccolo/test/DiagramClipTest.java | 2 +- ...agramZoomControllerBoundsComputerTest.java | 2 +- .../klighd/piccolo/test/RenderingTest.java | 3 -- .../kieler/klighd/test/ModelingUtilTest.java | 2 +- .../klighd/test/SizeEstimationTest.java | 8 ++-- ...iewChangedNotificationSuppressionTest.java | 4 +- .../test/ViewChangedNotificationTest.java | 4 +- .../runners/ModelCollectionTestRunner.java | 12 ++--- 184 files changed, 389 insertions(+), 676 deletions(-) diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java index abd2166c3..9bee4845b 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java @@ -225,7 +225,7 @@ private void createFloatProposal(final ContentAssistContext context, // --------------------------------------------------------- - // Layout option proposals provided by KIML + // Layout option proposals provided by ELK // --------------------------------------------------------- // CHECKSTYLEOFF MethodName diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/outline/KGraphOutlineTreeProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/outline/KGraphOutlineTreeProvider.java index 12aa50634..c6f44c1af 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/outline/KGraphOutlineTreeProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/outline/KGraphOutlineTreeProvider.java @@ -61,7 +61,7 @@ protected void _createChildren(final IOutlineNode parentNode, final KGraphData g * Create children for edge layouts. * * @param parentNode the parent outline node - * @param edgeLayout an edge layout + * @param edge an edge layout */ protected void _createChildren(final IOutlineNode parentNode, final KEdge edge) { for (EObject childElement : edge.eContents()) { diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java index e8c562d11..36f7895b8 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphResource.java @@ -49,8 +49,6 @@ * ITransientValueService of the out-dated parse tree constructor. * * @author chsch - * @kieler.design proposed 2012-11-01 chsch - * @kieler.rating proposed yellow 2012-11-01 chsch */ public class KGraphResource extends LazyLinkingResource { @@ -100,7 +98,7 @@ protected void doLoad(final InputStream inputStream, final Map options) th if (!this.getContents().isEmpty()) { EObject o = this.getContents().get(0); if (o instanceof KNode) { - // parse persisted key-value pairs using KIML's layout data service + // parse persisted key-value pairs using ELK layout data service KGraphDataUtil.loadDataElements((KNode) o, HANDLED_TYPES_FILTER, ADDITIONAL_PROPERTIES); // validate layout data and references and fill in missing data KGraphUtil.validate((KNode) o); @@ -124,7 +122,7 @@ public void update(final int offset, final int replacedTextLength, final String KNode node = (KNode) EcoreUtil2.getRootContainer(refreshed); if (node != null) { - // parse persisted key-value pairs using KIML's layout data service + // parse persisted key-value pairs using ELK's layout data service KGraphDataUtil.loadDataElements(node, true, ADDITIONAL_PROPERTIES); // validate layout data and references and fill in missing data KGraphUtil.validate(node); diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphRuntimeModule.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphRuntimeModule.java index 2d319dd93..a2d45963f 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphRuntimeModule.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphRuntimeModule.java @@ -67,12 +67,12 @@ public Class bindIFormatter() { /** * Registers a customized {@link ITransientValueService}. Although the serialization is * configured in the - * {@link de.cau.cs.kieler.kgraph.text.serializer.CustomKGraphSemanticSequencer + * {@link de.cau.cs.kieler.kgraph.text.serializer.KGraphSemanticSequencer * KGraphSemanticSequencer} the transient value service is obviously involved while serializing * portions of models after apply semantic modification (quick fixes). This feature is used in * combination with my test case trainer, see * {@link de.cau.cs.kieler.kgraph.text.validation.KGraphJavaValidator KGraphJavaValidator} - * & quick fix provider. + * and quick fix provider. * * @author chsch * diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/serializer/KGraphTransientValueService.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/serializer/KGraphTransientValueService.java index 10ed8cf65..c8e597fe7 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/serializer/KGraphTransientValueService.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/serializer/KGraphTransientValueService.java @@ -33,8 +33,6 @@ * quick fixes. * * @author chsch - * @kieler.design proposed 2012-11-01 chsch - * @kieler.rating proposed yellow 2012-11-01 chsch */ public class KGraphTransientValueService extends DefaultTransientValueService { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java index eba3d3aac..a023536d7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java @@ -27,9 +27,6 @@ * Represents errors and exceptions. Displayed as error message with a huge error sign. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ public class ErrorModel extends MessageModel { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java index 45fed7302..84c902f93 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java @@ -20,9 +20,6 @@ * A simple message model. Provides a title, message and icon. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ // CHECKSTYLEOFF VisibilityModifier public class MessageModel { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index dab73ba85..c594c448d 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -60,9 +60,6 @@ import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* * Diagram synthesis of a {@link EObject}. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ class EObjectFallbackSynthesis extends AbstractDiagramSynthesis { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index ccb01c480..61fd73754 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -33,9 +33,6 @@ import javax.inject.Inject * Diagram synthesis for a {@link MessageModel}. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ class ErrorModelSynthesis extends AbstractDiagramSynthesis { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index b78e21d7a..f5af0a26c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -30,9 +30,6 @@ import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* * Diagram synthesis for a {@link MessageModel}. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ class MessageModelSynthesis extends AbstractDiagramSynthesis { diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java index c80d6cf2a..651273e68 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java @@ -27,8 +27,6 @@ * Expands all details areas of the ecore representation of the model. * * @author als - * @kieler.design 2015-01-01 proposed - * @kieler.rating 2015-01-01 proposed yellow */ public class EcoreModelExpandDetailsAction implements IAction { /** The action id. */ diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java index 747fd9c60..08ea83d2c 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java @@ -29,7 +29,7 @@ import de.cau.cs.kieler.klighd.kgraph.KPort; /** - * Recursively compares two {@link KNodes} via their corresponding {@link UIDAdapter}s. + * Recursively compares two {@link KNode KNodes} via their corresponding {@link UIDAdapter}s. * * @author csp */ diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java index eaf42faf9..1ee88555b 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java @@ -52,9 +52,9 @@ *
KEdge
*
The source port's and target node's and port's ids, if applicable.
*
KLabel
- *
The index in the parent's list of labels. + *
The index in the parent's list of labels.
*
KPort
- *
The index in the parent's list of ports. + *
The index in the parent's list of ports.
* * Any ID clashes are then resolved by consecutive numbering. * diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/EMapPropertyHolder.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/EMapPropertyHolder.java index d59d00d17..2f1b49c9b 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/EMapPropertyHolder.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/EMapPropertyHolder.java @@ -58,7 +58,7 @@ public interface EMapPropertyHolder extends EObject, IPropertyHolder { * * @return the value of the 'Properties' map. * @see de.cau.cs.kieler.klighd.kgraph.KGraphPackage#getEMapPropertyHolder_Properties() - * @model mapType="de.cau.cs.kieler.klighd.kgraph.IPropertyToObjectMap, org.eclipse.emf.ecore.EJavaObject>" transient="true" + * @model mapType="de.cau.cs.kieler.klighd.kgraph.IPropertyToObjectMap<de.cau.cs.kieler.klighd.kgraph.IProperty<?>, org.eclipse.emf.ecore.EJavaObject>" transient="true" * @generated */ EMap, Object> getProperties(); diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/KGraphPackage.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/KGraphPackage.java index 52ba6e85d..8b8ddec6b 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/KGraphPackage.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/KGraphPackage.java @@ -1453,7 +1453,7 @@ public interface KGraphPackage extends EPackage { * * @return the meta object for class 'IProperty To Object Map'. * @see java.util.Map.Entry - * @model keyDataType="de.cau.cs.kieler.klighd.kgraph.IProperty" keyRequired="true" keyTransient="true" + * @model keyDataType="de.cau.cs.kieler.klighd.kgraph.IProperty<?>" keyRequired="true" keyTransient="true" * valueDataType="org.eclipse.emf.ecore.EJavaObject" valueTransient="true" * @generated */ diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/impl/EMapPropertyHolderImpl.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/impl/EMapPropertyHolderImpl.java index 26740b184..713ed421d 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/impl/EMapPropertyHolderImpl.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/impl/EMapPropertyHolderImpl.java @@ -129,7 +129,7 @@ public EList getPersistentEntries() { * @generated NOT */ public void makePersistent() { - // chsch: deactivated the delivering of notifications as that feature is not used in KIML + // chsch: deactivated the delivering of notifications as that feature is not used in ELK // so far and disturbs while working with KLighD boolean deliver = this.eDeliver(); this.eSetDeliver(false); diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/DefaultSelectionIterator.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/DefaultSelectionIterator.java index 1a15a0f5c..fed530941 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/DefaultSelectionIterator.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/DefaultSelectionIterator.java @@ -29,7 +29,7 @@ /** * The default {@link SelectionIterator} for usage in - * {@link KGraphUtilUtil#getConnectedElements(KEdge, boolean) KGraphUtil.getConnectedElements(...)}. + * {@link KGraphUtil#getConnectedElements(KEdge, boolean) KGraphUtil.getConnectedElements(...)}. * The iterator follows all edges transitively connected to the initial edge. Optionally the * iterator can also include the corresponding ports in the selection. */ diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphDataUtil.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphDataUtil.java index c21524268..9fb16c27b 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphDataUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphDataUtil.java @@ -22,7 +22,6 @@ import org.eclipse.elk.core.data.LayoutMetaDataService; import org.eclipse.elk.core.data.LayoutOptionData; -import org.eclipse.elk.core.util.ElkUtil; import org.eclipse.elk.core.util.internal.LayoutOptionProxy; import org.eclipse.elk.graph.properties.IProperty; import org.eclipse.elk.graph.properties.IPropertyHolder; @@ -137,7 +136,7 @@ public static KNode loadDataElements(final KNode graph, /** * A tree iterator that skips properties of {@link EMapPropertyHolder}s. For an explanation of * why this is necessary, see the implementation of - * {@link ElkUtil#loadDataElements(KNode, Predicate, boolean, IProperty...)}. + * {@link KGraphDataUtil#loadDataElements(KNode, Predicate, boolean, IProperty...)}. * * @author cds */ diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphUtil.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphUtil.java index ebd4dfec0..022c8479e 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphUtil.java @@ -135,7 +135,7 @@ public static KEdge createInitializedEdge() { /** * Ensures that each element contained in the given graph is attributed correctly for - * usage in KIML. {@link KGraphElement} + * usage in ELK. {@link KGraphElement} * * @param graph the parent node of a graph */ @@ -310,7 +310,7 @@ private static void ensureLabel(final KLabeledGraphElement element) { /** * A tree iterator that skips persistent entries of {@link EMapPropertyHolder}s. For an * explanation of why this is necessary, see the implementation of - * {@link KGraphDataUtil#loadDataElements()}. + * {@link KGraphDataUtil#loadDataElements(KNode, com.google.common.base.Predicate, org.eclipse.elk.graph.properties.IProperty...)}. */ public static class PersistentEntriesSkippingTreeIterator extends AbstractTreeIterator { @@ -621,13 +621,13 @@ public static void toELKGraphCoordinateSystem(final ElkEdge elkedge, final KInse /** * Determines the edges that are (transitively) connected to the given edges across hierarchy - * boundaries via common ports. See {@link #getConnectedEdges(ElkEdge)} for details. + * boundaries via common ports. See {@link #getConnectedEdges(KEdge)} for details. * - * @see #getConnectedEdges(ElkEdge) + * @see #getConnectedEdges(KEdge) * @param edges * an {@link Iterable} of edges that shall be checked * @return an {@link Iterator} visiting the given edges and all (transitively) connected ones. - * @deprecated Use {@link #getConnectedElements(ElkEdge, SelectionIterator, SelectionIterator)} + * @deprecated Use {@link #getConnectedElements(KEdge, SelectionIterator, SelectionIterator)} * in combination with {@link DefaultSelectionIterator} */ public static Iterator getConnectedEdges(final Iterable edges) { @@ -642,7 +642,7 @@ public Iterator apply(final KEdge kedge) { /** * Determines the edges that are (transitively) connected to the given edge across * hierarchy boundaries via common ports. Rational: Multiple edges that are - * pairwise connected by means of an {@link ElkPort} (target port of edge a == source port of + * pairwise connected by means of a {@link KPort} (target port of edge a == source port of * edge b or vice versa) may form one logical connection. This kind of splitting might be * already present in the view model, or is performed by the layout algorithm for decomposing * a nested layout input graph into flat sub graphs. @@ -651,7 +651,7 @@ public Iterator apply(final KEdge kedge) { * the edge check for connected edges * @return an {@link Iterator} visiting the given edge and all connected edges in a(n * almost) breadth first search fashion - * @deprecated Use {@link #getConnectedElements(ElkEdge, SelectionIterator, SelectionIterator)} + * @deprecated Use {@link #getConnectedElements(KEdge, SelectionIterator, SelectionIterator)} * in combination with {@link DefaultSelectionIterator} */ public static Iterator getConnectedEdges(final KEdge edge) { @@ -661,8 +661,8 @@ public static Iterator getConnectedEdges(final KEdge edge) { /** * Determines the {@link ElkGraphElement ElkGraphElements} that are (transitively) connected to - * {@code kedge} across hierarchy boundaries via common ports. Rational: Multiple {@link ElkEdge - * ElkEdges} that are pairwise connected by means of an {@link ElkPort} (target port of + * {@code edge} across hierarchy boundaries via common ports. Rational: Multiple {@link KEdge + * KEdges} that are pairwise connected by means of a {@link KPort} (target port of * edge a == source port of edge b or vice versa) may form one logical connection. This kind of * splitting might be already present in the view model, or is performed by the layout * algorithm for decomposing a nested layout input graph into flat sub graphs. @@ -674,7 +674,7 @@ public static Iterator getConnectedEdges(final KEdge edge) { * flag to determine, whether ports should be added to the selection or not * @return an {@link Iterator} visiting the given {@code edge} and all connected edges in a(n * almost) breadth first search fashion - * @deprecated Use {@link #getConnectedElements(ElkEdge, SelectionIterator, SelectionIterator)} + * @deprecated Use {@link #getConnectedElements(KEdge, SelectionIterator, SelectionIterator)} * in combination with {@link DefaultSelectionIterator} */ public static Iterator getConnectedElements(final KEdge edge, @@ -687,22 +687,22 @@ public static Iterator getConnectedElements(final KEdge edge, } /** - * Determines the {@link ElkEdge ElkEdges} that are (transitively) connected to {@code edge} - * across hierarchy boundaries via common ports. Rational: Multiple {@link ElkEdge ElkEdges} - * that are pairwise connected by means of na {@link ElkPort} (target port of edge a == source + * Determines the {@link KEdge KEdges} that are (transitively) connected to {@code kedge} + * across hierarchy boundaries via common ports. Rational: Multiple {@link KEdge KEdges} + * that are pairwise connected by means of a {@link KPort} (target port of edge a == source * port of edge b or vice versa) may form one logical connection. This kind of splitting might * be already present in the view model, or is performed by the layout algorithm for * decomposing a nested layout input graph into flat sub graphs. * * @param kedge - * the {@link ElkEdge} check for connected elements + * the {@link KEdge} check for connected elements * @param sourceIterator * the {@link SelectionIterator} to be used for iterating towards the tail of the * selected edge * @param targetIterator * the {@link SelectionIterator} to be used for iterating towards the head of the * selected edge - * @return an {@link Iterator} visiting the given {@code edge} and all connected elements + * @return an {@link Iterator} visiting the given {@code kedge} and all connected elements * determined by the {@link SelectionIterator SelectionIterators} */ public static Iterator getConnectedElements(final KEdge kedge, diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/SelectionIterator.java b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/SelectionIterator.java index 84a93641c..eb64213c1 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/SelectionIterator.java +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/SelectionIterator.java @@ -52,7 +52,7 @@ public SelectionIterator(final KEdge edge) { } /** - * Attach a set of {@link ElkPortt ports} to the iterator to be used as a set of visited ports. + * Attach a set of {@link KPort ports} to the iterator to be used as a set of visited ports. * Can be used to share a set of nodes across multiple iterators (target and source iterator). * * @param visitedSet diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KContainerRenderingExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KContainerRenderingExtensions.xtend index 5da954a67..7ef14cf63 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KContainerRenderingExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KContainerRenderingExtensions.xtend @@ -35,7 +35,7 @@ import de.cau.cs.kieler.klighd.krendering.LineJoin import java.util.List /** - * This class contains lots of convenient helper functions for composing & configuring + * This class contains lots of convenient helper functions for composing and configuring * KRendering-based view models. In order to be consistent with the further extension classes * the extension methods are non-static ones requiring this class to be instantiated. Since this * class doesn't declare any fields (i.e. required memory) except the reference of further extensions @@ -60,7 +60,7 @@ class KContainerRenderingExtensions { //////////////////////////////////////////////////////////////////////////////////////////////////////////// /** - * @returns the child! + * @return the child! */ def T addChild(KContainerRendering parent, T child) { return child => [ diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend index 727f24ffe..5dc2a876c 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend @@ -46,7 +46,7 @@ import org.eclipse.elk.graph.properties.IProperty * * @author chsch * @author ssm - * @autnor nre + * @author nre * * @containsExtensions */ diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore b/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore index 6297f0bb3..bf4cfa34a 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore +++ b/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore @@ -308,7 +308,7 @@ -
+
@@ -353,13 +353,13 @@ -
+
-
+
@@ -688,7 +688,7 @@
-
+
@@ -715,7 +715,7 @@
-
+
@@ -744,7 +744,7 @@
-
+
@@ -773,7 +773,7 @@
-
+
@@ -805,7 +805,7 @@
-
+
@@ -854,7 +854,7 @@
-
+
@@ -881,7 +881,7 @@
-
+
@@ -910,7 +910,7 @@
-
+
@@ -939,7 +939,7 @@
-
+
@@ -971,7 +971,7 @@
-
+
@@ -1037,7 +1037,7 @@
-
+
@@ -1064,7 +1064,7 @@
-
+
@@ -1135,7 +1135,7 @@
-
+
@@ -1162,7 +1162,7 @@
-
+
@@ -1233,7 +1233,7 @@
-
+
@@ -1260,7 +1260,7 @@
-
+
@@ -1307,7 +1307,7 @@
-
+
@@ -1458,12 +1458,12 @@ -
+
-
+
-
+
diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/KRenderingUtil.java b/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/KRenderingUtil.java index a7601f229..f65e6b7fd 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/KRenderingUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/KRenderingUtil.java @@ -173,13 +173,13 @@ public static KGridPlacement asGridPlacement(final KPlacement placement) { /* ------------------------- */ /** - * Singleton {@link KPosition} instance containing {@link KLeftPosition KLeft-} & + * Singleton {@link KPosition} instance containing {@link KLeftPosition KLeft-} and * {@link KTopPosition} components. */ public static final KPosition LEFT_TOP_POS = createLeftTopKPosition(); /** - * Singleton {@link KPosition} instance containing {@link KRightPosition KRight-} & + * Singleton {@link KPosition} instance containing {@link KRightPosition KRight-} and * {@link KBottomPosition} components. */ public static final KPosition RIGHT_BOTTOM_POS = createRightBottomKPosition(); @@ -814,7 +814,7 @@ public static KColor getColor(final String colorString) { } /** - * Creates default @{link KRendering} corresponding to the type of {@link #element} for elements without attached rendering + * Creates default @{link KRendering} corresponding to the type of {@code element} for elements without attached rendering * data. * * @return The default {@link KRendering} model. diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/ViewSynthesisShared.java b/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/ViewSynthesisShared.java index d0fefd8fc..ca7e102b7 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/ViewSynthesisShared.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src-custom/de/cau/cs/kieler/klighd/krendering/ViewSynthesisShared.java @@ -31,7 +31,7 @@ * injecting instances of helper transformations into diagram synthesis implementations.
*
* For more details see - * {@link de.cau.cs.kieler.klighd.syntheses.ReinitializingDiagramSynthesisProxy.ViewSynthesisScope}
+ * {@code de.cau.cs.kieler.klighd.syntheses.ReinitializingDiagramSynthesisProxy.ViewSynthesisScope}
*
* It is defined at this place as I need to use it within the KNode/KPort/KLabel/KEdgeExtensions. * diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/Arc.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/Arc.java index c6ee2547e..264c1bac8 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/Arc.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/Arc.java @@ -42,8 +42,8 @@ public enum Arc implements Enumerator { * * * plain arc without any closing line connection from end to beginning - * {@link Arc2D#OPEN}, {@link Arc2D#CHORD}, and - * * {@link Arc2D#PIE} + * {@link java.awt.geom.Arc2D#OPEN}, {@link java.awt.geom.Arc2D#CHORD}, and + * * {@link java.awt.geom.Arc2D#PIE} * * @see #OPEN_VALUE * @generated @@ -83,8 +83,8 @@ public enum Arc implements Enumerator { * * * plain arc without any closing line connection from end to beginning - * {@link Arc2D#OPEN}, {@link Arc2D#CHORD}, and - * * {@link Arc2D#PIE} + * {@link java.awt.geom.Arc2D#OPEN}, {@link java.awt.geom.Arc2D#CHORD}, and + * * {@link java.awt.geom.Arc2D#PIE} * * @see #OPEN * @model diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KAction.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KAction.java index e25b1e54b..e35c81484 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KAction.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KAction.java @@ -24,7 +24,7 @@ * * * - * performs action on event + * performs action 'id' on 'trigger' event * * *

@@ -48,7 +48,7 @@ public interface KAction extends EObject { * * * - * id of the action implemenation to be executed when occurs; in KLighD such action implementation must be registered via an extension point + * id of the action implementation to be executed when 'trigger' occurs; in KLighD such action implementation must be registered via an extension point * * @return the value of the 'Action Id' attribute. * @see #setActionId(String) diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java index 0a3896465..a99b23e5b 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java @@ -203,7 +203,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the color & alpha or gradient source color & source alpha of this KColoring instance.
+ * Convenience setter for configuring the color and alpha or gradient source color and source alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setColor(KColoring, int, int, int, int) KRenderingUtil.setColor(KColoring, int, int, int, int)}. * @param red the red component of the desired color in range of 0 to 255 * @param green the green component of the desired color in range of 0 to 255 @@ -219,7 +219,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the color & alpha or gradient source color & source alpha of this KColoring instance.
+ * Convenience setter for configuring the color and alpha or gradient source color and source alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setColor(KColoring, Colors, int) KRenderingUtil.setColor(KColoring, Colors, int)}. * @param color a color constant from the {@link Colors} enumeration * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -247,7 +247,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the color & alpha or gradient source color & alpha of this KColoring instance.
+ * Convenience setter for configuring the color and alpha or gradient source color and alpha of this KColoring instance.
* Simply redirects to {@link #setColor(KColor)} and {@link #setAlpha(int)}, and returns this KColoring instance instead of void. * @param color an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -274,7 +274,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the color or gradient source color & alpha of this KColoring instance.
+ * Convenience setter for configuring the color or gradient source color and alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setColorCopyOf(KColoring, KColor, int) KRenderingUtil.setColorCopyOf(KColoring, KColor, int)}. * @param kColor an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -301,7 +301,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the color & alpha or gradient source color & alpha of this KColoring instance.
+ * Convenience setter for configuring the color and alpha or gradient source color and alpha of this KColoring instance.
* Simply redirects to {@link #setColorCopyOf(KColor, int)} and returns this KColoring instance. * @param coloring an instance of {@link KColoring} * @@ -343,7 +343,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient target color & target alpha of this KColoring instance.
+ * Convenience setter for configuring the gradient target color and target alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setTargetColor(KColoring, int, int, int, int) KRenderingUtil.setTargetColor(KColoring, int, int, int, int)}. * @param red the red component of the desired color in range of 0 to 255 * @param green the green component of the desired color in range of 0 to 255 @@ -359,7 +359,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient target color & target alpha of this KColoring instance.
+ * Convenience setter for configuring the gradient target color and target alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setTargetColor(KColoring, Colors, int) KRenderingUtil.setTargetColor(KColoring, Colors, int)}. * @param color a color constant from the {@link Colors} enumeration * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -387,7 +387,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient target color & target alpha of this KColoring instance.
+ * Convenience setter for configuring the gradient target color and target alpha of this KColoring instance.
* Simply redirects to {@link #setTargetColor(KColor)} and {@link #setTargetAlpha(int)}, and returns this KColoring instance instead of void. * @param targetColor an instance of {@link KColor} * @param targetAlpha the alpha component of the desired color in range of 0 to 255 @@ -414,7 +414,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient target color & target alpha of this KColoring instance.
+ * Convenience setter for configuring the gradient target color and target alpha of this KColoring instance.
* Redirects to {@link de.cau.cs.kieler.klighd.krendering.KRenderingUtil#setTargetColorCopyOf(KColoring, KColor, int) KRenderingUtil.setTargetColorCopyOf(KColoring, KColor, int)}. * @param targetColor an instance of {@link KColor} * @param targetAlpha the alpha component of the desired color in range of 0 to 255 @@ -441,7 +441,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient target color & alpha of this KColoring instance.
+ * Convenience setter for configuring the gradient target color and alpha of this KColoring instance.
* Simply redirects to {@link #setTargetColorCopyOf(KColor, int)} and returns this KColoring instance. * @param coloring an instance of {@link KColoring} * @@ -496,7 +496,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas of this KColoring instance.
* Simply redirects to {@link #setColor2(KColor, int)} and {@link #setTargetColor2(KColor, int)}, and returns this KColoring instance. * @param color an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -512,7 +512,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas as well as the color gradient angle of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas as well as the color gradient angle of this KColoring instance.
* Simply redirects to {@link #setColor2(KColor, int)}, {@link #setTargetColor2(KColor, int)}, and {@link #setGradientAngle2(float)}, and returns this KColoring instance. * @param color an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -560,7 +560,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas of this KColoring instance.
* Simply redirects to {@link #setColor(Colors, int)} and {@link #setTargetColor(Colors, int)}, and returns this KColoring instance. * @param color a color constant from the {@link Colors} enumeration * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -577,7 +577,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas as well as the color gradient angle of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas as well as the color gradient angle of this KColoring instance.
* Simply redirects to {@link #setColor(Colors, int)}, {@link #setTargetColor(Colors, int)}, and {@link #setGradientAngle2(float)}, and returns this KColoring instance. * @param color a color constant from the {@link Colors} enumeration * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -624,7 +624,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas of this KColoring instance.
* Simply redirects to {@link #setColorCopyOf(KColor, int)} and {@link #setTargetColorCopyOf(KColor, int)}, and returns this KColoring instance. * @param color an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -640,7 +640,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas as well as the color gradient angle of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas as well as the color gradient angle of this KColoring instance.
* Simply redirects to {@link #setColorCopyOf(KColor, int)}, {@link #setTargetColorCopyOf(KColor, int)}, and {@link #setGradientAngle2(float)}, and returns this KColoring instance. * @param color an instance of {@link KColor} * @param alpha the alpha component of the desired color in range of 0 to 255 @@ -670,7 +670,7 @@ public interface KColoring> extends KStyle { * * * - * Convenience setter for configuring the gradient source and target colors & alphas of this KColoring instance.
+ * Convenience setter for configuring the gradient source and target colors and alphas of this KColoring instance.
* Simply redirects to {@link #setColorsCopiesOf(KColor, int, KColor, int)} and {@link #setGradientAngle2(float)}, and returns this KColoring instance. * @param coloring an instance of {@link KColoring} * diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacement.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacement.java index 4d145e3a6..ded1c2ae3 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacement.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacement.java @@ -23,7 +23,7 @@ * * * - * Creates a grid with inside the area defined by and . + * Creates a grid with 'numColumns' inside the area defined by 'topLeft' and 'bottomRight'. * the grids number of rows depends on the numer of child elements to be placed. Each child is set to the first free column inside the grid. If no column is left, the next childElement is placed in the first column of a new row. * * diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacementData.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacementData.java index ae7fdd8a3..1d04b083d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacementData.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KGridPlacementData.java @@ -99,7 +99,7 @@ public interface KGridPlacementData extends KAreaPlacementData { * * * - * This flag marks the child rendering to cover exactly the required width obtained by means of the minimal size estimation, except for width increases by the macro layout, i.e. by KIML, e.g. in a single column grid. + * This flag marks the child rendering to cover exactly the required width obtained by means of the minimal size estimation, except for width increases by the macro layout, i.e. by ELK, e.g. in a single column grid. * If false, more space may be assigned to the related child rendering, if necessary.
*
* This flag is the replacement of the concrete 'maxCellWidth' value and not examined by KLighD, yet. @@ -128,7 +128,7 @@ public interface KGridPlacementData extends KAreaPlacementData { * * * - * This flag marks the child rendering to cover exactly the required height obtained by means of the minimal size estimation, except for height increases by the macro layout, i.e. by KIML, e.g. in a single row grid. + * This flag marks the child rendering to cover exactly the required height obtained by means of the minimal size estimation, except for height increases by the macro layout, i.e. by ELK, e.g. in a single row grid. * If false, more space may be assigned to the related child rendering, if necessary.
*
* This flag is the replacement of the concrete 'maxCellHeight' value and not examined by KLighD, yet. diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend index 12ef9c2cc..819ad0f07 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend @@ -64,10 +64,10 @@ import org.eclipse.xtend.lib.annotations.Accessors import org.eclipse.xtext.util.CancelIndicator /** - * A diagram generator that can create Sprotty {@link SGraph} from any {@link EObject} that has a registered view + * A diagram generator that can create Sprotty {@link SGraph} from any {@link Object} that has a registered view * synthesis to {@link KNode} for KLighD. - * For translation first call the {@link translateModel} function to translate the EObject to a KNode and then call - * {@link generate(KNode, String, CancelIndicator)} with that KNode to translate it to an SGraph. + * For translation first call the {@link #translateModel(Object, ViewContext)} function to translate the Object to a KNode and then call + * {@link #toSGraph(KNode, String, CancelIndicator)} with that KNode to translate it to an SGraph. * During translation a map for mapping between the source and target element types is generated. * Based on the yang-lsp implementation by TypeFox. * @@ -110,8 +110,8 @@ class KGraphDiagramGenerator implements IDiagramGenerator { protected List>> edgesToGenerate /** - * Creates a {@link ViewContext} containing the KGraph model for any {@link Object} model with a registered - * transformation in KLighD. + * Creates a {@link ViewContext} containing the KGraph model for the {@link ViewContext} of any {@link Object} model + * with a registered transformation in KLighD. */ static def ViewContext translateModel(Object model, ViewContext oldVC) { return LightDiagramServices.translateModel2(model, oldVC) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend index d4c4cdf67..aad234347 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend @@ -144,7 +144,7 @@ class KGraphDiagramServer extends LanguageAwareDiagramServer { /** * Prepares the client side update of the model by processing the potentially needed images on the client. Checks * for client-side cached images with the {@link CheckImagesAction}. If the corresponding response to the - * {@link CheckImagesAction} requires images to be sent, a {@link SendImagesAction} is sent first. After receiving + * {@link CheckImagesAction} requires images to be sent, a {@link StoreImagesAction} is sent first. After receiving * the result back, updates the model with default Sprotty behavior via the {@link #updateModel} function. * Also handles updating the diagram options on the client. * diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend index 7387439d4..cc9b0c7b7 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend @@ -325,9 +325,9 @@ class KGraphDiagramUpdater extends DiagramUpdater { /** * Stores the current synthesisOptions configured in the current {@link ViewContext}. - * Similar to storing the options in Eclipse UI. - * - * @see de.cau.cs.kieler.klighd.ui.view.DiagramView#storeCurrentSynthesisOptions + * Similar to storing the options in Eclipse UI.
+ *
+ * See {@code de.cau.cs.kieler.klighd.ui.view.DiagramView#storeCurrentSynthesisOptions} */ def storeCurrentSynthesisOptions() { synchronized (diagramState) { @@ -406,7 +406,7 @@ class KGraphDiagramUpdater extends DiagramUpdater { } /** - * Makes the protected updateDiagram(List) method accessible from the outside. + * Makes the protected updateDiagram(List<URI>) method accessible from the outside. */ def updateDiagrams2(List uris) { updateDiagrams(uris) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend index 3b228d9ff..087b62b7b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend @@ -543,8 +543,8 @@ class KGraphLanguageServerExtension extends SyncDiagramLanguageServer /** * Provides read access to fully resolved resource, even if it is not an XTextResource. - * Similar to {@link LanguageServerImpl.access#doRead(String, Function)} just without full read access to the - * document. + * Similar to the {@code doRead(String, Function)} function in the private {@code LanguageServerImpl.access} field, + * just without full read access to the document. * * @param path The path to the file that should be read. * @param work What should be done with the Resource. diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend index a5968c7d9..b69faaf60 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend @@ -28,7 +28,7 @@ import de.cau.cs.kieler.klighd.kgraph.KNode class LSPUtil { /** - * Returns the root node of the resource's model behind a given {@cods uri}. + * Returns the root node of the resource's model behind a given {@code uri}. * * @param diagramState The state of the diagram * @param uri The uri that points at the desired resource. diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/gson_utils/EObjectSerializer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/gson_utils/EObjectSerializer.xtend index e608ec529..0eb1d98af 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/gson_utils/EObjectSerializer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/gson_utils/EObjectSerializer.xtend @@ -42,10 +42,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl /** * Serializer that serializes any sub class of {@link EMapPropertyHolder} via reflection while ignoring fields of the * class EMapPropertyHolder itself and its super classes. It serializes only specific properties from - * {@link EMapPropertyHolder#getProperties}, if they are the properties {@link KlighdProperties.CALCULATED_BOUNDS}, - * {@link KlighdProperties.CALCULATED_BOUNDS_MAP}, {@link KlighdProperties.CALCULATED_ROTATION}, or - * {@link KlighdProperties.CALCULATED_ROTATION_MAP}. - * These fields are needed for rendering on any client. + * {@link EMapPropertyHolder#getProperties}, see {@link KGraphMappingUtil#keepProperty}. * * @author nre */ diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index b7c7bd35a..61ad1b56f 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -152,7 +152,7 @@ class RectpackingInteractiveLanguageServerExtension implements ILanguageServerEx * Sets the aspect ratio. * * @param constraint The aspect ratio constraint. - * @param The client id of the corresponding diagram view. + * @param clientId The client id of the corresponding diagram view. */ def setAspectRatio(SetAspectRatio constraint, String clientId) { val uri = diagramState.getURIString(clientId) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend index 5288abf61..246644a01 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend @@ -107,7 +107,7 @@ abstract class AbstractLsCreator implements ILsCreator { * @param ls the LangaugeServerImpl that is started. Usually the KGraphLSExtension, which is a DiagramLanguageServer * @param in InputStream for communication * @param out OutputStream for communication - * @param threadPool ExecutorService + * @param executorService ExecutorService * @param wrapper * @param socket whether the LS is created for the socket or stdio case */ diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend index f5496b2f1..73c73ac12 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend @@ -248,7 +248,7 @@ class KRenderingIdGenerator { /** * Finds the {@link KRendering} in the data of the given {@code element} matching the {@code id} if the IDs have - * been previously generated by {@link KRenderingIDGenerator#generateIdsRecursive}. + * been previously generated by {@link KRenderingIdGenerator#generateIdsRecursive}. * * @param element The element to search the rendering in. * @param id The ID to look for. diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 3eefee9ab..11eeac5db 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -70,7 +70,7 @@ final class RenderingPreparer { * See {@link #setBounds} and {@link #setDecoration}. * In case of a {@link KRenderingRef} the bounds and decoration are persisted for every referenced rendering as a map * inside the properties of the reference. - * For example: + * For example: <id of the rendering in the library: bounds in this instance> * Furthermore, for every rendering a unique ID is generated. * Finally, modifiable styles defined by the synthesis are processed for the rendering. * diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/SprottyProperties.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/SprottyProperties.xtend index a53b25a1b..147ee4d3e 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/SprottyProperties.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/SprottyProperties.xtend @@ -82,7 +82,7 @@ class SprottyProperties { /** * Sets the unique rendering ID on the given rendering. * - * @param The rendering to set the new ID on. + * @param rendering The rendering to set the new ID on. * @param id The new ID. * @return The previous ID set on this element, or null. */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DNode.java index 40fa49d6b..a9e6c2451 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DNode.java @@ -45,8 +45,6 @@ * * @author msp * @author chsch - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class Draw2DNode extends KCustomFigureNode { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/FreeHEPSVGGraphics.java b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/FreeHEPSVGGraphics.java index 6e4664819..08c1453f4 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/FreeHEPSVGGraphics.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/FreeHEPSVGGraphics.java @@ -46,7 +46,7 @@ public class FreeHEPSVGGraphics extends KlighdAbstractSVGGraphics { /** * @param bounds - * the bounds will be set as viewport values for the resulting root tag. + * the bounds will be set as viewport values for the resulting root <svg ..> tag. * @param textAsShapes * whether text should be rendered as shapes * @param embedFonts diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/SemanticFreeHEPSVGGraphics.java b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/SemanticFreeHEPSVGGraphics.java index c099bd73c..e6fe89391 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/SemanticFreeHEPSVGGraphics.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/src/de/cau/cs/kieler/klighd/piccolo/freehep/SemanticFreeHEPSVGGraphics.java @@ -50,7 +50,7 @@ public class SemanticFreeHEPSVGGraphics extends KlighdAbstractSVGGraphics { /** * @param bounds - * the bounds will be set as viewport values for the resulting root tag. + * the bounds will be set as viewport values for the resulting root <svg ..> tag. * @param textAsShapes * whether text should be rendered as shapes * @param embedFonts diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdNode.java index 56c5ca569..f669fe7ba 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdNode.java @@ -350,7 +350,7 @@ public double getUpperVisibilityBound() { * Decides whether a {@link KlighdNode} must not be drawn according to given scale-based * visibility definitions. (see * {@link de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, - * float) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, float)} and friends) + * Number) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, Number)} and friends) * * @param kpc * the {@link KlighdPaintContext} providing the required information @@ -384,7 +384,7 @@ public boolean isNotVisibleOn(final KlighdPaintContext kpc) { * Decides whether a {@link KlighdNode} must not be picked according to given scale-based * visibility definitions. (see * {@link de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, - * float) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, float)} and friends) + * Number) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, Number)} and friends) * * @param kpp * the {@link KlighdPickPath} providing the required information @@ -400,7 +400,7 @@ public boolean isNotVisibleOn(final KlighdPickPath kpp) { * Decides whether a {@link KlighdNode} must not be drawn according to given scale-based * visibility definitions. (see * {@link de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, - * float) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, float)} and friends) + * Number) DiagramSyntheses#setUpperVisibilityScaleBound(KRendering, Number)} and friends) * * @param diagramScale * the diagram scale factor to be applied diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdSWTGraphics.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdSWTGraphics.java index 02f552e0f..8ebaf36e8 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdSWTGraphics.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/KlighdSWTGraphics.java @@ -34,9 +34,9 @@ /** * This interface defines methods to be used by custom {@link edu.umd.cs.piccolo.PNode PNode} - * implementations to draw there shapes. Its aim is to abstract the concrete implementation of - * {@link java.awt.Graphics2D Graphics2D} like {@link edu.umd.cs.piccolox.swt.SWTGraphics2D - * SWTGraphics2D} contributed by the edu.umd.cs.piccolox.swt package. Instead a + * implementations to draw their shapes. Its aim is to abstract the concrete implementation of + * {@link java.awt.Graphics2D Graphics2D} like {@code SWTGraphics2D} contributed by the + * edu.umd.cs.piccolox.swt package. Instead a * Graphics layer realizing e.g. an SVG output shall be supported interchangeably.
*
* For drawing basic figures (i.e. no text fields and images) {@link #draw(Path)} and @@ -394,7 +394,7 @@ public interface KlighdSWTGraphics { void setNextTextLength(final double textLength); /** - * Draws the provided string while respecting the recently set font & text style settings.
+ * Draws the provided string while respecting the recently set font and text style settings.
* Its position can be determined by means of {@link #setTransform(AffineTransform)}. * * @param string diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractDiagramExporter.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractDiagramExporter.java index e28287f9b..54fd32091 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractDiagramExporter.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractDiagramExporter.java @@ -42,7 +42,7 @@ /** * Abstract diagram exporter providing the common methods * {@link #getExportedBounds(KlighdMainCamera, boolean)} and - * {@link #drawDiagram(KlighdMainCamera, boolean, KlighdSWTGraphics, PBounds)} to be re-used in + * {@link #drawDiagram(DiagramExportConfig, KlighdSWTGraphicsEx, KlighdMainCamera, AffineTransform, AffineTransform, Rectangle)} to be re-used in * concrete implementation of {@link de.cau.cs.kieler.klighd.IDiagramExporter IDiagramExporter} and * {@link de.cau.cs.kieler.klighd.IOffscreenRenderer IOffscreenRenderer}, in order to achieve * consistent behavior amongst all those implementations. @@ -205,8 +205,8 @@ public Trim apply(final Pair input) { /** * Provides a {@link Rectangle} describing the basic clip of diagram tiles based on the actual * bounds of the employed {@link org.eclipse.swt.graphics.Drawable Drawable} ( - * {@link org.eclipse.swt.graphics.Image Image} or {@link org.eclipse.swt.graphics.Printer - * Printer} and the cumulated required tile {@link Trim} being scaled to the size of the + * e.g. {@link org.eclipse.swt.graphics.Image Image} + * and the cumulated required tile {@link Trim} being scaled to the size of the * employed drawable. * * @param drawablesBounds diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractExportBranding.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractExportBranding.java index ba76ebc56..ffff9276e 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractExportBranding.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AbstractExportBranding.java @@ -234,7 +234,7 @@ public final void drawDiagramBackground(final Object graphics, final DiagramExpo * @param config * an {@link DiagramExportConfig} record containing all required data * - * @see #drawDiagramBackground(Object, Rectangle2D) + * @see #drawDiagramBackground(Object, DiagramExportConfig) */ public void drawDiagramBackground(final KlighdSWTGraphics graphics, final DiagramExportConfig config) { @@ -260,7 +260,7 @@ public final void drawDiagramTileBackground(final Object graphics, * @param config * an {@link DiagramExportConfig} record containing all required data * - * @see #drawDiagramTileBackground(Object, Rectangle2D) + * @see #drawDiagramTileBackground(Object, DiagramExportConfig) */ public void drawDiagramTileBackground(final KlighdSWTGraphics graphics, final DiagramExportConfig config) { @@ -289,7 +289,7 @@ public final void drawDiagramOverlay(final Object graphics, final DiagramExportC * @param config * an {@link DiagramExportConfig} record containing all required data * - * @see #drawDiagramOverlay(Object, Rectangle2D) + * @see #drawDiagramOverlay(Object, DiagramExportConfig) */ public void drawDiagramOverlay(final KlighdSWTGraphics graphics, final DiagramExportConfig config) { @@ -315,7 +315,7 @@ public final void drawDiagramTileOverlay(final Object graphics, final DiagramExp * @param config * an {@link DiagramExportConfig} record containing all required data * - * @see #drawDiagramBackground(Object, Rectangle2D) + * @see #drawDiagramBackground(Object, DiagramExportConfig) */ public void drawDiagramTileOverlay(final KlighdSWTGraphics graphics, final DiagramExportConfig config) { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdAbstractSVGGraphics.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdAbstractSVGGraphics.java index 0582a50cb..020828993 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdAbstractSVGGraphics.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdAbstractSVGGraphics.java @@ -73,12 +73,12 @@ /** * Common superclass for SVG generators using a {@link Graphics2D} to produce svg images. * - * Subclasses are registered via the {@link SVGGeneratorManager#EXTP_ID_SVGGENERATORS} extension - * point. All implementing classes have to provide a two-argument constructor for {@code bounds} ( + * Subclasses are statically registered in the {@link SVGGeneratorManager} class. + * All implementing classes have to provide a two-argument constructor for {@code bounds} ( * {@link Rectangle2D}) and the {@code textAsShapes} ({@link Boolean}) flag. * * Instances of one of the generators can be retrieved using the - * {@link SVGGeneratorManager#createGraphics(String, Rectangle2D, boolean)} method. + * {@link SVGGeneratorManager#createGraphics(String, Rectangle2D, boolean, boolean)} method. * * @author uru * @author chsch diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdCanvasExporter.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdCanvasExporter.java index debbca8f3..2561e75cb 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdCanvasExporter.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/KlighdCanvasExporter.java @@ -29,7 +29,7 @@ * a {@link KlighdCanvas}.
*
* Thus, it treats the given {@link Control} as a {@link KlighdCanvas} and redirects to - * {@link #export(KlighdExportInfo))}, which must be implemented by concrete subclasses. + * {@link #export(KlighdCanvas, de.cau.cs.kieler.klighd.IDiagramExporter.ExportData)}, which must be implemented by concrete subclasses. * * @author chsch */ @@ -58,7 +58,7 @@ public IStatus export(final Control control, final ExportData data) { } /** - * Exports the diagram depicted by the given control. + * Exports the diagram depicted by the given canvas. * * @param canvas * the canvas to export @@ -68,7 +68,7 @@ public IStatus export(final Control control, final ExportData data) { * @return {@link org.eclipse.core.runtime.Status#OK_STATUS Status#OK_STATUS} if the diagram * export went successfully, an {@link IStatus} providing information on the failure * otherwise. - * @see IDiagramExporter#export(de.cau.cs.kieler.klighd.IDiagramExporter.ExportData, Control) + * @see IDiagramExporter#export(Control, de.cau.cs.kieler.klighd.IDiagramExporter.ExportData) */ public abstract IStatus export(KlighdCanvas canvas, ExportData data); } diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/SVGExporter.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/SVGExporter.java index 56ddb7e51..8d99746ad 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/SVGExporter.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/SVGExporter.java @@ -36,8 +36,7 @@ /** * Generic SVG {@link KlighdCanvasExporter}. It is able to export SVGs by means of all SVG - * generators registered via the {@link de.cau.cs.kieler.klighd.piccolo.svg.SVGGeneratorManager - * SVGGeneratorManager#EXTP_ID_SVGGENERATORS} extension point. + * generators registered via the {@code de.cau.cs.kieler.klighd.extensions} extension point. * * In order to work, the 'subFormat' ID of a registered exporter has to match the specified ID in * the 'svgGenerators' extension point. diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdCanvas.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdCanvas.java index 8808ebd0a..f0b9fdbcb 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdCanvas.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdCanvas.java @@ -60,7 +60,7 @@ import edu.umd.cs.piccolox.swt.SWTTimer; /** - * A specialized version of {@link PCanvas} based on {@link edu.umd.cs.piccolox.swt.PSWTCanvas} with + * A specialized version of {@link PCanvas} based on {@code edu.umd.cs.piccolox.swt.PSWTCanvas} with * lots of KLighD-specific customizations. * * @author chsch @@ -156,7 +156,7 @@ public void widgetDisposed(final DisposeEvent e) { } /** - * Specialized {@link PRoot} inspired by {@link edu.umd.cs.piccolox.swt.PSWTRoot} + * Specialized {@link PRoot} inspired by {@code edu.umd.cs.piccolox.swt.PSWTRoot} * and contributing the customized {@link KlighdInputManager}. * * @author chsch @@ -240,8 +240,8 @@ public void run() { * {@link de.cau.cs.kieler.klighd.piccolo.internal.nodes.KNodeTopNode KNodeTopNode} takes that * part; see * {@link de.cau.cs.kieler.klighd.piccolo.internal.controller.DiagramController#DiagramController( - * de.cau.cs.kieler.klighd.kgraph.KNode, KlighdMainCamera, boolean, boolean) - * DiagramController.DiagramController(KNode, KlighdMainCamera, boolean, boolean)}. + * de.cau.cs.kieler.klighd.kgraph.KNode, KlighdMainCamera, boolean, boolean, boolean, Spacing) + * DiagramController.DiagramController(KNode, KlighdMainCamera, boolean, boolean, boolean, Spacing)}. * * @return KlighdMainCamera viewing the freshly created scene */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsEx.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsEx.java index 49d43eb70..98d7c018b 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsEx.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsEx.java @@ -28,7 +28,7 @@ * methods.
* Those methods are not to be used by our PNode figures but by adapters of other 2D drawing * frameworks. It is currently used in - * {@link de.cau.cs.kieler.klighd.piccolo.draw2d.GraphicsAdapter}, which is required for employing + * {@code de.cau.cs.kieler.klighd.piccolo.draw2d.GraphicsAdapter}, which is required for employing * custom Draw2d-based figures in KLighD-based diagrams. Those figures which save and restore the * canvas state before/after they draw their children.
*
diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java index cbeede697..fd2bad6b5 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java @@ -78,7 +78,7 @@ /** * Standard implementation of {@link de.cau.cs.kieler.klighd.piccolo.KlighdSWTGraphics * KlighdSWTGraphics}. It's aim is to get independent from Piccolo2Ds - * {@link edu.umd.cs.piccolox.swt.SWTGraphics2D SWTGraphics2D}. + * {@code edu.umd.cs.piccolox.swt.SWTGraphics2D SWTGraphics2D}. * * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/ApplyBendPointsActivity.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/ApplyBendPointsActivity.java index e6a56bd7e..1c437b282 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/ApplyBendPointsActivity.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/ApplyBendPointsActivity.java @@ -24,7 +24,7 @@ import edu.umd.cs.piccolo.activities.PInterpolatingActivity; /** - * The Piccolo activity for applying bend points to a {@KEdgeNode}. + * The Piccolo activity for applying bend points to a {@link KEdgeNode}. * * @author mri, chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/AbstractKGERenderingController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/AbstractKGERenderingController.java index bb8a4aacc..533b41933 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/AbstractKGERenderingController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/AbstractKGERenderingController.java @@ -283,7 +283,7 @@ public void initialize(final DiagramController diagCtrl, final boolean sync) { /** * Fires a run of the {@link de.cau.cs.kieler.klighd.IStyleModifier IStyleModifiers} referenced * by the {@link KStyle KStyles} attached to this {@link KGraphElement}'s rendering and updates - * the diagram figure, both if and only if {@link KStyles} with valid modifiers are present in + * the diagram figure, both if and only if {@link KStyle KStyles} with valid modifiers are present in * this {@link KGraphElement}'s rendering. */ public void modifyStyles() { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java index a376b7806..3d448e783 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java @@ -115,8 +115,6 @@ * * @author mri * @author chsch - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class DiagramController { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomController.java index 43e04e2aa..8ef6768f7 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomController.java @@ -420,7 +420,7 @@ private PBounds toPBoundsIncludingPortsAndLabels(final KNode node) { /** * Converts node's layout data into {@link PBounds} s.t. node's ports - * and labels are included, respects an attached {@link LayoutOptions#SCALE_FACTOR}. + * and labels are included, respects an attached {@link CoreOptions#SCALE_FACTOR}. * * @param node * the node diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomControllerBoundsComputer.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomControllerBoundsComputer.java index 5e4682095..341a1b66f 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomControllerBoundsComputer.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramZoomControllerBoundsComputer.java @@ -59,7 +59,7 @@ public DiagramZoomControllerBoundsComputer(final Predicate isDisp /** * Converts the element's layout data into {@link PBounds}, respects an attached - * {@link LayoutOptions#SCALE_FACTOR}. + * {@link CoreOptions#SCALE_FACTOR}. * * @param element * the element @@ -73,7 +73,7 @@ public PBounds toPBounds(final KShapeLayout element) { /** * Converts node's layout data into {@link PBounds} s.t. node's ports - * and labels are included, respects an attached {@link LayoutOptions#SCALE_FACTOR}. + * and labels are included, respects an attached {@link CoreOptions#SCALE_FACTOR}. * * @param node * the node @@ -127,7 +127,7 @@ public Iterable getIncludedKGEs(final KNode node, /** * Converts node's layout data into {@link PBounds} s.t. node's ports - * and labels are included, respects an attached {@link LayoutOptions#SCALE_FACTOR}. + * and labels are included, respects an attached {@link CoreOptions#SCALE_FACTOR}. * * @param node * the node diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java index 03acca637..226d5f6f9 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java @@ -562,7 +562,7 @@ public void applyChanges(final Styles styles) { * * @param color * the {@link KColor} to be converted - * @return null ifcolor = null, the related {@link RGB} otherwise + * @return null if color = null, the related {@link RGB} otherwise */ public RGB toRGB(final KColor color) { final int maxValue = 255; @@ -584,7 +584,7 @@ public RGB toRGB(final KColor color) { * * @param coloring * the {@link KColoring} to be converted - * @return null ifcolor = null, the related {@link RGB} otherwise + * @return null if color = null, the related {@link RGB} otherwise */ public RGBGradient toRGBGradient(final KColoring coloring) { if (coloring == null || coloring.getColor() == null || coloring.getTargetColor() == null) { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdBasicInputEventHandler.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdBasicInputEventHandler.java index 6726d0baf..9d8784f9b 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdBasicInputEventHandler.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdBasicInputEventHandler.java @@ -33,7 +33,7 @@ * is a {@link PDragSequenceEventHandler}.
*
* Note: Right mouse button events are not forwarded to - * {@link PDragSequenceEventHandlers}. + * {@link PDragSequenceEventHandler PDragSequenceEventHandlers}. * * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdSelectionEventHandler.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdSelectionEventHandler.java index a79edb56f..ed32c28ee 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdSelectionEventHandler.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdSelectionEventHandler.java @@ -352,7 +352,7 @@ protected Set performEdgeSelection(final Set selectedElements, /** * Provides an iterator for all {@link KGraphElement KGraphElements} connected to the selected * edge. Can be overridden to use own customized - * {@link de.cau.cs.kieler.kiml.util.selection.SelectionIterator SelectionIterators}. + * {@link org.eclipse.elk.core.util.selection.SelectionIterator SelectionIterators}. * * @param edge * the selected edge diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KEdgeNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KEdgeNode.java index bd67534d8..bacb72e7c 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KEdgeNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KEdgeNode.java @@ -51,7 +51,7 @@ public class KEdgeNode extends KGraphElementNode implements /** the property name for changes of the edge's bend points. */ public static final String PROPERTY_JUNCTION_POINTS = "junctionPoints"; - /** the edge rendering controller deployed to manage the rendering of {@link #edge}. */ + /** the edge rendering controller deployed to manage the rendering of the edge. */ private KEdgeRenderingController renderingController; /** the {@link KNodeAbstractNode} this edgeNode is attached to, is just convenience. */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KLabelNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KLabelNode.java index 698bcf774..fba8677ff 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KLabelNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KLabelNode.java @@ -33,7 +33,7 @@ public class KLabelNode extends KGraphElementNode { /** the property name for changes of the label's text. */ public static final String PROPERTY_TEXT = "labelText"; - /** the label rendering controller deployed to manage the rendering of {@link #label}. */ + /** the label rendering controller deployed to manage the rendering of the label. */ private KLabelRenderingController renderingController; /** the text. */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KNodeNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KNodeNode.java index 7911e8426..7c0ed0429 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KNodeNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KNodeNode.java @@ -54,10 +54,10 @@ public class KNodeNode extends KNodeAbstractNode implements private static final Predicate IS_MAIN_CAM = Predicates.instanceOf(KlighdMainCamera.class); - /** the parent {@link AbstractKNodeNode}. */ + /** the parent {@link KNodeAbstractNode}. */ private KNodeAbstractNode parent; - /** the node rendering controller deployed to manage the rendering of {@link #node}. */ + /** the node rendering controller deployed to manage the rendering of the node. */ private KNodeRenderingController renderingController; /** a dedicated layer accommodating all attached {@link KPortNode KPortNodes}.*/ @@ -393,7 +393,7 @@ public KNodeAbstractNode getParentKNodeNode() { * Setter. * * @param parentINode - * the {@link AbstractKNodeNode} being the new parent in terms of the structural nodes + * the {@link KNodeAbstractNode} being the new parent in terms of the structural nodes */ public void setParentNode(final KNodeAbstractNode parentINode) { this.parent = parentINode; @@ -447,10 +447,10 @@ public void addChild(final PNode child) { } /** tracks scale setting. - * Setter for notifying {@link #containingINode}'s scale factor, called from - * {@link KNodeNode#setScale(double)}, used to adjust the + * Setter for notifying the node's scale factor, called from + * {@link setScale(double)}, used to adjust the * {@link KlighdPaintContext#getCameraZoomScale() camera zoom scale} before/after drawing the - * contained {@link KNodeNode KNodeNodes}. + * {@link KNodeNode}. * */ private Double nodeScale = null; diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KPortNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KPortNode.java index b56f5aca4..d20f0fa35 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KPortNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KPortNode.java @@ -32,7 +32,7 @@ public class KPortNode extends KGraphElementNode implements private static final long serialVersionUID = 6016725932024647084L; - /** the port rendering controller deployed to manage the rendering of {@link #port}. */ + /** the port rendering controller deployed to manage the rendering of the port. */ private KPortRenderingController renderingController; /** diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java index 1ebf8a20c..9d2fef737 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java @@ -44,31 +44,23 @@ /** * A special {@link edu.umd.cs.piccolo.PNode PNode} for integrating images in KLighD diagrams. The - * implementation is inspired by that of {@link edu.umd.cs.piccolox.swt.PSWTImage}, some major + * implementation is inspired by that of {@code edu.umd.cs.piccolox.swt.PSWTImage}, some major * differences wrt. design requirements led to this new implementation. These differences involve * the non-dependency to any specific canvas implementation as well as to * {@link org.eclipse.swt.widgets.Display Display} being a specific * {@link org.eclipse.swt.graphics.Device Device}.
*
- * In contrast to {@link edu.umd.cs.piccolox.swt.PSWTImage} the bounds of nodes of this type are not + * In contrast to {@code edu.umd.cs.piccolox.swt.PSWTImage} the bounds of nodes of this type are not * set while setting the image object to be displayed. Doing so results in flickering, at least * while drawing diagrams without animation. Instead the bounds are set top down by KlighD, see - * {@link de.cau.cs.kieler.klighd.piccolo.internal.controller.KGERenderingControllerHelper#createImage( - * de.cau.cs.kieler.klighd.piccolo.internal.controller.AbstractKGERenderingController, - * de.cau.cs.kieler.klighd.krendering.KImage, java.util.List, edu.umd.cs.piccolo.PNode, - * de.cau.cs.kieler.klighd.microlayout.Bounds) - * KGERenderingControllerHelper#createImage(...)}.
+ * {@code KGERenderingControllerHelper#createImage(...)}.
*
* If the amount of instances of {@link Image} created while drawing diagrams, e.g. such with lots * of copies of the same icon will lead to performance/memory issues, one might introduce a further - * caching mechanism beyond that in - * {@link de.cau.cs.kieler.klighd.piccolo.internal.controller.KGERenderingControllerHelper#IMAGE_BUFFER - * KGERenderingControllerHelper#IMAGE_BUFFER}. This could be done like for colors and fonts. + * caching mechanism. This could be done like for colors and fonts. * However, keeping every image in a lookup for the whole JVM life cycle sounds problematic... * * @author chsch - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class KlighdImage extends KlighdNode.KlighdFigureNode implements IResourceEmployer { @@ -131,7 +123,7 @@ public KlighdImage(final ImageData image, final KImage kImage) { /** * Constructor. * - * @param uri + * @param url * the {@link URL} denoting the location of the image, must be valid (perform checks * before calling this constructor!) * @param kImage @@ -208,7 +200,7 @@ public void setImage(final ImageData newImageData) { * Sets the image to be displayed by this node by delegating to * {@link ImageData#ImageData(InputStream)} and {@link #setImage(ImageData)}.
*
- * Make sure to close the {@link InputStream} afterwards! + *

Make sure to close the {@link InputStream} afterwards!

* * @param input * stream providing the image data @@ -222,7 +214,7 @@ public InputStream setImage(final InputStream input) { /** * Sets the image to be displayed by this node. * - * @param uri + * @param url * the {@link URL} denoting the location of the image, must be valid (perform checks * before calling this setter!) */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPath.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPath.java index a8add23fa..3b38a39eb 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPath.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPath.java @@ -58,7 +58,7 @@ /** * The KLighD-specific {@link edu.umd.cs.piccolo.PNode PNode} implementation for displaying * primitive figures.
- * It is inspired by the Piccolo2D {@link edu.umd.cs.piccolox.swt.PSWTPath PSWTPath} and is + * It is inspired by the Piccolo2D {@code edu.umd.cs.piccolox.swt.PSWTPath} and is * tailored/extended to those features required by KLighD.
*
* {@link KlighdPath} instances require a {@link KlighdSWTGraphics} while drawing (i.e. in diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPaths.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPaths.java index 7d8a9f589..0faf1cb31 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPaths.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdPaths.java @@ -28,7 +28,7 @@ * A collection of convenience methods for creating {@link KlighdPath} instances.
* They are outsourced in order to reduce the size of the {@link KlighdPath} class.
*
- * Some of these methods are inspired by those of {@link edu.umd.cs.piccolox.swt.PSWTPath PSWTPath}. + * Some of these methods are inspired by those of {@code edu.umd.cs.piccolox.swt.PSWTPath}. * * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdStyledText.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdStyledText.java index 90b00ae21..8c19af5f3 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdStyledText.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdStyledText.java @@ -41,7 +41,7 @@ /** * The KLighD-specific {@link edu.umd.cs.piccolo.PNode PNode} implementation for displaying text * strings supporting {@link org.eclipse.swt.graphics.TextStyle TextStyles}.
- * It is inspired by the Piccolo2D {@link edu.umd.cs.piccolox.swt.PSWTText PSWTText} and is + * It is inspired by the Piccolo2D {@code edu.umd.cs.piccolox.swt.PSWTText} and is * tailored/extended to those features required by KLighD.
*
* Note: All invalidate... and repaint calls are deactivated in @@ -167,7 +167,7 @@ public void setText(final String theText) { /** * Provides the currently set pen color.
* It's currently used in order configure the text widget enabling the cursor-based text - * selection, see {@link de.cau.cs.kieler.klighd.ui.internal.viewers.KlighdLabelWidgetHandler}. + * selection, see {@code de.cau.cs.kieler.klighd.ui.viewers.KlighdLabelWidgetEventHandler}. * * @return the current pen color {@link RGB}. */ @@ -178,7 +178,7 @@ public RGB getPenColor() { /** * Provides the currently set pen color's alpha value.
* It's currently used in order configure the text widget enabling the cursor-based text - * selection, see {@link de.cau.cs.kieler.klighd.ui.internal.viewers.KlighdLabelWidgetHandler}. + * selection, see {@code de.cau.cs.kieler.klighd.ui.viewers.KlighdLabelWidgetEventHandler}. * * @return the current pen color's alpha value */ @@ -190,7 +190,7 @@ public int getPenAlpha() { * Provides the currently set background color or null, if no background coloring * or a background gradient is set.
* It's currently used in order configure the text widget enabling the cursor-based text - * selection, see {@link de.cau.cs.kieler.klighd.ui.internal.viewers.KlighdLabelWidgetHandler}. + * selection, see {@code de.cau.cs.kieler.klighd.ui.viewers.KlighdLabelWidgetEventHandler}. * * @return the current background color {@link RGB}. */ @@ -201,7 +201,7 @@ public RGB getBackgroundColor() { /** * Provides the currently set background color's alpha value.
* It's currently used in order configure the text widget enabling the cursor-based text - * selection, see {@link de.cau.cs.kieler.klighd.ui.internal.viewers.KlighdLabelWidgetHandler}. + * selection, see {@code de.cau.cs.kieler.klighd.ui.viewers.KlighdLabelWidgetEventHandler}. * * @return the current background color's alpha value */ @@ -213,7 +213,7 @@ public int getBackgroundAlpha() { * Provides the currently set background gradient configuration or null, if no * background coloring or a single background color is set.
* It's currently used in order configure the text widget enabling the cursor-based text - * selection, see {@link de.cau.cs.kieler.klighd.ui.internal.viewers.KlighdLabelWidgetHandler}. + * selection, see {@code de.cau.cs.kieler.klighd.ui.viewers.KlighdLabelWidgetEventHandler}. * * @return the current background color's alpha value */ @@ -299,8 +299,7 @@ public void setPaint(final RGBGradient gradient) { * Provides the currently set {@link FontData}.
* It's currently used in order configure the text widget enabling the cursor-based text * selection, see - * {@link de.cau.cs.kieler.klighd.piccolo.viewer.PiccoloViewer.KlighdTextInputHandler - * PiccoloViewer.KlighdTextInputHandler}. + * {@code de.cau.cs.kieler.klighd.ui.viewers.PiccoloViewerUI PiccoloViewerUI}. * * @return the current {@link FontData} */ @@ -312,7 +311,7 @@ public FontData getFontData() { * Configures the text node width a {@link FontData}. * * @param theFont - * the desired {@link FontData}, must not be null + * the desired {@link FontData}, must not be null */ public void setFont(final FontData theFont) { if (fontData != null && fontData.equals(theFont)) { @@ -332,7 +331,7 @@ public void setFont(final FontData theFont) { * @param theUnderlining * the related constant from {@link KlighdConstants} and {@link org.eclipse.swt.SWT SWT} * @param color - * the used color, maybe null (penColor is used in that case) + * the used color, maybe null (penColor is used in that case) */ public void setUnderline(final int theUnderlining, final RGB color) { if (underlining == theUnderlining) { @@ -351,7 +350,7 @@ public void setUnderline(final int theUnderlining, final RGB color) { * @param theStrikeout * whether to strike out * @param color - * the used color, maybe null (penColor is used in that case) + * the used color, maybe null (penColor is used in that case) */ public void setStrikeout(final boolean theStrikeout, final RGB color) { if (strikeout == theStrikeout && strikeoutColor == color) { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/KlighdPaintContext.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/KlighdPaintContext.java index 8197a03e2..cd5993ce1 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/KlighdPaintContext.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/KlighdPaintContext.java @@ -70,7 +70,7 @@ public static KlighdPaintContext createOutlinePaintContext(final KlighdSWTGraphi * if true the diagram zoom level determined by the * {@link KlighdMainCamera}'s view transform will be used while evaluating the * visibility of the particular diagram elements and diagram element figure parts, if - * false a diagram zoom level of 1.0 is assumed. + * false a diagram zoom level of 1.0 is assumed. * @param addSemanticData * flag determining whether semantic data shall be added to the diagram while * exporting an SVG based image, should be false in other cases (no effect) @@ -95,7 +95,7 @@ public static KlighdPaintContext createExportDiagramPaintContext( * if true the diagram zoom level determined by the * {@link KlighdMainCamera}'s view transform will be used while evaluating the * visibility of the particular diagram elements and diagram element figure parts, if - * false a diagram zoom level of 1.0 is assumed. + * false a diagram zoom level of 1.0 is assumed. * @return the desired {@link KlighdPaintContext} */ public static KlighdPaintContext createPrintoutPaintContext(final KlighdSWTGraphics graphics, @@ -119,7 +119,7 @@ public static KlighdPaintContext createPrintoutPaintContext(final KlighdSWTGraph * if true the diagram zoom level determined by the * {@link KlighdMainCamera}'s view transform will be used while evaluating the * visibility of the particular diagram elements and diagram element figure parts, if - * false a diagram zoom level of 1.0 is assumed. + * false a diagram zoom level of 1.0 is assumed. * @param addSemanticData * flag determining whether semantic data shall be added to the diagram while * exporting an SVG based image, should be false in other cases (no @@ -200,7 +200,7 @@ public boolean isPrintout() { * @return true if the diagram zoom level determined by the * {@link KlighdMainCamera}'s view transform shall be used while evaluating the * visibility of the particular diagram elements and diagram element figure parts, - * false if a diagram zoom level of 1.0 shall be assumed + * false if a diagram zoom level of 1.0 shall be assumed */ public boolean isApplyCameraZoomLevel() { return applyCameraZoomLevel; diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/NodeUtil.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/NodeUtil.java index 5bf27d4c4..912e051a2 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/NodeUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/NodeUtil.java @@ -518,7 +518,7 @@ public void remove() { /** * Reveals the closest common ancestor {@link IKNodeNode} of {@code node0} and {@code node1}, - * assuming each of {@code node0} and {@code1} is contained in the diagram's figure tree + * assuming each of {@code node0} and {@code node1} is contained in the diagram's figure tree * if it is unequal to {@code null}. * * @param node0 diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/PolylineUtil.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/PolylineUtil.java index 50a202e96..7c80d5fbd 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/PolylineUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/util/PolylineUtil.java @@ -389,8 +389,7 @@ public static void createRoundedBendPoints(final Path2D path, final Point2D[] po * Determination of beginning, end, and control points of a polyline bend point to be rendered * with rounded bends. This method does not care on flaws resulting from bend points having a * distance smaller than twice the given bend radius. That situation will be (partly) handled by - * {@link #getShortDistanceApproximationPoints(double, double, double, double, double, double, - * double, double)}. + * {@link #getShortDistanceApproximationPoints(Point2D, Point2D, Point2D, Point2D)}. * * The beginning and end points are moved from the original bend point towards the respective * neighbors by the amount of 'bendRadius' along the line, the control points by the amount of @@ -499,8 +498,7 @@ public static double[] getRoundedBendControlPoints( * the y coordinate of the original bend point * @param cPoints * the points and control points of the bend points to be approximated, as provided - * by {@link #getRoundedBendControlPoints(double, double, double, double, double, - * double, double)} + * by {@link #getRoundedBendControlPoints(Point2D, Point2D, Point2D, double)} */ public static void visualizeRoundedBendControlPoints(final KlighdPath path, final double px, final double py, final double[] cPoints) { @@ -635,8 +633,7 @@ public static double[] getShortDistanceApproximationPoints(final Point2D p0, fin * the path to put the points on * @param cPoints * the points and control points of the bend points to be approximated, as provided - * by {@link #getShortDistanceRoundedBendControlPoints(double, double, double, double, - * double, double, double, double)} + * by {@link #getShortDistanceApproximationPoints(Point2D, Point2D, Point2D, Point2D)} */ public static void visualizeShortDistanceApproximationPoints(final KlighdPath path, final double[] cPoints) { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloOutlinePage.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloOutlinePage.java index 88f01f0b1..0130fefba 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloOutlinePage.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloOutlinePage.java @@ -119,10 +119,10 @@ public class PiccoloOutlinePage implements IDiagramOutlinePage { private Timer outlineRectTimer; /** - * Configuration hook for customizing the viewport outline (rounded) rectangle's corner width & + * Configuration hook for customizing the viewport outline (rounded) rectangle's corner width and * height. * - * @return the desired value taken as corner width & corner height + * @return the desired value taken as corner width and corner height */ protected int getViewportOutlineRectCornerWidth() { return VIEWPORT_OUTLINE_CORNER_WIDTH; @@ -131,7 +131,7 @@ protected int getViewportOutlineRectCornerWidth() { /** * Configuration hook for customizing the viewport outline rectangle's line width. * - * @return the desired line width as float + * @return the desired line width as float */ protected float getViewportOutlineRectLineWidth() { return VIEWPORT_OUTLINE_LINEWIDTH; diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloTooltip.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloTooltip.java index 020974115..d7d46b828 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloTooltip.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloTooltip.java @@ -47,7 +47,7 @@ * {@link de.cau.cs.kieler.klighd.piccolo.KlighdNode.KlighdFigureNode KlighdFigureNode}'s * displayed {@link KRendering}, * a {@link de.cau.cs.kieler.klighd.piccolo.IKlighdNode.IKGraphElementNode IKGraphElementNode} or, - * if this is not available, from the corresponding {@link KGraphElement}'s {@link KLayoutData}. + * if this is not available, from the corresponding {@link KGraphElement}'s {@link de.cau.cs.kieler.klighd.kgraph.KLayoutData}. * * TODO: Evaluate the realization of the tooltip by means of an SWT Widget, too, although that won't * be available for the web-based approach. diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/edu/umd/cs/piccolox/swt/SWTTimerQueue.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/edu/umd/cs/piccolox/swt/SWTTimerQueue.java index 5725bf581..a36b42531 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/edu/umd/cs/piccolox/swt/SWTTimerQueue.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/edu/umd/cs/piccolox/swt/SWTTimerQueue.java @@ -34,7 +34,7 @@ * The SWTTimerQueue is a queue of timers. It has been implemented as a linked * list of SWTTimer objects. * - * Two critical bug fixes were done by chsch (l.163f) & uru (l. 138ff). + * Two critical bug fixes were done by chsch (l.163f) and uru (l. 138ff). * * @author Lance Good, Ulf Rueegg, Christian Schneider */ diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramView.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramView.java index deb16343d..3e62ef77c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramView.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramView.java @@ -96,9 +96,6 @@ * The retrieval of the model and the update of the diagram is handled by a {@link AbstractViewUpdateController}. * * @author als - * @kieler.design 2015-06-22 proposed - * @kieler.rating 2015-06-22 proposed yellow - * */ @SuppressWarnings("restriction") public final class DiagramView extends DiagramViewPart implements ISelectionChangedListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramViewEditorAdapter.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramViewEditorAdapter.java index c9d760941..405a25938 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramViewEditorAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/DiagramViewEditorAdapter.java @@ -29,9 +29,6 @@ * Listens to the workspace and manages the editor for the associated {@link DiagramView}. * * @author als - * @kieler.design 2015-09-29 proposed - * @kieler.rating 2015-09-29 proposed yellow - * */ class DiagramViewEditorAdapter implements IPartListener2 { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/SynthesisOptionsPersistence.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/SynthesisOptionsPersistence.java index 48a41e133..70a805621 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/SynthesisOptionsPersistence.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/SynthesisOptionsPersistence.java @@ -26,8 +26,6 @@ * Utility class for type-safe parsing and serializing of {@link SynthesisOption}s. * * @author als - * @kieler.design 2015-11-18 proposed - * @kieler.rating 2015-11-18 proposed yellow */ final class SynthesisOptionsPersistence { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/AbstractViewUpdateController.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/AbstractViewUpdateController.java index 2730113fc..d61a42079 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/AbstractViewUpdateController.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/AbstractViewUpdateController.java @@ -62,6 +62,7 @@ *

* If the controller has an internal state influencing its behavior, the controller should override * the following methods: + *

    *
  • {@link #saveState(IMemento)}
    • *
  • {@link #loadState(IMemento)}
    • *
  • {@link #reset()}
    • @@ -69,9 +70,6 @@ *
* * @author als - * @kieler.design 2016-06-28 KI-124 uru, nbw, cds - * @kieler.rating 2015-06-29 proposed yellow - * */ public abstract class AbstractViewUpdateController implements ISelectionChangedListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/ViewUpdateControllerFactory.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/ViewUpdateControllerFactory.java index bac40078f..40f4052ad 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/ViewUpdateControllerFactory.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/ViewUpdateControllerFactory.java @@ -45,9 +45,6 @@ * This class is a singleton. * * @author als - * @kieler.design 2015-06-22 proposed - * @kieler.rating 2015-06-22 proposed yellow - * */ public final class ViewUpdateControllerFactory { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EcoreXtextSaveUpdateController.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EcoreXtextSaveUpdateController.java index 16183ae9a..7d2e793a5 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EcoreXtextSaveUpdateController.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EcoreXtextSaveUpdateController.java @@ -29,9 +29,6 @@ * model is saved. * * @author als - * @kieler.design 2015-06-29 proposed - * @kieler.rating 2015-06-29 proposed yellow - * */ public class EcoreXtextSaveUpdateController extends AbstractViewUpdateController implements EditorSaveAdapter.EditorSafeListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorSaveAdapter.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorSaveAdapter.java index 78c9fe98e..01afafbf3 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorSaveAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorSaveAdapter.java @@ -24,9 +24,6 @@ * An adapter to listen for the save event of an editor. * * @author als - * @kieler.design 2015-09-29 proposed - * @kieler.rating 2015-09-29 proposed yellow - * */ public class EditorSaveAdapter implements IPropertyListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorUtil.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorUtil.java index 5e30ef545..496b69543 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorUtil.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/EditorUtil.java @@ -40,9 +40,6 @@ * This class contains utility methods for access to editor content. * * @author als - * @kieler.design 2015-09-30 proposed - * @kieler.rating 2015-09-30 proposed yellow - * */ public final class EditorUtil { @@ -97,8 +94,6 @@ public static EObject readModelFromEMFEditor(final IEditingDomainProvider editor /** * Checks the given resource for error markers. * - * @see XtextBasedEditorActivationChangeTrigger#checkAndIndicateErrors(final XtextResource resource) - * * @param resource * the resource * @return true if any errors are present otherwise false diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextChangeUpdateController.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextChangeUpdateController.java index 860c3bb57..f4e81fa14 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextChangeUpdateController.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextChangeUpdateController.java @@ -27,9 +27,6 @@ * Simple controller for XText editors which performs a diagram update when the model is changed. * * @author als - * @kieler.design 2015-09-30 proposed - * @kieler.rating 2015-09-30 proposed yellow - * */ public class XtextChangeUpdateController extends AbstractViewUpdateController implements XtextEditorModelChangeAdapter.XtextChangeListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextEditorModelChangeAdapter.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextEditorModelChangeAdapter.java index 4e632b4be..e6ed55493 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextEditorModelChangeAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextEditorModelChangeAdapter.java @@ -24,9 +24,6 @@ * An adapter to listen for the change event of an xtext editor. * * @author als - * @kieler.design 2015-09-29 proposed - * @kieler.rating 2015-09-29 proposed yellow - * */ public class XtextEditorModelChangeAdapter implements IXtextModelListener { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextSelectionHighlighter.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextSelectionHighlighter.java index ec176584b..ed4d28309 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextSelectionHighlighter.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controllers/XtextSelectionHighlighter.java @@ -40,8 +40,6 @@ * This class contains utility methods for highlighting selection in Xtext editors. * * @author als - * @kieler.design 2015-01-01 proposed - * @kieler.rating 2015-01-01 proposed yellow */ public final class XtextSelectionHighlighter { /** diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/menu/SynthesisSelectionMenu.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/menu/SynthesisSelectionMenu.java index 755d960b9..c3493528c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/menu/SynthesisSelectionMenu.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/menu/SynthesisSelectionMenu.java @@ -31,16 +31,9 @@ import de.cau.cs.kieler.klighd.ui.view.DiagramView; /** - * This sub-menu handles different available synthesis for models including general syntheses - * implementing {@link ISelectableGeneralSynthesis}. - *

- * {@link ISelectableGeneralSynthesis} are defined in extension point evaluated by - * {@link de.cau.cs.kieler.klighd.ui.view.controller.ViewUpdateControllerFactory - * ViewUpdateControllerFactory} + * This sub-menu handles different available synthesis for models. * * @author als - * @kieler.design 2015-06-22 proposed - * @kieler.rating 2015-06-22 proposed yellow */ @SuppressWarnings("restriction") public class SynthesisSelectionMenu extends MenuManager { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/ErrorModelShowExceptionAction.java b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/ErrorModelShowExceptionAction.java index bc61ae552..4e064f0d0 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/ErrorModelShowExceptionAction.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/ErrorModelShowExceptionAction.java @@ -27,9 +27,6 @@ * Action to open an ErrorDialog to show additional exception information of {@link ErrorModel}. * * @author als - * @kieler.design 2014-07-30 proposed - * @kieler.rating 2014-07-30 proposed yellow - * */ public class ErrorModelShowExceptionAction extends AbstractErrorModelShowExceptionAction { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectCreator.java b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectCreator.java index ab379d646..b2d003168 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectCreator.java +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectCreator.java @@ -55,7 +55,7 @@ public class KlighdProjectCreator extends WorkspaceModifyOperation implements IP /** * Specialization in order to be able to configure the JRE container. * Implementation is quite ugly and shall be replaced once - * + * * https://bugs.eclipse.org/bugs/show_bug.cgi?id=467391 is resolved. * * @author chsch diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/KlighdLayoutHandler.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/KlighdLayoutHandler.java index c5d205ce5..812d73806 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/KlighdLayoutHandler.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/KlighdLayoutHandler.java @@ -29,9 +29,6 @@ * Handler for execution of automatic layout in KLighD triggered by menu, toolbar, or keyboard * command. * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow 2014-01-25 - * * @author chsch */ public class KlighdLayoutHandler extends AbstractHandler { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/SaveAsImageDialog.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/SaveAsImageDialog.java index a5f87384f..9c0c044d7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/SaveAsImageDialog.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/handlers/SaveAsImageDialog.java @@ -63,7 +63,7 @@ /** * The 'save-as-image' dialog for Piccolo2D. * - * The available image formats are retrieved from the {@link ExporterManager#EXTP_ID_EXPORTERS} + * The available image formats are retrieved from the exporter type KLighD's * extension point. An additional description of each format is added in parentheses (...), the * parentheses are stripped when the file extension is added. * diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/options/DiagramSideBar.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/options/DiagramSideBar.java index bd4a69bef..d361c0d7c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/options/DiagramSideBar.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/options/DiagramSideBar.java @@ -180,7 +180,7 @@ public LayoutConfigurator getLayoutConfig() { * @param viewContext * the {@link ViewContext} to get the configured option entries from * @return an instance of {@link DiagramSideBar} allowing to access the employed - * {@link ILayoutConfig} + * {@link LayoutConfigurator} */ public static DiagramSideBar createSideBar(final Composite parent, final Composite diagramContainer, final ViewContext viewContext) { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java index 5af18af2b..e9568d192 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramViewPart.java @@ -386,7 +386,7 @@ protected Object loadModel() { * * @return KLighD configuration or null. * - * @see {@link KlighdSynthesisProperties} for more details + * @see KlighdSynthesisProperties */ protected KlighdSynthesisProperties configureKlighdProperties() { return null; diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/DiagramPrintOptions.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/DiagramPrintOptions.java index 63feefce5..fcfccb856 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/DiagramPrintOptions.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/DiagramPrintOptions.java @@ -97,7 +97,7 @@ public static void setInitiallyShowPreview(final boolean initiallyShow) { * Convenience getter. * * @return {@code true} the print should automatically be scaled to fit on one page, - * {@code false] otherwise. + * {@code false} otherwise. */ public static boolean getAutoScaleToFit() { return PREF_STORE.getBoolean(PREFERENCE_AUTO_SCALE_TO_FIT); @@ -109,7 +109,7 @@ public static boolean getAutoScaleToFit() { * * @param autoScale * {@code true} the print should automatically be scaled to fit on one page, - * {@code false] otherwise. + * {@code false} otherwise. */ public static void setAutoScaleToFit(final boolean autoScale) { @@ -123,7 +123,7 @@ public static void setAutoScaleToFit(final boolean autoScale) { * Convenience getter. * * @return {@code true} the print should automatically be scaled to 100%, - * {@code false] otherwise. + * {@code false} otherwise. */ public static boolean getAutoScaleTo100() { return PREF_STORE.getBoolean(PREFERENCE_AUTO_SCALE_TO_100); @@ -135,7 +135,7 @@ public static boolean getAutoScaleTo100() { * * @param autoScale * {@code true} the print should automatically be scaled to 100%, - * {@code false] otherwise. + * {@code false} otherwise. */ public static void setAutoScaleTo100(final boolean autoScale) { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/PrintOptions.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/PrintOptions.java index ec30f0da4..2bcb32d8b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/PrintOptions.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/PrintOptions.java @@ -652,7 +652,7 @@ public void setVerticallyCentered(final boolean verCentered) { /** * Gets the printer name. - *
+ *
* Note: * The printer name cannot be set separately because that would invalidate the printer data. * To set a new printer, use {@link #setPrinterData(PrinterData)} with valid PrinterData. @@ -830,7 +830,7 @@ protected Point2D updateCenteringOffset() { * * @param listener * the listener to add - * @see {@link PropertyChangeSupport#addPropertyChangeListener(PropertyChangeListener)} + * @see PropertyChangeSupport#addPropertyChangeListener(PropertyChangeListener) */ public void addPropertyChangeListener(final PropertyChangeListener listener) { propertyChangeSupport.addPropertyChangeListener(listener); @@ -843,7 +843,7 @@ public void addPropertyChangeListener(final PropertyChangeListener listener) { * the property to listen on * @param listener * the listener to add - * @see {@link PropertyChangeSupport#addPropertyChangeListener(String, PropertyChangeListener)} + * @see PropertyChangeSupport#addPropertyChangeListener(String, PropertyChangeListener) */ public void addPropertyChangeListener(final String propertyName, final PropertyChangeListener listener) { @@ -854,7 +854,7 @@ public void addPropertyChangeListener(final String propertyName, * Gets all registered property change listeners. * * @return the registered property change listeners - * @see {@link PropertyChangeSupport#getPropertyChangeListeners()} + * @see PropertyChangeSupport#getPropertyChangeListeners() */ public PropertyChangeListener[] getPropertyChangeListeners() { return propertyChangeSupport.getPropertyChangeListeners(); @@ -866,7 +866,7 @@ public PropertyChangeListener[] getPropertyChangeListeners() { * @param propertyName * the property being listened to * @return the registered property change listeners - * @see {@link PropertyChangeSupport#getPropertyChangeListeners(String)} + * @see PropertyChangeSupport#getPropertyChangeListeners(String) */ public PropertyChangeListener[] getPropertyChangeListeners(final String propertyName) { return propertyChangeSupport.getPropertyChangeListeners(propertyName); @@ -878,7 +878,7 @@ public PropertyChangeListener[] getPropertyChangeListeners(final String property * @param propertyName * the property being listened on * @return true, if there are listeners registered - * @see {@link PropertyChangeSupport#hasListeners(String)} + * @see PropertyChangeSupport#hasListeners(String) */ public boolean hasListeners(final String propertyName) { return propertyChangeSupport.hasListeners(propertyName); @@ -889,7 +889,7 @@ public boolean hasListeners(final String propertyName) { * * @param listener * the listener to remove - * @see {@link PropertyChangeSupport#removePropertyChangeListener(PropertyChangeListener)} + * @see PropertyChangeSupport#removePropertyChangeListener(PropertyChangeListener) */ public void removePropertyChangeListener(final PropertyChangeListener listener) { propertyChangeSupport.removePropertyChangeListener(listener); @@ -902,7 +902,7 @@ public void removePropertyChangeListener(final PropertyChangeListener listener) * the property being listened to * @param listener * the listener to remove - * @see {@link PropertyChangeSupport#removePropertyChangeListener(String, PropertyChangeListener)} + * @see PropertyChangeSupport#removePropertyChangeListener(String, PropertyChangeListener) */ public void removePropertyChangeListener(final String propertyName, final PropertyChangeListener listener) { @@ -918,7 +918,7 @@ public void removePropertyChangeListener(final String propertyName, * the old value of the property * @param newValue * the new value of the property - * @see {@link PropertyChangeSupport#firePropertyChange(String, Object, Object)} + * @see PropertyChangeSupport#firePropertyChange(String, Object, Object) */ protected void firePropertyChange(final String propertyName, final Object oldValue, final Object newValue) { diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java index 04a26aa13..2a7975c18 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/KlighdPrintDialog.java @@ -53,7 +53,7 @@ * {@code create*BlockArea(Composite)} methods.
*
* The implementation is inspired by - * {@link org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs.JPSPrintDialog JPSPrintDialog} + * {@code org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs.JPSPrintDialog JPSPrintDialog} * of the GMF project. * * @author Christian Damus (cdamus) diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java index df0782d23..639b06158 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/PrintPreviewTray.java @@ -47,13 +47,13 @@ * A PrintPreview to be displayed as a dialog tray, e.g. used by {@link KlighdPrintDialog}.
*
* The implementation is inspired by - * {@link org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview.PrintPreviewHelper - * PrintPreviewHelper} of the GMF project, esp. + * {@code org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview.PrintPreviewHelper} + * of the GMF project, esp. * PrintPreviewHelper.updateCompositeForNumberOfColumns(int, int).
*
* Note: There's no method 'dispose()' or similar, since all required dispose routines are coupled * to the disposal of the employed SWT widgets. Their disposal is invoked by - * {@link org.eclipse.jface.dialogs.TrayDialog#closeTray() TrayDialog#closeTray()}, which is + * {@link org.eclipse.jface.dialogs.TrayDialog#closeTray() TrayDialog#closeTray()}, which is * inherited by our {@link KlighdPrintDialog}. * * @author csp diff --git a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/viewers/PiccoloViewerUI.java b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/viewers/PiccoloViewerUI.java index 885ef253a..1e445c368 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/viewers/PiccoloViewerUI.java +++ b/plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/viewers/PiccoloViewerUI.java @@ -218,7 +218,7 @@ protected void attachLabelTextWidgetEventListener(final StyledText textLabelWidg /** - * SWT event {@link Listener} implementation that is dedicated to the creation & propagation of + * SWT event {@link Listener} implementation that is dedicated to the creation and propagation of * {@link KlighdTextSelection KlighdTextSelections} after corresponding mouse and key events * notified to the employed label text widget.
*
@@ -339,7 +339,7 @@ public void handleEvent(final Event event) { } /** - * Asynchronously executes {@link #updateSelection(ISelection)} in order to let the calling + * Asynchronously executes the super method {@code #updateSelection(IKlighdSelection)} in order to let the calling * method terminate quickly and do not block any display modifications. * * @param selection diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DiagramExportConfig.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DiagramExportConfig.java index 7cc5c673d..05cfca0cd 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DiagramExportConfig.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DiagramExportConfig.java @@ -81,7 +81,7 @@ public class DiagramExportConfig { * Determines whether the diagram zoom level determined by the diagram main camera's view * transform shall be used while evaluating the visibility of the particular diagram elements * and diagram element figure parts, if false a diagram zoom level of - * 1.0 is assumed. + * 1.0 is assumed. */ public boolean applyCameraZoomLevel = false; @@ -340,7 +340,7 @@ public DiagramExportConfig setExportSemanticData(final boolean exportSemanticDat * means of {@link de.cau.cs.kieler.klighd.util.KlighdSemanticDiagramData * KlighdSemanticDiagramData} to the export, if supported by the exporter. * - * @param setTextLength + * @param setTextLengths * if the expected text length values shall be added to the diagram while exporting * an SVG based image, false otherwise. * @@ -379,7 +379,7 @@ public DiagramExportConfig setBrandingsAndTrim(final Iterable e /** * Combined setter of information concerning the page/tile numbering.
- * {@link #firstRow} & {@link #firstColumn} are set if {@code rowNo} & {@code columnNo} are + * {@link #firstRow} and {@link #firstColumn} are set if {@code rowNo} and {@code columnNo} are * equal to zero, {@link #lastRow} and {@link #lastColumn} are set {@code row == rows - 1} and * {@code column == columns - 1}, respectively. * @@ -405,7 +405,7 @@ public DiagramExportConfig setPageAndTileNumbers(final int pageNo, final int row /** * Combined setter of information concerning the page/tile numbering..
- * {@link #firstRow} & {@link #firstColumn} are set if {@code rowNo} & {@code columnNo} are + * {@link #firstRow} and {@link #firstColumn} are set if {@code rowNo} and {@code columnNo} are * equal to zero. * * @param pageNo diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DisplayedActionData.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DisplayedActionData.java index c6a9803e5..af7db5061 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DisplayedActionData.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/DisplayedActionData.java @@ -25,9 +25,6 @@ * {@link de.cau.cs.kieler.klighd.IAction IAction}'s offered in the UI's side bar. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class DisplayedActionData { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IAction.java index 680e0cb34..8b6cf358f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IAction.java @@ -40,9 +40,6 @@ * created only. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IAction { @@ -51,10 +48,10 @@ public interface IAction { * * @param context * an {@link ActionContext} instance providing various useful data. - * @return an {@link ActionResult} providing {@link ILayoutConfig layout config(s)} to be + * @return an {@link ActionResult} providing {@link LayoutConfigurator layout config(s)} to be * incorporated while updating the layout after the action has been performed, as well * as configurations of 'animateLayout', 'zoomToFit', etc.
- * Use {@link ActionResult#createResult(boolean, ILayoutConfig...)} for creation. + * Use {@link ActionResult#createResult(boolean, LayoutConfigurator...)} for creation. */ ActionResult execute(ActionContext context); @@ -204,7 +201,7 @@ public Point getDisplayRelativeMousePos() { /** * Return type being expected by implementations of {@link IAction#execute(ActionContext)}. - * Besides {@link ILayoutConfig ILayoutConfigs} + * Besides {@link LayoutConfigurator LayoutConfigurators} * * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramExporter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramExporter.java index 15127a2fa..79f6e325c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramExporter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramExporter.java @@ -29,16 +29,13 @@ import org.eclipse.swt.widgets.Control; /** - * Basic interface of diagram exporters creating images in png or svg + * Basic interface of diagram exporters creating images in png or svg * format, for instance. * * @author uru * @author chsch * @author csp * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch - * * @see IDiagramExporter#export(Control, ExportData) */ public interface IDiagramExporter { @@ -142,7 +139,7 @@ public boolean cameraViewport() { * @return Flag to indicate whether the diagram zoom level determined by the diagram main * camera's view transform shall be used while evaluating the visibility of the * particular diagram elements and diagram element figure parts, if - * false a diagram zoom level of 1.0 is assumed. + * false a diagram zoom level of 1.0 is assumed. */ public boolean applyCameraZoomLevel() { return applyCameraZoomLevel; @@ -431,7 +428,7 @@ public ExportDataBuilder cameraViewport(final boolean cameraViewport) { * Configures the export to use the diagram zoom level determined by the diagram main * camera's view transform while evaluating the visibility of the particular diagram * elements and diagram element figure parts, if false a diagram zoom level of - * 1.0 is assumed. This is entirely independent of the {@link #scale(int)}, + * 1.0 is assumed. This is entirely independent of the {@link #scale(int)}, * which is just about the scale of the exported image (file). The latter can be increased * to improve the image quality of raster images. * diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramWorkbenchPart.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramWorkbenchPart.java index 9d49bc4a1..ebec1f75a 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramWorkbenchPart.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IDiagramWorkbenchPart.java @@ -24,9 +24,6 @@ * * @author msp * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IDiagramWorkbenchPart extends IWorkbenchPart { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IExportBranding.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IExportBranding.java index 888ff9b3a..e60beedea 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IExportBranding.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IExportBranding.java @@ -23,7 +23,7 @@ * Interface of diagram printout/export customizers allowing to add frames, author information, and * confidentiality remarks to diagram printouts and exports.
* Note: Implementations should not directly implement this interface but subclass - * {@link de.cau.cs.kieler.klighd.piccolo.export.AbstractExportBranding} situated in the plug-in + * {@code de.cau.cs.kieler.klighd.piccolo.export.AbstractExportBranding} situated in the plug-in * {@code de.cau.cs.kieler.klighd.piccolo}. * * @author csp @@ -111,7 +111,7 @@ public String toString() { * Setter being called by the runtime after initialization. * * @param viewContext - * the {@link ViewContext} providing access to the diagram' view & source model + * the {@link ViewContext} providing access to the diagram' view and source model */ void setViewContext(ViewContext viewContext); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IKlighdSelection.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IKlighdSelection.java index 53b02e2cb..600538ef1 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IKlighdSelection.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IKlighdSelection.java @@ -25,9 +25,6 @@ * A common interface of KLighD-specific implementations of {@link ISelection}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IKlighdSelection extends ISelection { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IModelModificationHandler.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IModelModificationHandler.java index 31bc02845..bdec607d4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IModelModificationHandler.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IModelModificationHandler.java @@ -26,17 +26,15 @@ /** * An interface that is used by KSBasE and KLighD to retrieve selections and perform - * transformations. The {@link KSBasECombination} uses the {@link ModifyModelHandlerProvider} to + * transformations. The {@code KSBasECombination} uses the {@code ModifyModelHandlerProvider} to * find the best fitting handler for the current context (via the - * {@link ModifyModelHandlerProvider#getFittingKSBasEHandler(IWorkbenchPart)} method). + * {@code ModifyModelHandlerProvider#getFittingKSBasEHandler(IWorkbenchPart)} method). + * Note: Implementation of KSBasE has been discontinued. * * All handlers have to be registered via the de.cau.cs.kieler.ksbase.ui.handlers extension point. * * @author uru * @author ckru - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IModelModificationHandler { @@ -109,7 +107,7 @@ void execute(final IWorkbenchPart workbenchPart, final Function fu * Gets the element on which to execute the layout thats executed after the method has been * executed. * - * @return the root element for which layout should be applied if the {@link #isPerformLayout()} + * @return the root element for which layout should be applied if the {@link #isLayoutRequired()} * method returns true. */ EObject getLayoutRoot(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IOffscreenRenderer.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IOffscreenRenderer.java index 149580950..73bdae952 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IOffscreenRenderer.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IOffscreenRenderer.java @@ -31,9 +31,6 @@ * showing them on the screen. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IOffscreenRenderer { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ISourceProxy.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ISourceProxy.java index b8c84f74e..54720a6d4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ISourceProxy.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ISourceProxy.java @@ -32,7 +32,7 @@ * the function.
*
* Caution: By contract {@link Function}'s result must not be an part/element of the actual - * model itself! + * model itself! * * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IStyleModifier.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IStyleModifier.java index 8cf2e6a39..593d5fb14 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IStyleModifier.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IStyleModifier.java @@ -30,9 +30,6 @@ * * @author chsch * @author akoc - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IStyleModifier { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IUpdateStrategy.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IUpdateStrategy.java index 57d9b5431..de41da060 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IUpdateStrategy.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IUpdateStrategy.java @@ -25,9 +25,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IUpdateStrategy { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewChangeListener.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewChangeListener.java index c854ca988..99948d893 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewChangeListener.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewChangeListener.java @@ -34,9 +34,6 @@ * current clip, ... * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IViewChangeListener { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewer.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewer.java index 02a2da46c..6a0af056b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewer.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewer.java @@ -32,14 +32,11 @@ * The common interface for viewers displaying diagrams of provided models.
*
* This interface is supposed to be used in client's code for revealing elements in diagrams, - * expanding & collapsing elements, clipping the diagram, or asking for the source elements + * expanding and collapsing elements, clipping the diagram, or asking for the source elements * of representatives in diagrams by referring to {@link #getViewContext()}. * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IViewer { @@ -80,7 +77,7 @@ public interface IViewer { void setModel(Object model, boolean sync); /** - * Returns the {@link ViewContext} that is associated to this viewer. + * Returns the {@link ViewContext} that is associated to this viewer. * * @return the associated {@link ViewContext} or null if no input model is set */ @@ -400,8 +397,7 @@ default void removeViewChangedEventListener(IViewChangeListener listener) { boolean isExpanded(KNode diagramElement); /** - * Collapses the representation of the given element. Note that there must exist related element - * <-> diagram element tracking information in the {@link TransformationContexts}. + * Collapses the representation of the given element. * * @param semanticElement * the semantic element to be expanded @@ -417,8 +413,7 @@ default void removeViewChangedEventListener(IViewChangeListener listener) { /** * Expands the representation of the given element, i.e. populates it with children and changes - * its rendering if necessary. Note that there must exist related element <-> diagram element - * tracking information in the {@link TransformationContexts}. + * its rendering if necessary. * * @param semanticElement * the semantic element to be expanded @@ -433,9 +428,7 @@ default void removeViewChangedEventListener(IViewChangeListener listener) { void expand(KNode diagramElement); /** - * Expands the representation of the given element if collapsed and vice versa. Note that there - * must exist related element <-> diagram element tracking information in the - * {@link TransformationContexts}. + * Expands the representation of the given element if collapsed and vice versa. * * @param semanticElement * the semantic element to be expanded diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewerProvider.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewerProvider.java index aa94fa7ab..9c8e08926 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewerProvider.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/IViewerProvider.java @@ -25,9 +25,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IViewerProvider { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdConstants.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdConstants.java index 3b41aa928..691e40308 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdConstants.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdConstants.java @@ -29,12 +29,9 @@ import de.cau.cs.kieler.klighd.microlayout.Bounds; /** - * This class contains definitions of initial & default values. + * This class contains definitions of initial and default values. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class KlighdConstants { @@ -98,7 +95,7 @@ public final class KlighdConstants { /** * Default display dot density, basically copied from - * {@link org.eclipse.swt.internal.DPIUtil#DPI_ZOOM_100()}. + * {@code org.eclipse.swt.internal.DPIUtil#DPI_ZOOM_100()}. * For more details checkout https://en.wikipedia.org/wiki/Dots_per_inch */ @SuppressWarnings("restriction") diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdDataManager.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdDataManager.java index d4e3d4fe9..5e7e5f8dd 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdDataManager.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdDataManager.java @@ -695,7 +695,7 @@ public KlighdDataManager registerBlacklistedProperty(IProperty blacklistedPro * only applies to properties that would otherwise be included i.e. properties starting with "de.cau.cs.kieler.klighd", * "klighd" or "org.eclipse.elk" or explicitly whitelisted properties. The blacklist is applied before the * whitelist is compared. - * @param blacklistedProperty The list of properties to be blacklisted. + * @param blacklistedProperties The list of properties to be blacklisted. * @return KlighdDataManager */ public KlighdDataManager registerBlacklistedProperties(Iterable> blacklistedProperties) { @@ -1151,7 +1151,7 @@ public IDiagramExporter getExporter(final String id) { * @param format * the format an {@link IExportBranding} is requested for * @param viewContext - * the {@link ViewContext} providing access to the diagram' view & source model + * the {@link ViewContext} providing access to the diagram's view and source model * * @return the {@link Iterable} of {@link IExportBranding IExportHooks} */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPlugin.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPlugin.java index d9b576cdf..cb2f7a104 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPlugin.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPlugin.java @@ -29,9 +29,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class KlighdPlugin extends Plugin { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPreferences.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPreferences.java index 2f71cec90..c5f7c3558 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPreferences.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdPreferences.java @@ -34,9 +34,6 @@ * * @author cds * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class KlighdPreferences { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramLayoutConfig.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramLayoutConfig.java index 91261aba0..e324f33d7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramLayoutConfig.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramLayoutConfig.java @@ -30,7 +30,7 @@ /** * Configuration object for {@link LightDiagramServices} methods * {@link LightDiagramServices#layoutDiagram(LightDiagramLayoutConfig)} and - * {@link LightDiagramServices#updateDiagram(LightDiagramLayoutConfig). These configuration holders + * {@link LightDiagramServices#updateDiagram(LightDiagramLayoutConfig)}. These configuration holders * should be disposed of after use. For this reason there are no public getters available. * * Example: @@ -82,12 +82,12 @@ public class LightDiagramLayoutConfig { /** * The {@link KGraphElement} to focus on, if {@link ZoomStyle#ZOOM_TO_FOCUS} or - * {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is active. + * {@link ZoomStyle#ZOOM_TO_STAY} is active. */ private KGraphElement focusElement; /** - * The previous position of an element before the layout, if {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is active. + * The previous position of an element before the layout, if {@link ZoomStyle#ZOOM_TO_STAY} is active. */ private KVector previousPosition; @@ -209,7 +209,7 @@ public LightDiagramLayoutConfig zoomStyle(final ZoomStyle theZoomStyle) { * * @param theFocusNode * the {@link KNode} to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or - * {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is set. + * {@link ZoomStyle#ZOOM_TO_STAY} is set. * @return the configuration */ public LightDiagramLayoutConfig focusNode(final KNode theFocusNode) { @@ -222,7 +222,7 @@ public LightDiagramLayoutConfig focusNode(final KNode theFocusNode) { * * @param theFocusElement * the {@link KGraphElement} to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or - * {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is set. + * {@link ZoomStyle#ZOOM_TO_STAY} is set. * @return the configuration */ public LightDiagramLayoutConfig focusElement(final KGraphElement theFocusElement) { @@ -234,7 +234,7 @@ public LightDiagramLayoutConfig focusElement(final KGraphElement theFocusElement * Sets the previous position of an element before the layout run. * * @param thePreviousPosition - * the previous position of an element if {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is set. + * the previous position of an element if {@link ZoomStyle#ZOOM_TO_STAY} is set. * @return the configuration */ public LightDiagramLayoutConfig previousPosition(final KVector thePreviousPosition) { @@ -333,7 +333,7 @@ ZoomStyle zoomStyle() { } /** - * The node to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is + * The node to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY} is * configured. * * @return the focusNode @@ -347,7 +347,7 @@ KNode focusNode() { } /** - * The element to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is + * The element to focus on if {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY} is * configured. * * @return the focusElement @@ -357,7 +357,7 @@ KGraphElement focusElement() { } /** - * The previous position of an element if {@link ZoomStyle#ZOOM_TO_STAY_SELECTED} is configured. + * The previous position of an element if {@link ZoomStyle#ZOOM_TO_STAY} is configured. * @return */ KVector previousPosition() { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramServices.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramServices.java index 6e6cad3a0..18fd28191 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramServices.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/LightDiagramServices.java @@ -54,9 +54,6 @@ * Collection of basic KLighD services. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class LightDiagramServices { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/SynthesisOption.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/SynthesisOption.java index ecd988742..34dea2768 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/SynthesisOption.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/SynthesisOption.java @@ -31,9 +31,6 @@ * synthesis option instance. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class SynthesisOption { @@ -325,8 +322,8 @@ public static SynthesisOption createChoiceOption(final Class clazz, final Str * Hint: Declare {@link SynthesisOption TransformationOptions} by means of static fields if * the transformation is a re-initialized one (determined in the registration).
*
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * @param @@ -353,8 +350,8 @@ public static SynthesisOption createRangeOption( * Hint: Declare {@link SynthesisOption TransformationOptions} by means of static fields if * the transformation is a re-initialized one (determined in the registration).
*
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * @param concrete type of the range's end value @@ -386,8 +383,8 @@ public static SynthesisOption createRangeOption(final String * Hint: Declare {@link SynthesisOption TransformationOptions} by means of static fields if * the transformation is a re-initialized one (determined in the registration).
*
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * @param concrete type of the range's end value @@ -420,8 +417,8 @@ public static SynthesisOption createRangeOption(final Class *
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * @@ -452,8 +449,8 @@ public static SynthesisOption createRangeOption(final String * Hint: Declare {@link SynthesisOption TransformationOptions} by means of static fields if * the transformation is a re-initialized one (determined in the registration).
*
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * @@ -488,8 +485,8 @@ public static SynthesisOption createRangeOption(final String * Hint: Declare {@link SynthesisOption TransformationOptions} by means of static fields if * the transformation is a re-initialized one (determined in the registration).
*
- * Note: Use <>.optionFloatValue while testing the option value - * if at least one of the parameters is a floating point value, and <>. + * Note: Use <<OPTION_NAME>>.optionFloatValue while testing the option value + * if at least one of the parameters is a floating point value, and <<OPTION_NAME>>. * optionIntValue otherwise (in Xtend). * * diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewChangeType.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewChangeType.java index 76f079a32..d15641e34 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewChangeType.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewChangeType.java @@ -22,9 +22,6 @@ * Defines the possible view change types being performed by KLighD {@link IViewer IViewers}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public enum ViewChangeType { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java index 5d9115b8d..5325f9a48 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java @@ -70,9 +70,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ViewContext extends MapPropertyHolder { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ZoomStyle.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ZoomStyle.java index c56ce173a..2995f2338 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ZoomStyle.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ZoomStyle.java @@ -24,9 +24,6 @@ * * @author uru * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public enum ZoomStyle { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipParentAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipParentAction.java index a24b66afe..c552915c9 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipParentAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipParentAction.java @@ -25,9 +25,6 @@ * that parent exists. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ClipParentAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipResetAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipResetAction.java index 52775ad30..80969c73d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipResetAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipResetAction.java @@ -25,9 +25,6 @@ * Does nothing if the diagram root is the current clip. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ClipResetAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipSelectionAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipSelectionAction.java index b08fad6d1..ad00b2d0e 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipSelectionAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipSelectionAction.java @@ -27,9 +27,6 @@ * Does nothing otherwise. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ClipSelectionAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipTowardsSelectionAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipTowardsSelectionAction.java index 2a5d6688d..5e026fc40 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipTowardsSelectionAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ClipTowardsSelectionAction.java @@ -28,9 +28,6 @@ * currently selected element, if that child is a {@link KNode}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ClipTowardsSelectionAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/CollapseExpandAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/CollapseExpandAction.java index 8a4b59abd..20a8bbd18 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/CollapseExpandAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/CollapseExpandAction.java @@ -23,9 +23,6 @@ * {@link de.cau.cs.kieler.klighd.kgraph.KNode KNodes}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class CollapseExpandAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/FocusAndContextAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/FocusAndContextAction.java index 80b8db5b6..691df7732 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/FocusAndContextAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/FocusAndContextAction.java @@ -34,7 +34,7 @@ * This action puts elements into the focus when clicked. Focussed elements usually have their * labels fully displayed, while unfocussed elements are usually subject to the current label * management strategy. Focussed / unfocussed elements can be distinguished by checking their - * {@link KlighdLabelProperties#ELEMENT_IN_FOCUS}. + * {@link KlighdOptions#LABELS_ELEMENT_IN_FOCUS}. * *

This class does not set the focussed state on the clicked element only, but also determines * which other elements should change their focus state along with it. A simple example would be diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleDownAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleDownAction.java index 0a50e2144..b61f9480b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleDownAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleDownAction.java @@ -24,9 +24,6 @@ * Scales the chosen {@link KNode} down by (roughly) one unit, i.e. 100 percent points. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ScaleDownAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleResetAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleResetAction.java index 0e00ec4a1..8680c872a 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleResetAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleResetAction.java @@ -24,9 +24,6 @@ * Sets the chosen {@link KNode}'s scale to one unit, i.e. 100 percent. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ScaleResetAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleUpAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleUpAction.java index 642b5f81e..6392ff360 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleUpAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/ScaleUpAction.java @@ -24,9 +24,6 @@ * Scales the chosen {@link KNode} up by (roughly) one unit, i.e. 100 percent points. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ScaleUpAction implements IAction { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/IDiagramOutlinePage.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/IDiagramOutlinePage.java index 63a669484..ee4a1b34f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/IDiagramOutlinePage.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/IDiagramOutlinePage.java @@ -19,7 +19,7 @@ import org.eclipse.ui.part.IPage; /** - * An extension of {@link IContentOutlinePage} allowing to delay the visibility of the outline + * An extension of {@code org.eclipse.ui.views.contentoutline.IContentOutlinePage} allowing to delay the visibility of the outline * diagram until the diagram structures are initialized properly.
* This interface does not extend IContentOutlinePage as that one requires a dependency to the * bundle org.eclipse.ui.views. Since IContentOutlinePage is {@link IPage} + @@ -33,9 +33,6 @@ * to implement {@link IDiagramOutlinePage.Provider}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface IDiagramOutlinePage extends IPage { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutConfigProvider.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutConfigProvider.java index 18a8e8da1..aba3e41a4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutConfigProvider.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutConfigProvider.java @@ -26,9 +26,6 @@ * describes an orthogonal aspect and is used for internal purposes only. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface ILayoutConfigProvider { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java index 6071045a3..de41f0e7d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java @@ -31,9 +31,6 @@ * {@link de.cau.cs.kieler.klighd.IViewer IViewers}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface ILayoutRecorder { @@ -60,7 +57,7 @@ public interface ILayoutRecorder { * the style used to zoom, e.g. zoom to fit or zoom to focus * @param focusElement * the {@link KGraphElement} to focus in case zoomStyle is - * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY_SELECTED}, is ignored otherwise + * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY}, is ignored otherwise * @param animationTime * duration of the animated layout */ @@ -73,10 +70,10 @@ public interface ILayoutRecorder { * the style used to zoom, e.g. zoom to fit or zoom to focus * @param focusElement * the {@link KGraphElement} to focus in case zoomStyle is - * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY_SELECTED}, is ignored otherwise + * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY}, is ignored otherwise * @param previousPosition * the position the selected element had in the previous layout run. - * Is ignored if the zoomStyle is ont {@link ZoomStyle#ZOOM_TO_STAY_SELECTED}. + * Is ignored if the zoomStyle is ont {@link ZoomStyle#ZOOM_TO_STAY}. * @param animationTime * duration of the animated layout */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ISynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ISynthesis.java index 54e2aa2b8..9ad57bed5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ISynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ISynthesis.java @@ -43,9 +43,6 @@ * order to benefit from the convenience features of that class! * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public interface ISynthesis { @@ -101,7 +98,7 @@ public interface ISynthesis { List, List>> getDisplayedLayoutOptions(); /** - * Contributes the list of {@link de.cau.cs.kieler.klighd.IActionIAction IActions} provided in + * Contributes the list of {@link de.cau.cs.kieler.klighd.IAction IActions} provided in * the UI allowing to quickly perform pre-defined actions on the diagram elements. In order to * avoid compile time dependencies on concrete {@link de.cau.cs.kieler.klighd.IAction IAction} * implementations they are referenced by the id used in their registration. diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java index 4b57bc3ca..207765013 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java @@ -50,9 +50,6 @@ * @author msp * @author chsch * @author cds - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class AnchorUtil { @@ -87,7 +84,7 @@ private AnchorUtil() { * rectangle will be assumed. * @param scale * the connected node's - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions#SCALE_FACTOR SCALE_FACTOR} for + * {@link org.eclipse.elk.core.options.CoreOptions#SCALE_FACTOR SCALE_FACTOR} for * adjusting corner sizes of {@link KRoundedRectangle KRoundedRectangles} and * port positions * @return the point on the figure's border that is nearest to the given point, relative to the diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java index 016267601..af30c2533 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java @@ -98,8 +98,8 @@ *

If the {@link KNode} instances have attached {@code KRendering} data the manager uses them to * compute the node insets as well as the minimal node size.

* - *

Note: During the {@link #applyLayout(LayoutMapping)} phase layout data that have been - * scaled according to a corresponding {@link LayoutOptions#SCALE_FACTOR} are normalized to scaling + *

Note: During the {@link #applyLayout(LayoutMapping, boolean)} phase layout data that have been + * scaled according to a corresponding {@link CoreOptions#SCALE_FACTOR} are normalized to scaling * 1.0f, since the scaling is implemented on figure level by means of affine * transforms. In addition, the scale adjustment need not be reverted before the subsequent layout * run.

@@ -130,8 +130,8 @@ public class KlighdDiagramLayoutConnector implements IDiagramLayoutConnector { private static final IProperty> EXCLUDED_EDGES = new Property<>("krendering.layout.excludedEdges"); /** - * A property that is used to tell KIML about the workbench part this layout manager is - * responsible for. Note that this property is not referred to by KIML immediately, it rather + * A property that is used to tell ELK about the workbench part this layout manager is + * responsible for. Note that this property is not referred to by ELK immediately, it rather * filters given property definitions by their value types and looks for one of * {@link IWorkbenchPart}. */ @@ -207,7 +207,7 @@ public LayoutMapping buildLayoutGraph(final IWorkbenchPart workbenchPart, final * @param viewModel * the graph to build the layout graph from * @param performSizeEstimation - * whether the size of nodes & labels should be automatically estimated. + * whether the size of nodes and labels should be automatically estimated. * @param workbenchPart * the workbenchPart in which the layout takes place, if any * @return the layout graph mapping @@ -330,7 +330,7 @@ private void createNode(final LayoutMapping mapping, final KNode node, // if the minimal node size is given in terms of the dedicated property, use its values minSize = Bounds.of(node.getProperty(KlighdProperties.MINIMAL_NODE_SIZE)); } else if (!isCompoundNode || node.getProperty(INITIAL_NODE_SIZE)) { - // otherwise, if the node is a non-compound one or the size is not yet modified by KIML + // otherwise, if the node is a non-compound one or the size is not yet modified by ELK // take the component-wise maximum of the standard bounds and 'nodelayout's values minSize = Bounds.max(minSize, Bounds.of(node.getWidth(), node.getHeight())); } @@ -360,7 +360,7 @@ private void createNode(final LayoutMapping mapping, final KNode node, PlacementUtil.calculateInsets(displayedRendering, insets, size); // integrate the minimal estimated node size - // in case of a compound node, the minimal node size to be preserved by KIML must be + // in case of a compound node, the minimal node size to be preserved by ELK must be // handed over by means of the MIN_WIDTH/MIN_HEIGHT properties // in case of non-compound nodes with SizeConstraint::MINIMUM_SIZE set, the property // definitions are also relevant @@ -551,8 +551,8 @@ private void createEdge(final LayoutMapping mapping, final KEdge edge, * @param estimateSize * if true the minimal size of the {@link KLabel} will be estimated * @param setFontLayoutOptions - * if true the layout options {@link LayoutOptions#FONT_NAME} and - * {@link LayoutOptions#FONT_SIZE} are set/updated on kLabel's layout + * if true the layout options {@link CoreOptions#FONT_NAME} and + * {@link CoreOptions#FONT_SIZE} are set/updated on kLabel's layout * data as expected by Graphviz (dot) for properly sizing edge labels */ private void createLabel(final LayoutMapping mapping, final KLabel label, @@ -685,7 +685,7 @@ public Boolean caseElkNode(final ElkNode layoutNode) { shapeToViewModel(mapping, layoutNode, node, true, true); node.setProperty(INITIAL_NODE_SIZE, false); - // transfer the scale factor value since KIML might have reset it + // transfer the scale factor value since ELK might have reset it // to 1f in case scaling was not supported in the particular configuration // and the figure scaling will be set according this property setting node.setProperty(CoreOptions.SCALE_FACTOR, diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java index 0c450a11e..552ab7bef 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java @@ -64,9 +64,6 @@ * * @author mri * @author msp - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class KlighdLayoutConfigurationStore implements ILayoutConfigurationStore { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/preferences/PreferenceInitializer.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/preferences/PreferenceInitializer.java index 1fca6224a..a1961a25f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/preferences/PreferenceInitializer.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/preferences/PreferenceInitializer.java @@ -26,9 +26,6 @@ * * @author cds * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class PreferenceInitializer extends AbstractPreferenceInitializer { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java index caa91f5ea..c7dada30a 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java @@ -29,13 +29,9 @@ import de.cau.cs.kieler.klighd.kgraph.PersistentEntry; /** - * A collection of internal KLighD-specific {@link de.cau.cs.kieler.klighd.properties.IProperty - * IProperties}. + * A collection of internal KLighD-specific {@link IProperty IProperties}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class KlighdInternalProperties { @@ -101,34 +97,34 @@ private KlighdInternalProperties() { /** * The {@link KGraphElement} to be focus during upcoming diagram layout if {@link #NEXT_ZOOM_STYLE} is - * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY_SELECTED}. + * {@link ZoomStyle#ZOOM_TO_FOCUS} or {@link ZoomStyle#ZOOM_TO_STAY}. */ public static final IProperty NEXT_FOCUS_ELEMENT = new Property( "klighd.zoom.nextFocusElement"); /** * The position the selected element had in the previous layout that is included in the new layout - * if the {@link ZoomStyle} is {@link ZoomStyle#ZOOM_TO_STAY_SELECTED}. + * if the {@link ZoomStyle} is {@link ZoomStyle#ZOOM_TO_STAY}. */ public static final IProperty PREVIOUS_POSITION = new Property( "klighd.zoom.previousPosition"); /** - * Property to be attached to the {@link de.cau.cs.kieler.kiml.klayoutdata.KShapeLayout + * Property to be attached to the {@link de.cau.cs.kieler.klighd.kgraph.KShapeLayout * KShapeLayout} of a view model's nodes for properly performing regression tests. */ public static final IProperty KLIGHD_TESTING_EXPECTED_HEIGHT = new Property( "klighd.testing.expected.height"); /** - * Property to be attached to the {@link de.cau.cs.kieler.kiml.klayoutdata.KShapeLayout + * Property to be attached to the {@link de.cau.cs.kieler.klighd.kgraph.KShapeLayout * KShapeLayout} of a view model's nodes for properly performing regression tests. */ public static final IProperty KLIGHD_TESTING_EXPECTED_WIDTH = new Property( "klighd.testing.expected.width"); /** - * Property to be attached to the {@link de.cau.cs.kieler.kiml.klayoutdata.KShapeLayout + * Property to be attached to the {@link de.cau.cs.kieler.klighd.kgraph.KShapeLayout * KShapeLayout} of a view model's nodes in order to ignore those nodes.
*
* The id is also hard-coded in KGraphJavaValidator! diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java index 8e8f9fe82..809a5ecae 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java @@ -47,9 +47,6 @@ * of {@link Map Maps}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class SourceModelTrackingAdapter extends EContentAdapter { @@ -67,7 +64,7 @@ public class SourceModelTrackingAdapter extends EContentAdapter { * Returns the element in the input model that is represented by the given viewElement * in the diagram.
* Note: This method does not check whether viewElement is currently contained - * in the view model (accessible via {@link #getViewModel()}). + * in the view model (accessible via {@link de.cau.cs.kieler.klighd.ViewContext#getViewModel()}). * * @param viewElement * the diagram element whose source element in the input (source, semantic, or @@ -89,7 +86,7 @@ public Object getSourceElement(final EObject viewElement) { * Returns the elements in the view model that represent the given element in the * diagram.
* Note: This method does not check whether element is currently contained - * in the input model being represented (accessible via {@link #getInputModel()}). + * in the input model being represented (accessible via {@link de.cau.cs.kieler.klighd.ViewContext#getInputModel()}). * * @param element * the object in the input (source, semantic, or business) model diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KCustomRenderingWrapperFactory.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KCustomRenderingWrapperFactory.java index d3f5ee747..bf97ed5ce 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KCustomRenderingWrapperFactory.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KCustomRenderingWrapperFactory.java @@ -47,9 +47,6 @@ * type is compatible to the other type. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class KCustomRenderingWrapperFactory { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KTextUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KTextUtil.java index 0a7451d6b..9564ea50b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KTextUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/KTextUtil.java @@ -28,9 +28,6 @@ * Some convenience methods supporting the proper handling of KText renderings. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class KTextUtil { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/SimpleUpdateStrategy.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/SimpleUpdateStrategy.java index e1896c816..72e604833 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/SimpleUpdateStrategy.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/krendering/SimpleUpdateStrategy.java @@ -34,9 +34,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class SimpleUpdateStrategy implements IUpdateStrategy { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/decoration/LabelDecorationConfigurator.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/decoration/LabelDecorationConfigurator.java index ef0b362c9..0a48c533a 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/decoration/LabelDecorationConfigurator.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/decoration/LabelDecorationConfigurator.java @@ -61,7 +61,7 @@ *

* * - *

Layout Mode

+ * Layout Mode * *

* This setting decides whether the resulting label renderings should only work with horizontal or @@ -76,7 +76,7 @@ *

* * - *

Decorator Rendering Providers

+ * Decorator Rendering Providers * *

* Inline labels will usually require some sort of special rendering since simply displaying its @@ -92,7 +92,7 @@ *

* * - *

Text Rendering Provider

+ * Text Rendering Provider * *

* The label text must be rendered using a {@link KText}, which is provided by a text rendering diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/AbstractKlighdLabelManager.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/AbstractKlighdLabelManager.java index cc0aae9c8..f2a769d34 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/AbstractKlighdLabelManager.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/AbstractKlighdLabelManager.java @@ -58,7 +58,7 @@ *

* * - *

Notes for Subclasses

+ * Notes for Subclasses * *

* Subclasses only need to override {@link #doResizeLabel(ElkLabel, double)}. If behavior related @@ -70,17 +70,17 @@ *

* * - *

Technical Remarks

+ * Technical Remarks * *

* The label passed to this manager is the one from the layout ElkGraph fed to the layout algorithm, * not the one used in KLighD's view model. This means that we need to remember the label's new text * somewhere. We actually remember it by modifying the text of the layout graph's label. When * applying the layout results, - * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdLayoutManager KlighdLayoutManager} + * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdDiagramLayoutConnector KlighdDiagramLayoutConnector} * checks if the layout graph's label has a {@link LabelManagementResult} attached to it that * indicates that a label manager was active. If so, it applies the label's new text to a property - * set on the label ({@link KlighdLabelProperties#LABEL_TEXT_OVERRIDE}) which is then used as the + * set on the label ({@link KlighdOptions#LABELS_TEXT_OVERRIDE}) which is then used as the * label's text when displaying the label. Setting a proper {@link LabelManagementResult} on a given * label is something subclasses do not need to worry about. The necessary logic is completely * encapsulated in this base class. @@ -145,7 +145,7 @@ public final Mode getMode() { /** * Sets the mode this label manager should operate in. Note that if the mode is set to - * {@link Mode#FIXED_TARGET_WIDTH}, a fixed target width needs to be configured by calling + * {@link Mode#TARGET_WIDTH}, a fixed target width needs to be configured by calling * {@link #setFixedTargetWidth(double)}.This method call can be chained with other configuration * method calls. * @@ -170,7 +170,7 @@ public final double getFixedTargetWidth() { /** * Set the fixed non-negative target width to be used. The fixed target width is only meaningful - * if the label manager's state is {@link Mode#FIXED_TARGET_WIDTH} or {@link Mode#ALWAYS_ON}. In + * if the label manager's state is {@link Mode#TARGET_WIDTH} or {@link Mode#ALWAYS_ON}. In * the latter case, the fixed target width is used as the target width which label managers may * or may not pay attention to. To stop that from happening, call this method with a negative * value. diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/LabelManagementUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/LabelManagementUtil.java index 8a842ea5f..273d7a671 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/LabelManagementUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/LabelManagementUtil.java @@ -48,7 +48,7 @@ private LabelManagementUtil() { /** * Returns the KText that controls the rendering for the given label. The rendering is found by - * inspecting the {@link KlighdOptions#K_RENDERING} property. + * inspecting the {@link KRenderingOptions#K_RENDERING} property. * * @param label * the label whose KText to retrieve. @@ -65,7 +65,7 @@ public static KText ktextFor(final ElkLabel label) { /** * Determines the font data associated with the given label. This method requires the label to - * have the {@link KlighdOptions#K_RENDERING} property set to the rendering which will be used + * have the {@link KRenderingOptions#K_RENDERING} property set to the rendering which will be used * to actually render the label later. * * @param label diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/TruncatingLabelManager.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/TruncatingLabelManager.java index 0d37303fa..c29d313c4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/TruncatingLabelManager.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/labels/management/TruncatingLabelManager.java @@ -28,17 +28,11 @@ /** * Modifies the size of labels by truncating them once the truncation condition is met. The - * truncation condition can bei either reaching the end of the first line of text, reaching the end + * truncation condition can be either reaching the end of the first line of text, reaching the end * of a given number of words, or reaching the target width (default). The label manager can be * configured as to whether it should append an ellipsis to the truncated text to indicate * truncation (by default it does). * - *

- * It does not make sense to put this label manager into {@link TruncationMode#ALWAYS_ON} if it is set to - * truncate after reaching the target width. If a label does not exceed a target width, there's no - * sense in truncating anything. - *

- * * @author ybl * @author cds */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/Bounds.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/Bounds.java index ae375e8b0..636c1a391 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/Bounds.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/Bounds.java @@ -31,9 +31,6 @@ * them. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class Bounds { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/GridPlacementUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/GridPlacementUtil.java index 713e1f2b8..de9b593ab 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/GridPlacementUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/GridPlacementUtil.java @@ -44,9 +44,6 @@ * * @author chsch * @author akoc - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class GridPlacementUtil { @@ -437,7 +434,7 @@ private float[] computeCellSizes(final float availableSize, final float required * childPlacement instanceof KGridPlacement and updates the placement data of * internal KRenderings if necessary.
*
- * {@link de.cau.cs.kieler.klighd.properties.IProperty IProperties} for delivering those data. + * {@link IProperty IProperties} for delivering those data. * * @param container * the {@link KContainerRendering} to be evaluated diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java index fd949bef3..43d400f9f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/microlayout/PlacementUtil.java @@ -97,9 +97,6 @@ * @author chsch * @author sgu * @author akoc - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class PlacementUtil { @@ -792,8 +789,8 @@ public static FontData fontDataFor(final KLabel kLabel) { * @param kLabel * the label whose font information to retrieve. * @param setFontLayoutOptions - * if true the layout options {@link LayoutOptions#FONT_NAME} and - * {@link LayoutOptions#FONT_SIZE} are set/updated on kLabel's layout + * if true the layout options {@link CoreOptions#FONT_NAME} and + * {@link CoreOptions#FONT_SIZE} are set/updated on kLabel's layout * data as expected by Graphviz (dot) for properly sizing edge labels * @return font information for the given label. */ @@ -832,8 +829,8 @@ public static FontData fontDataFor(final KText kText) { * @param kText * the rendering whose font information to retrieve. * @param graphElement - * if unequal to null the layout options {@link LayoutOptions#FONT_NAME} - * and {@link LayoutOptions#FONT_SIZE} will be set/updated to the determined font + * if unequal to null the layout options {@link CoreOptions#FONT_NAME} + * and {@link CoreOptions#FONT_SIZE} will be set/updated to the determined font * name & size values * @return font information for the given rendering. */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/modifiers/PortRotationModifier.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/modifiers/PortRotationModifier.java index 9dae67e59..085f175e5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/modifiers/PortRotationModifier.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/modifiers/PortRotationModifier.java @@ -28,7 +28,7 @@ * This custom {@link IStyleModifier} is employed to correct the rotation of port figures that are * moved by the layouter, e.g. from the north to the west side of a node. Thus it is supposed to be * only associated to {@link de.cau.cs.kieler.klighd.krendering.KRendering KRenderings} describing the - * figures of {@link KPorts}
+ * figures of {@link KPort KPorts}
*
* It updates the {@link KRotation#getRotation() rotation} value of the {@link KRotation} style this * class is associated with (by entering {@link #ID} in the styles @@ -38,9 +38,6 @@ * This class is also registered in the plugin.xml. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class PortRotationModifier implements IStyleModifier { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java index 558c59b00..8a4a0e89b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java @@ -69,7 +69,7 @@ * time calling {@link com.google.inject.Provider#get() get()} on this provider a new instance will * be obtained as long as the provided class is not declared as singleton (via * {@link javax.inject.Singleton @Singleton}). The - * {@link de.cau.cs.kieler.klighd.krendering.extensions.ViewSynthesisShared ViewSynthesisShared} + * {@link de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared ViewSynthesisShared} * annotation helps if the described feature of employing helper classes is required. * * @param @@ -77,9 +77,6 @@ * * @author chsch * @author uru - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public abstract class AbstractDiagramSynthesis implements ISynthesis { @@ -295,7 +292,7 @@ public D putToLookUpWith(final D derived, final Object sourc * * A {@link SynthesisOption} option might be used to either display or hide comments in the * resulting diagram. The {@link SynthesisOption} class provides several convenience methods to - * create an option, e.g. {@link SynthesisOption#createRangeOption(...)} to create a 'slider'. + * create an option, e.g. {@link SynthesisOption#createRangeOption(String, String, Number, Number, Number, Number)} to create a 'slider'. * * The synthesis options will be displayed in the side bar of the corresponding view or editor * part according to the order within the returned list. @@ -443,7 +440,7 @@ public Function getTextUpdateFunction(final KText kText, final KGr /** * Convenience method for setting the initially applied diagram clip node.
* Refers to {@link #getUsedContext()} for determining the {@link ViewContext} to perform this - * definition and delegates to {@link #initiallyClipTo(ViewContext, KNode)}. + * definition and delegates to {@link #setInitialClipTo(ViewContext, KNode)}. * * @param node * the initial diagram clip node @@ -487,7 +484,7 @@ protected final KNode setInitialClipTo(final ViewContext viewContext, final KNod * the element to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param value * the option value * @return node allowing to perform multiple operations on it in one statement @@ -512,7 +509,7 @@ protected final R setLayoutOption(final R element, * the element to set the layout option on * @param optionValueMap * a {@link Map} containing valid pairs of layout options, e.g. some of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions}, and + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions}, and * corresponding option values. * @return element allowing to perform multiple operations on it in one statement */ @@ -533,7 +530,7 @@ public static R setLayoutOptions(final R element, * the node to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case node is collapsed * @param expandedValue @@ -559,7 +556,7 @@ protected final KNode setExpansionAwareLayoutOption(final KNode node, final * the port to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case port's container node is collapsed * @param expandedValue @@ -579,7 +576,7 @@ protected final KPort setExpansionAwareLayoutOption(final KPort port, *
* In common case this method need not to be called by application code but only if delegate * diagram syntheses are employed by means of a {@link com.google.inject.Provider Provider}, see - * {@link ReinitializingDiagramSynthesisProxy#ViewSynthesisScope ViewSynthesisScope} for + * {@link ReinitializingDiagramSynthesisProxy} and its private subclass {@code ViewSynthesisScope} for * details.
*
* Make sure to reset the reference by calling use(null) after calling diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramLayoutOptions.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramLayoutOptions.java index e9a8b40db..5eaa8d8b6 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramLayoutOptions.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramLayoutOptions.java @@ -117,18 +117,18 @@ private DiagramLayoutOptions() { /** * Dedicated to Class-Diagram-like diagrams.
- * Requires the bundle de.cau.cs.kieler.kiml.ogdf. + * @deprecated */ public static final String OGDF_PLANARIZATION = "de.cau.cs.kieler.kiml.ogdf.planarization"; /** * Creates circular layouts.
- * Requires the bundle de.cau.cs.kieler.kiml.ogdf. + * @deprecated */ public static final String OGDF_CIRCULAR = "de.cau.cs.kieler.kiml.ogdf.circular"; /** - * @see CoreOptions#ADDITIONAL_PORT_SPACE; + * @see CoreOptions#SPACING_PORTS_SURROUNDING */ public static final IProperty ADDITIONAL_PORT_SPACE = CoreOptions.SPACING_PORTS_SURROUNDING; @@ -144,7 +144,7 @@ private DiagramLayoutOptions() { public static final IProperty EDGE_ROUTING = CoreOptions.EDGE_ROUTING; /** - * @see CoreOptions#LABEL_SPACING + * @see CoreOptions#SPACING_LABEL_LABEL */ public static final IProperty LABEL_SPACING = CoreOptions.SPACING_LABEL_LABEL; @@ -155,12 +155,12 @@ private DiagramLayoutOptions() { CoreOptions.HIERARCHY_HANDLING; /** - * @see CoreOptions#OFFSET + * @see CoreOptions#PORT_BORDER_OFFSET */ public static final IProperty OFFSET = CoreOptions.PORT_BORDER_OFFSET; /** - * @see CoreOptions#PORT_ALIGNMENT + * @see CoreOptions#PORT_ALIGNMENT_DEFAULT */ public static final IProperty PORT_ALIGNMENT = CoreOptions.PORT_ALIGNMENT_DEFAULT; @@ -202,13 +202,13 @@ private DiagramLayoutOptions() { public static final IProperty PORT_INDEX = CoreOptions.PORT_INDEX; /** - * @see CoreOptions#PORT_LABEL_PLACEMENT + * @see CoreOptions#PORT_LABELS_PLACEMENT */ public static final IProperty> PORT_LABEL_PLACEMENT = CoreOptions.PORT_LABELS_PLACEMENT; /** - * @see CoreOptions#PORT_SPACING + * @see CoreOptions#SPACING_PORT_PORT */ public static final IProperty PORT_SPACING = CoreOptions.SPACING_PORT_PORT; @@ -218,13 +218,13 @@ private DiagramLayoutOptions() { public static final IProperty PORT_SIDE = CoreOptions.PORT_SIDE; /** - * @see CoreOptions#SIZE_CONSTRAINT + * @see CoreOptions#NODE_SIZE_CONSTRAINTS */ public static final IProperty> SIZE_CONSTRAINT = CoreOptions.NODE_SIZE_CONSTRAINTS; /** - * @see CoreOptions#SIZE_OPTIONS + * @see CoreOptions#NODE_SIZE_OPTIONS */ public static final IProperty> SIZE_OPTIONS = CoreOptions.NODE_SIZE_OPTIONS; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java index 41641c33f..389f8eb47 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java @@ -58,8 +58,6 @@ * Collection of KGraph/KRendering view model configuration methods. * * @author chsch - * - * @kieler.design proposed by chsch */ public final class DiagramSyntheses { @@ -81,7 +79,7 @@ private DiagramSyntheses() { * the element to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param value * the option value * @return element allowing to perform multiple operations on it in one statement @@ -103,7 +101,7 @@ public static S setLayoutOption(final S element, * the element to set the layout option on * @param optionId * the particular layout option's id, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param value * the option value. It is possible to pass string representations of EnumSets as * well as any non-string property. @@ -137,7 +135,7 @@ public static S setLayoutOption(final S element, * the element to set the layout option on * @param optionValueMap * a {@link Map} containing valid pairs of layout options, e.g. some of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions}, and + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions}, and * corresponding option values. * @return element allowing to perform multiple operations on it in one statement */ @@ -195,8 +193,8 @@ public static Pair, List> specifyLayoutOption(final String layou return specifyLayoutOption(option, values); } throw new IllegalArgumentException("Could not resolve the layout option '" + layoutOptionId - + "' using KIML's layout option service. " - + "Make sure the layout option exists and is properly registered with KIML."); + + "' using ELK's layout option service. " + + "Make sure the layout option exists and is properly registered with ELK."); } /** @@ -210,7 +208,7 @@ public static Pair, List> specifyLayoutOption(final String layou * the node to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case node is collapsed * @param expandedValue @@ -236,7 +234,7 @@ public static KNode setExpansionAwareLayoutOption(final KNode node, final IP * the port to set the layout option on * @param option * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case port's container node is collapsed * @param expandedValue diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DuplicatingDiagramSynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DuplicatingDiagramSynthesis.java index 5ed42033e..cf1c7c51e 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DuplicatingDiagramSynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DuplicatingDiagramSynthesis.java @@ -33,9 +33,6 @@ *
* * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class DuplicatingDiagramSynthesis extends AbstractDiagramSynthesis { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/GuiceBasedSynthesisFactory.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/GuiceBasedSynthesisFactory.java index 9c653a288..8df5b8546 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/GuiceBasedSynthesisFactory.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/GuiceBasedSynthesisFactory.java @@ -35,9 +35,6 @@ * ...ExecutableExtensionFactory classes generated by Xtext. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class GuiceBasedSynthesisFactory implements IExecutableExtension, IExecutableExtensionFactory { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/ReinitializingDiagramSynthesisProxy.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/ReinitializingDiagramSynthesisProxy.java index a45191308..2d0f293ec 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/ReinitializingDiagramSynthesisProxy.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/ReinitializingDiagramSynthesisProxy.java @@ -65,9 +65,6 @@ * type of the input models * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ReinitializingDiagramSynthesisProxy implements ISynthesis { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/AbstractRunnableWithResult.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/AbstractRunnableWithResult.java index 7f74a360b..c16969120 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/AbstractRunnableWithResult.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/AbstractRunnableWithResult.java @@ -19,7 +19,6 @@ /** * A simple standard implementation of {@link RunnableWithResult}. * - * @kieler.design 2014-04-17 reviewed by cds, chsch, tit, uru * @param the type of the result * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/CrossDocumentContentAdapter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/CrossDocumentContentAdapter.java index bb0221e1a..6bde92af4 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/CrossDocumentContentAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/CrossDocumentContentAdapter.java @@ -28,10 +28,9 @@ * This adapter refines the {@code EContentAdapter} so that it is able to follow * non-containment references. * - *

The implementation has been copied from {@link http://wiki.eclipse.org/EMF/Recipes}.

+ *

The implementation has been copied from http://wiki.eclipse.org/EMF/Recipes. * * @author EMF, mri - * @kieler.ignore The first rule of copied code is: you don't review copied code. */ public class CrossDocumentContentAdapter extends EContentAdapter { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ExpansionAwareLayoutOption.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ExpansionAwareLayoutOption.java index 11ea49c5b..429b26d37 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ExpansionAwareLayoutOption.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ExpansionAwareLayoutOption.java @@ -33,9 +33,6 @@ * collapsed/expanded state of the {@link de.cau.cs.kieler.klighd.kgraph.KNode KNode}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class ExpansionAwareLayoutOption { @@ -44,7 +41,7 @@ private ExpansionAwareLayoutOption() { /** * The layout option singleton (similar to those in - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions}.
+ * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions}.
* Its id is also registered in the plugin.xml. */ public static final IProperty OPTION = @@ -63,7 +60,7 @@ private ExpansionAwareLayoutOption() { * an {@link IPropertyHolder} to define the property on * @param property * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case node is collapsed * @param expandedValue @@ -115,7 +112,7 @@ public ExpansionAwareLayoutOptionData(ExpansionAwareLayoutOptionData original) { * the property value type * @param property * the particular layout option, e.g. one of - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions LayoutOptions} + * {@link org.eclipse.elk.core.options.CoreOptions CoreOptions} * @param collapsedValue * the value in case node is collapsed * @param expandedValue diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/Iterables2.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/Iterables2.java index 36e83786f..c9c526398 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/Iterables2.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/Iterables2.java @@ -33,9 +33,6 @@ * {@link com.google.common.collect.Iterables Iterables}. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class Iterables2 { @@ -82,8 +79,7 @@ public Iterator iterator() { /** * Returns an {@link Iterable} containing only {@code value}.
- * This is a counterpart to {@link link - * com.google.common.collect.Iterators#singletonIterator(Object) + * This is a counterpart to {@link com.google.common.collect.Iterators#singletonIterator(Object) * Iterators#singletonIterator(Object)}.
* In case {@code value} is {@code null} an empty {@link Iterable} is returned. * @@ -271,7 +267,7 @@ public String toString() { /** * Performs a fold operation on the elements of the provided {@link Iterable} by applying - * the provided {@link Function Function, R>} onto each element. + * the provided {@link Function Function<Pair<R, E>, R>} onto each element. * * @param * type of {@code iterable}'s elements diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdPredicates.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdPredicates.java index 4f7cbee16..b4adfd529 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdPredicates.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdPredicates.java @@ -43,8 +43,6 @@ * To be continued :-) * * @author chsch - * - * @kieler.design proposed by chsch */ public final class KlighdPredicates { @@ -204,7 +202,7 @@ public boolean apply(final KRendering rendering) { * tagged as the collapsed state rendering definition. * * @return a static predicate testing the provided {@link KRendering} for a collapsed - * state tag. + * state tag. */ public static Predicate isCollapsedRendering() { return IS_COLLAPSED_RENDERING; @@ -225,7 +223,7 @@ public boolean apply(final KRendering rendering) { * tagged as the expanded state rendering definition. * * @return a static predicate testing the provided {@link KRendering} for a expanded - * state tag. + * state tag. */ public static Predicate isExpandedRendering() { return IS_EXPANDED_RENDERING; @@ -244,7 +242,7 @@ public static Predicate isExpandedRendering() { * This predicate returns false if no markers are available. * * @return a static predicate testing the provided {@link KRendering} for a collapsed or - * expanded state tag. + * expanded state tag. */ public static Predicate isCollapsedOrExpandedRendering() { return IS_COLLAPSED_OR_EXPANDED_RENDERING; @@ -280,7 +278,7 @@ public static Predicate notInstanceOf(final Class clazz) { /** * Creates new compound {@link Predicates#instanceOf(Class)} predicates testing for several * classes. {@link Predicate#apply(Object) apply(Object)} of this predicate returns - * if the input is instance of one of the provided classes or interfaces. + * true if the input is instance of one of the provided classes or interfaces. * * @param classes * the classes/interface to be 'instanceof' checked @@ -293,7 +291,7 @@ public static Predicate instanceOf(final Class... classes) { /** * Creates new compound {@link Predicates#instanceOf(Class)} predicates testing for several * classes. {@link Predicate#apply(Object) apply(Object)} of this predicate returns - * if the input is instance of one of the provided classes or interfaces. + * true if the input is instance of one of the provided classes or interfaces. * * @param classes * the classes/interface to be 'instanceof' checked @@ -321,7 +319,7 @@ public Predicate apply(final Class clazz) { /** * Creates new compound {@link Predicate Predicates} testing {@link EClass#isInstance(Object)} * for several classes. {@link Predicate#apply(Object) apply(Object)} of this - * predicate returns if the input is instance of one of the provided classes or + * predicate returns true if the input is instance of one of the provided classes or * interfaces. * * @param classes @@ -335,7 +333,7 @@ public static Predicate eInstanceOf(final EClass... classes) { /** * Creates new compound {@link Predicate Predicates} testing {@link EClass#isInstance(Object)} * for several classes. {@link Predicate#apply(Object) apply(Object)} of this - * predicate returns if the input is instance of one of the provided classes or + * predicate returns true if the input is instance of one of the provided classes or * interfaces. * * @param classes diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 09e56a876..480602525 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -32,13 +32,11 @@ import de.cau.cs.kieler.klighd.microlayout.Bounds; /** - * A collection of KLighD-specific {@link de.cau.cs.kieler.klighd.properties.IProperty IProperties} + * A collection of KLighD-specific {@link IProperty IProperties} * that may be used while interacting with KLighD, e.g. in custom diagram synthesis or action * implementations. * * @author chsch - * - * @kieler.design proposed by chsch */ public final class KlighdProperties { @@ -51,20 +49,18 @@ private KlighdProperties() { /** * Property to determine the minimal size of a node that has to hold for the node's whole * "life time".
- * The {@link de.cau.cs.kieler.kiml.options.LayoutOptions#MIN_WIDTH LayoutOptions#MIN_WIDTH}/ - * {@link de.cau.cs.kieler.kiml.options.LayoutOptions#MIN_HEIGHT LayoutOptions#MIN_HEIGHT} - * properties are not sufficient as they have to be modified for hierarchical diagrams before + * The {@link org.eclipse.elk.core.options.CoreOptions#NODE_SIZE_MINIMUM CoreOptions#NODE_SIZE_MINIMUM} + * property is not sufficient as it has to be modified for hierarchical diagrams before * each automatic layout run.
*
* Caution: This property has been defined in - * {@link de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions KNodeExtensions}, too, in + * {@code de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions}, too, in * order to enable the independence of both bundles. This is possible as {@link IProperty * IProperties} are determined to be equal or unequal based on their id's.
*
* Besides, it is registered as a layout option in plugin.xml in order to get values of * persisted diagrams loaded properly, see - * {@link de.cau.cs.kieler.kiml.util.KimlUtil#loadDataElements(de.cau.cs.kieler.klighd.kgraph.KNode) - * KimlUtil#loadDataElements(de.cau.cs.kieler.klighd.kgraph.KNode)}. + * {@link de.cau.cs.kieler.klighd.kgraph.util.KGraphDataUtil#loadDataElements(KNode, IProperty...)}. */ public static final IProperty MINIMAL_NODE_SIZE = new Property( "de.cau.cs.kieler.klighd.minimalNodeSize", new KVector( @@ -73,7 +69,7 @@ private KlighdProperties() { /** * Property to be attached to root {@link de.cau.cs.kieler.klighd.krendering.KRendering - * KRendering} objects of {@link de.cau.cs.kieler.klighd.kgraph.KNode KNodes} during the view + * KRendering} objects of {@link KNode KNodes} during the view * synthesis process indicating that the {@link de.cau.cs.kieler.klighd.krendering.KRendering * KRendering} is to be shown in the collapsed state of the node. */ @@ -82,7 +78,7 @@ private KlighdProperties() { /** * Property to be attached to root {@link de.cau.cs.kieler.klighd.krendering.KRendering - * KRendering} objects of {@link de.cau.cs.kieler.klighd.kgraph.KNode KNodes} during the view + * KRendering} objects of {@link KNode KNodes} during the view * synthesis process indicating that the {@link de.cau.cs.kieler.klighd.krendering.KRendering * KRendering} is to be shown in the expanded state of the node. */ @@ -210,7 +206,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the lower visibility bound of a certain * {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering} wrt. the diagram scale/zoom. - * If the diagram is shown in strictly lower scale (<) than the determined value the + * If the diagram is shown in strictly lower scale (<) than the determined value the * corresponding diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_SCALE_LOWER_BOUND = new Property( @@ -220,7 +216,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the upper visibility bound in terms of an absolute height value of a * certain {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering}. If the diagram is shown in a - * zoom scale leading to a height equal or higher (>=) than the determined value, the + * zoom scale leading to a height equal or higher (>=) than the determined value, the * corresponding diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_HEIGHT_UPPER_BOUND = new Property( @@ -230,7 +226,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the lower visibility bound in terms of an absolute height value of a * certain {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering}. If the diagram is shown in a - * zoom scale leading to a strictly lower height (<) than the determined value, the + * zoom scale leading to a strictly lower height (<) than the determined value, the * corresponding diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_HEIGHT_LOWER_BOUND = new Property( @@ -240,7 +236,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the upper visibility bound in terms of an absolute width value of a * certain {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering}. If the diagram is shown in a - * zoom scale leading to a width equal or higher (>=) than the determined value, the + * zoom scale leading to a width equal or higher (>=) than the determined value, the * corresponding diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_WIDTH_UPPER_BOUND = new Property( @@ -250,7 +246,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the lower visibility bound in terms of an absolute width value of a * certain {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering}. If the diagram is shown in a - * zoom scale leading to a strictly lower width (<) than the determined value, the corresponding + * zoom scale leading to a strictly lower width (<) than the determined value, the corresponding * diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_WIDTH_LOWER_BOUND = new Property( diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSemanticDiagramData.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSemanticDiagramData.java index f24fe421a..8b74007a0 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSemanticDiagramData.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSemanticDiagramData.java @@ -39,9 +39,6 @@ * * @author uru * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class KlighdSemanticDiagramData implements Iterable> { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSynthesisProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSynthesisProperties.java index 9964aa516..015037e21 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSynthesisProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdSynthesisProperties.java @@ -35,8 +35,6 @@ * To be continued ... :- * * @author chsch - * - * @kieler.design proposed by chsch */ public class KlighdSynthesisProperties extends MapPropertyHolder { @@ -208,7 +206,7 @@ public KlighdSynthesisProperties setProperty(final IProperty prop * * @see IPropertyHolder#setProperty(IProperty, Object) * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties setProperty2(final IProperty property, final T value) { @@ -225,7 +223,7 @@ public KlighdSynthesisProperties setProperty2(final IProperty pro * the {@code id} of the desired * {@link de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis diagram * synthesis} - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties useDiagramSynthesis(final String id) { this.setProperty(REQUESTED_DIAGRAM_SYNTHESIS, id); @@ -239,7 +237,7 @@ public KlighdSynthesisProperties useDiagramSynthesis(final String id) { * @param id * the {@code id} of the desired {@link de.cau.cs.kieler.klighd.IUpdateStrategy * IUpdateStrategy} - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties useUpdateStrategy(final String id) { this.setProperty(REQUESTED_UPDATE_STRATEGY, id); @@ -249,7 +247,7 @@ public KlighdSynthesisProperties useUpdateStrategy(final String id) { /** * Configures a 'use simple update strategy' setting. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties useSimpleUpdateStrategy() { this.setProperty(REQUESTED_UPDATE_STRATEGY, SimpleUpdateStrategy.ID); @@ -263,7 +261,7 @@ public KlighdSynthesisProperties useSimpleUpdateStrategy() { * @param id * the {@code id} of the desired {@link de.cau.cs.kieler.klighd.IViewerProvider * IViewerProvider} - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties useViewer(final String id) { this.setProperty(REQUESTED_VIEWER_PROVIDER, id); @@ -273,7 +271,7 @@ public KlighdSynthesisProperties useViewer(final String id) { /** * Configures the diagram side bar in the diagram viewer to be initially opened. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties expandSideBar() { this.setProperty(REQUESTED_SIDE_BAR_HANDLING, SideBarHandling.EXPAND); @@ -283,7 +281,7 @@ public KlighdSynthesisProperties expandSideBar() { /** * Configures the diagram side bar in the diagram viewer to be initially collapsed. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties collapseSideBar() { this.setProperty(REQUESTED_SIDE_BAR_HANDLING, SideBarHandling.COLLAPSE); @@ -295,7 +293,7 @@ public KlighdSynthesisProperties collapseSideBar() { * and from diagram canvas if no side bar is available or side bar is collapsed). * By default the zoom config buttons are shown. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties hideDiagramZoomConfigButtons() { this.setProperty(REQUESTED_ZOOM_CONFIG_BUTTONS_HANDLING, ZoomConfigButtonsHandling.HIDE); @@ -305,7 +303,7 @@ public KlighdSynthesisProperties hideDiagramZoomConfigButtons() { /** * Configures the diagram viewer's support for selecting multiple diagram elements. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties suppressMultiSelection() { this.setProperty(MULTI_SELECTION, false); @@ -314,13 +312,13 @@ public KlighdSynthesisProperties suppressMultiSelection() { /** * Configures the diagram viewer to include ports when selecting connected edges. Connected - * edges refer to edges connected to the same port on different levels of nested nodes. + * edges refer to edges connected to the same port on different levels of nested nodes. * Usually such edges can be seen as a single logical connection that has been split, e.g., for * technical reasons. If set each connected {@link de.cau.cs.kieler.klighd.kgraph.KEdge KEdge} * "segment" and each {@link de.cau.cs.kieler.klighd.kgraph.KPort KPort} situated in between the * edges will be taken into selection, otherwise only the edges are taken. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties includePortsInConnectedEdgesSelections() { this.setProperty(INCLUDE_PORTS_IN_CONNECTED_EDGES_SELECTIONS, true); @@ -331,7 +329,7 @@ public KlighdSynthesisProperties includePortsInConnectedEdgesSelections() { * Configures the diagram viewer's support for automatically computing the minimal size of * diagram nodes (especially non-compound ones) and . * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties suppressNodeAndLabelSizeEstimation() { this.setProperty(SUPPRESS_SIZE_ESTIMATION, true); @@ -341,7 +339,7 @@ public KlighdSynthesisProperties suppressNodeAndLabelSizeEstimation() { /** * Configures whether the edge adjustment should be calculated or not. * - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties suppressEdgeAdjustment() { this.setProperty(SUPPRESS_EDGE_ADJUSTMENT, false); @@ -355,7 +353,7 @@ public KlighdSynthesisProperties suppressEdgeAdjustment() { * the singleton {@link SynthesisOption} object * @param value * the value to be configured for option - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties configureSynthesisOptionValue( final SynthesisOption option, final Object value) { @@ -374,7 +372,7 @@ public KlighdSynthesisProperties configureSynthesisOptionValue( * @param options * a {@link Map} of singleton {@link SynthesisOption} objects and their desired * values - * @return this {@link KlighdSynthesisProperties} object. + * @return this {@link KlighdSynthesisProperties} object. */ public KlighdSynthesisProperties configureSynthesisOptionValues( final Map options) { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/LimitedKGraphContentAdapter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/LimitedKGraphContentAdapter.java index da9273695..9b82ec368 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/LimitedKGraphContentAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/LimitedKGraphContentAdapter.java @@ -49,9 +49,6 @@ * children of the intended type if they are already present or added later on. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class LimitedKGraphContentAdapter extends EContentAdapter { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ModelingUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ModelingUtil.java index b5182f651..815dc3ffc 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ModelingUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/ModelingUtil.java @@ -31,9 +31,6 @@ * A collection of some modeling related convenience functions. * * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public final class ModelingUtil { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RenderingContextData.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RenderingContextData.java index 4b2d79d05..e269af06f 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RenderingContextData.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RenderingContextData.java @@ -32,9 +32,6 @@ * * @author mri * @author chsch (moved it here from klighd.piccolo to be referenced in layout and compare stuff) - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class RenderingContextData extends KGraphDataImpl { @@ -145,7 +142,7 @@ public boolean containsPoperty(final IProperty property) { * attached to {@code element}. As opposed to the default value of * {@link KlighdInternalProperties#ACTIVE} this predicate returns true in that * case. This is required in the - * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdLayoutManager KlighdLayoutManager} + * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdDiagramLayoutConnector KlighdDiagramLayoutConnector} * for applying layout to view models that are not shown by any viewer and whose * {@link KGraphElement KGraphElements} are not tagged to be 'active'. This may happen in batch * tests, for example. @@ -167,7 +164,7 @@ public boolean apply(final KGraphElement element) { * attached to {@code node}. As opposed to the default value of * {@link KlighdInternalProperties#POPULATED} this predicate returns true in that * case. This is required in the - * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdLayoutManager KlighdLayoutManager} + * {@link de.cau.cs.kieler.klighd.internal.macrolayout.KlighdDiagramLayoutConnector KlighdDiagramLayoutConnector} * for applying layout to view models that are not shown by any viewer and whose compound nodes * are not tagged to be 'populated'. This may happen in batch tests, for example. */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RunnableWithResult.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RunnableWithResult.java index c764578bf..4cc148f6d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RunnableWithResult.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/RunnableWithResult.java @@ -18,10 +18,8 @@ /** * Extension of {@link Runnable} that may be ask for a result, inspired by - * {@link org.eclipse.emf.transaction.RunnableWithResult}. + * {@code org.eclipse.emf.transaction.RunnableWithResult}. * - * @kieler.design 2014-04-17 reviewed by cds, chsch, tit, uru - * @kieler.rating 2012-11-02 proposed yellow cds * @param the type of the result * @author chsch */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/AbstractViewer.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/AbstractViewer.java index d2a7f78aa..db7e06b34 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/AbstractViewer.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/AbstractViewer.java @@ -53,9 +53,6 @@ * * @author mri * @author chsch - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public abstract class AbstractViewer implements IViewer { diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/ContextViewer.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/ContextViewer.java index 966a79446..f1eb247e3 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/ContextViewer.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/viewers/ContextViewer.java @@ -68,8 +68,8 @@ /** * A viewer for instances of type {@code ViewContext}. It is instantiated by - * {@link de.cau.cs.kieler.klighd.views.DiagramViewPart DiagramViewPart} and - * {@link de.cau.cs.kieler.klighd.views.DiagramEditorPart DiagramEditorPart}.
+ * {@code de.cau.cs.kieler.klighd.ui.parts.DiagramViewPart} and + * {@code de.cau.cs.kieler.klighd.ui.parts.DiagramEditorPart}.
*
* This class acts as a wrapper for the viewer supplied by the current view context. The method * {@code getControl} returns the control of that viewer, all other methods are delegated to the @@ -88,9 +88,6 @@ * @author mri * @author chsch * @author msp - * - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch */ public class ContextViewer implements IViewer, ILayoutRecorder, ISelectionProvider, IDiagramOutlinePage.Provider { diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipGlobalPortLabelVisiblityConfigTest.java b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipGlobalPortLabelVisiblityConfigTest.java index edda28afb..6aea78f73 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipGlobalPortLabelVisiblityConfigTest.java +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipGlobalPortLabelVisiblityConfigTest.java @@ -75,7 +75,7 @@ *
* This test is configured to be executed by the {@link Parameterized} test * {@link org.junit.runners.Suite Suite}. {@link #getParameters()} is called first prepares a list - * of diagram nodes to clip the diagram to. Subsequently, {@link #prepareStatic()} is called that + * of diagram nodes to clip the diagram to. Subsequently, {@link #prepare()} is called that * initializes a diagram view consisting of a simple {@link Shell}, attaches {@link IViewer * IViewers}, and creates diagram of circuit diagram {@link #testModel} (which already is a KGraph).
*
@@ -197,7 +197,7 @@ private static Object[] clip(KNode node, EnumSet instructions, Enu /** * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming - * infrastructure initialized with the model provided by {@link #loadTestModel()}. + * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}. */ @BeforeClass public static void prepare() { diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipPortLabelVisibilityTest.java b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipPortLabelVisibilityTest.java index 05d2084f1..6c2a25f62 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipPortLabelVisibilityTest.java +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipPortLabelVisibilityTest.java @@ -74,7 +74,7 @@ *
* This test is configured to be executed by the {@link Parameterized} test * {@link org.junit.runners.Suite Suite}. {@link #getParameters()} is called first prepares a list - * of diagram nodes to clip the diagram to. Subsequently, {@link #prepareStatic()} is called that + * of diagram nodes to clip the diagram to. Subsequently, {@link #prepare()} is called that * initializes a diagram view consisting of a simple {@link Shell}, attaches {@link IViewer * IViewers}, and creates diagram of circuit diagram {@link #testModel} (which already is a KGraph).
*
@@ -200,7 +200,7 @@ private static Object[] clip(KNode node, EnumSet instructions, Enu /** * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming - * infrastructure initialized with the model provided by {@link #loadTestModel()}. + * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}. */ @BeforeClass public static void prepare() { diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipTest.java b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipTest.java index 76ff082b6..e18909ecb 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipTest.java +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramClipTest.java @@ -129,7 +129,7 @@ public static void prepareStatic() { /** * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming - * infrastructure initialized with the model provided by {@link #loadTestModel()}. + * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}. */ public void prepare() { shell = new Shell(Display.getDefault()); diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramZoomControllerBoundsComputerTest.java b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramZoomControllerBoundsComputerTest.java index 3d944ff88..4fb68707c 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramZoomControllerBoundsComputerTest.java +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/DiagramZoomControllerBoundsComputerTest.java @@ -161,7 +161,7 @@ public static void prepareStatic() { /** * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming - * infrastructure initialized with the model provided by {@link #loadTestModel()}. + * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}. */ public void prepare() { shell = new Shell(Display.getDefault()); diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/RenderingTest.java b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/RenderingTest.java index 75af78839..3b2c7a6d6 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/RenderingTest.java +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/RenderingTest.java @@ -101,9 +101,6 @@ public RenderingTest(final KNode input) { /** * Some initialization to insert input KGraph into some Klighd structures. - * - * @param n - * KNode representing the input KGraph */ @Before public void initialize() { diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ModelingUtilTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ModelingUtilTest.java index d26dcb1f3..a2bcfb37d 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ModelingUtilTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ModelingUtilTest.java @@ -384,7 +384,7 @@ public static class IsIteratorWithSize extends FeatureMatchersize * argument. - *

+ *
* For example: * * 

diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SizeEstimationTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SizeEstimationTest.java
index 460492174..9d7c6c9ca 100644
--- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SizeEstimationTest.java
+++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/SizeEstimationTest.java
@@ -54,13 +54,13 @@
 
 /**
  * Tests the node size estimation calculations in {@link PlacementUtil}. It does so by requiring the
- * properties {@link de.cau.cs.kieler.klighd.KlighdConstants#KLIGHD_TESTING_HEIGHT
- * KLIGHD_TESTING_HEIGHT} and {@link de.cau.cs.kieler.klighd.KlighdConstants#KLIGHD_TESTING_WIDTH
+ * properties {@link de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties#KLIGHD_TESTING_HEIGHT
+ * KLIGHD_TESTING_HEIGHT} and {@link de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties#KLIGHD_TESTING_WIDTH
  * KLIGHD_TESTING_WIDTH} given for each {@link KText} occurring in a {@link KNode KNode's}
  * rendering, and by requiring
- * {@link de.cau.cs.kieler.klighd.KlighdConstants#KLIGHD_TESTING_EXPECTED_HEIGHT
+ * {@link de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties#KLIGHD_TESTING_EXPECTED_HEIGHT
  * KLIGHD_TESTING_EXPECTED_HEIGHT} and
- * {@link de.cau.cs.kieler.klighd.KlighdConstants#KLIGHD_TESTING_EXPECTED_WIDTH
+ * {@link de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties#KLIGHD_TESTING_EXPECTED_WIDTH
  * KLIGHD_TESTING_EXPECTED_WIDTH} attached to the {@link KShapeLayout} of the {@link KNode}.
  * 
  * While the first implemented test ({@link #sizeDataPresentTest(KNode)}) acts as a precondition
diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationSuppressionTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationSuppressionTest.java
index 94e1740f5..bac718844 100644
--- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationSuppressionTest.java
+++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationSuppressionTest.java
@@ -59,7 +59,7 @@
 
 /**
  * Tests KLighD's view change notification mechanism, especially
- * {@link ViewChange#visibleDiagramNodes()} & {@link ViewChange#visibleDiagramsElements()}.
+ * {@link ViewChange#visibleDiagramNodes()} and {@link ViewChange#visibleDiagramElements()}.
  *
  * @author chsch
  */
@@ -87,7 +87,7 @@ public static void lookForElkLayered() {
 
     /**
      * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming
-     * infrastructure initialized with the model provided by {@link #loadTestModel()}.
+     * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}.
      */
     @Before
     public void prepare() {
diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java
index 4a90b7fa5..4e75b80d6 100644
--- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java
+++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewChangedNotificationTest.java
@@ -55,7 +55,7 @@
 
 /**
  * Tests KLighD's view change notification mechanism, especially
- * {@link ViewChange#visibleDiagramNodes()} & {@link ViewChange#visibleDiagramsElements()}.
+ * {@link ViewChange#visibleDiagramNodes()} and {@link ViewChange#visibleDiagramElements()}.
  *
  * @author chsch
  */
@@ -81,7 +81,7 @@ public static void lookForElkLayered() {
 
     /**
      * Prepares the test: creates a fresh {@link Shell} and attaches KLighD's diagramming
-     * infrastructure initialized with the model provided by {@link #loadTestModel()}.
+     * infrastructure initialized with the model provided by {@link KlighdTestPlugin#loadTestModel()}.
      */
     @Before
     public void prepare() {
diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/runners/ModelCollectionTestRunner.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/runners/ModelCollectionTestRunner.java
index 3ea97b0fe..0a961f84e 100644
--- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/runners/ModelCollectionTestRunner.java
+++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/runners/ModelCollectionTestRunner.java
@@ -94,7 +94,7 @@
  * 

  * 
  * 
Note furthermore, that the values of the provided model paths may end with /** or
- * /**/... in order to instruct the model gathering to descent into sub folders.

+ * /**/... in order to instruct the model gathering to descent into sub folders.

  * 
  * 
The test classes may have a constructor with zero or one argument(s) of type {@link Object} or
  * {@link EObject} in order to inject the model into the test. The same holds for the test methods
@@ -104,7 +104,7 @@
  * 
  * 
If the test incorporates before or after methods annotated with
  * {@link org.junit.Before @Before} or {@link org.junit.After @After}, the constructor based "model
- * injection" is required. (Evaluation and invocation of before & after methods could be customized as
+ * injection" is required. (Evaluation and invocation of before and after methods could be customized as
  * well; the corresponding methods in {@link Suite}, however, are marked deprecated, and I considered
  * overriding them not a good idea.) 
  * 
@@ -122,7 +122,7 @@
  * public class Test {
  * 
  *     @Models
- *     public static Iterable getModels() {
+ *     public static Iterable<?> getModels() {
  *         List<Object> models = Lists.newLinkedList();
  *         return models;
  *     }
@@ -232,9 +232,6 @@
  *
* * @author chsch - * @kieler.design proposed by chsch - * @kieler.rating proposed yellow by chsch - * */ public class ModelCollectionTestRunner extends Suite { @@ -340,8 +337,7 @@ public class ModelCollectionTestRunner extends Suite { public ModelCollectionTestRunner(final Class clazz) throws Throwable { super(clazz, Collections.emptyList()); - // make sure kiml.service is loaded - //KimlServicePlugin.getDefault(); + // make sure elk.core.service is loaded ElkServicePlugin.getInstance(); // try to obtain the test models by means of a method annotated with 'Models' From a0dc972fc8bc9575cac2dc1c4df6b60f0274c150 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Tue, 6 Jun 2023 14:07:39 +0200 Subject: [PATCH 57/76] build: more touches for first release: updated KIELER gpg key, changed doc for distribution management to use Maven central on a local publish, depend on released swt-mock and Piccolo2D artifacts. --- pom.xml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 8faf5c2ff..b3a840ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 3.27.0 0.15.0 0.9.0 - 0.1.0-SNAPSHOT + 0.1.0 3.121.0 2.7.3 3.126.0 @@ -170,11 +170,9 @@ sign - + - 0x22B04AC3 - - + 0x22228C2E @@ -184,19 +182,6 @@ - - - - - - - + *

diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLibraryExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLibraryExtensions.xtend index e31a95b43..3a90f2eb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLibraryExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KLibraryExtensions.xtend @@ -100,7 +100,7 @@ class KLibraryExtensions { * * @example * edge.source.library.addToLibrary("ren_junction", - * createKRoundedRectangle => [ rr | + * createKRoundedRectangle => [ rr | * rr.background = color * rr.foreground = color * rr.cornerWidth = 2 @@ -128,7 +128,7 @@ class KLibraryExtensions { * * @example * edge.source.addToLibrary("ren_junction", - * createKRoundedRectangle => [ rr | + * createKRoundedRectangle => [ rr | * rr.background = color * rr.foreground = color * rr.cornerWidth = 2 diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KRenderingExtensions.xtend b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KRenderingExtensions.xtend index fb0de13de..0d14ec442 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KRenderingExtensions.xtend +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KRenderingExtensions.xtend @@ -174,7 +174,7 @@ class KRenderingExtensions { /** * Adds a rectangle to the node. * @example - * node.addRectangle => [ + * node.addRectangle => [ * it.background = "green".color * ] * @@ -1505,7 +1505,7 @@ class KRenderingExtensions { * Adds a grid placement to the rendering element with the specified spacing. * * @example - * rectangle.setGridPlacementData => [ cell | + * rectangle.setGridPlacementData => [ cell | * cell.from(LEFT, padding, 0, TOP, padding - 2, 0).to(RIGHT, padding, 0, BOTTOM, 0, 0) * cell.minCellHeight = propBarHeight * cell.flexibleHeight = false diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java index a99b23e5b..2112f7294 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java +++ b/plugins/de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KColoring.java @@ -455,7 +455,7 @@ public interface KColoring> extends KStyle { * * * Convenience setter for configuring the color gradient angle of this KColoring instance.
- * Simply redirects to {@link #setGradientAngle(int)} and returns this KColoring instance instead of void. + * Simply redirects to {@link #setGradientAngle(float)} and returns this KColoring instance instead of void. * @param angle the desired gradient angle in degrees. * * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='@SuppressWarnings(\"unchecked\")\nfinal T it = (T) this;\nthis.setGradientAngle(angle);\nreturn it;'" diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend index cc9b0c7b7..9755d54f2 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend @@ -106,7 +106,7 @@ class KGraphDiagramUpdater extends DiagramUpdater { } /** - * Updates the layout for the diagramServer, see {@see #updateLayout(KGraphDiagramServer)}. + * Updates the layout for the diagramServer, see {@link #updateLayout(KGraphDiagramServer)}. * Does this later as a completable future. * * @param diagramServer The diagram server that should update its layout. diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/FadeNodeInActivity.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/FadeNodeInActivity.java index d306b16c2..aa754ad19 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/FadeNodeInActivity.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/activities/FadeNodeInActivity.java @@ -51,7 +51,7 @@ public class FadeNodeInActivity extends PInterpolatingActivity implements IStart * bounds (and the scale factor didn't change); that is required if node * is set invisible while re-adding to the diagram (see * {@link de.cau.cs.kieler.klighd.piccolo.internal.controller.DiagramController#addNode( - * de.cau.cs.kieler.klighd.piccolo.internal.nodes.INode, + * de.cau.cs.kieler.klighd.piccolo.internal.nodes.KNodeAbstractNode, * de.cau.cs.kieler.klighd.kgraph.KNode, boolean) DiagramController#addNode(...)}), * e.g. after expanding the corresponding parent * {@link de.cau.cs.kieler.klighd.piccolo.internal.nodes.KChildAreaNode diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java index 3d448e783..07f121a05 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/DiagramController.java @@ -296,7 +296,7 @@ public boolean isRecording() { * Starts to record layout changes in the model instead of instantly applying them to the * visualization.
*
- * Executing {@link #stopRecording(ZoomStyle, KNode, int)} applies all recorded layout changes. + * Executing {@link #stopRecording(ZoomStyle, KGraphElement, int)} applies all recorded layout changes. * * @see de.cau.cs.kieler.klighd.internal.ILayoutRecorder#startRecording() * ILayoutRecorder#startRecording() @@ -314,8 +314,8 @@ record = true; * @param animationTime * duration of the animated layout * - * @see de.cau.cs.kieler.klighd.internal.ILayoutRecorder#stopRecording(ZoomStyle, KNode, int) - * ILayoutRecorder#stopRecording(ZoomStyle, KNode, int) + * @see de.cau.cs.kieler.klighd.internal.ILayoutRecorder#stopRecording(ZoomStyle, KGraphElement, int) + * ILayoutRecorder#stopRecording(ZoomStyle, KGraphElement, int) */ public void stopRecording(final ZoomStyle zoomStyle, final KGraphElement focusElement, final int animationTime) { stopRecording(zoomStyle, focusElement, null, animationTime); @@ -333,8 +333,8 @@ public void stopRecording(final ZoomStyle zoomStyle, final KGraphElement focusEl * @param animationTime * duration of the animated layout * - * @see de.cau.cs.kieler.klighd.internal.ILayoutRecorder#stopRecording(ZoomStyle, KNode, int) - * ILayoutRecorder#stopRecording(ZoomStyle, KNode, int) + * @see de.cau.cs.kieler.klighd.internal.ILayoutRecorder#stopRecording(ZoomStyle, KGraphElement, int) + * ILayoutRecorder#stopRecording(ZoomStyle, KGraphElement, int) */ public void stopRecording(final ZoomStyle zoomStyle, final KGraphElement focusElement, final KVector previousPosition, final int animationTime) { diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java index 226d5f6f9..b1ef489dc 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/PNodeController.java @@ -43,8 +43,8 @@ import edu.umd.cs.piccolo.PNode; /** - * The abstract base class for Piccolo node controllers.
- *
+ * The abstract base class for Piccolo node controllers.
+ *
* A node controller is a facade on a specific Piccolo node, providing a generic interface to set * the bounds and other parameters of the node. * diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdActionEventHandler.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdActionEventHandler.java index 69c9ccbba..70108c8b3 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdActionEventHandler.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/events/KlighdActionEventHandler.java @@ -353,7 +353,7 @@ public Point getDisplayRelativeMousePos() { /** * A dedicated exception indicating an illegal result of a method.
- * It is currently thrown if implementations of {@link IAction#execute(ActionContext)} returns + * It is currently thrown if implementations of {@link IAction#execute(IAction.ActionContext)} returns * null. * * @author chsch diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloViewer.java b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloViewer.java index 7a90219f0..969bf8b56 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloViewer.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/viewer/PiccoloViewer.java @@ -376,7 +376,7 @@ public void stopRecording(final ZoomStyle zoomStyle, final KGraphElement focusEl * Convenience method simplifying the notification call. * * @see #notifyViewChangeListeners(ViewChangeType, KGraphElement, java.awt.geom.Rectangle2D, - * float) + * double) * * @param type * the corresponding {@link ViewChangeType} diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/SynthesizingAction.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/SynthesizingAction.java index b1a1621a1..a3df3e6e2 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/SynthesizingAction.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/actions/SynthesizingAction.java @@ -39,7 +39,7 @@ * override execute(ActionContext context) { * val clickedRendering = context.KRendering as KContainerRendering * - * clickedRendering.addEllipse => [background = 'green'.color] + * clickedRendering.addEllipse => [background = 'green'.color] * * return ActionResult.createResult(true) * } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java index de41f0e7d..38fe7e916 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/ILayoutRecorder.java @@ -38,7 +38,7 @@ public interface ILayoutRecorder { * Starts to record layout changes in the model instead of instantly applying them to the * visualization.
*
- * Executing {@link #stopRecording(ZoomStyle, KNode, int)} applies all recorded layout changes. + * Executing {@link #stopRecording(ZoomStyle, KGraphElement, int)} applies all recorded layout changes. */ void startRecording(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java index 207765013..934b33229 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/AnchorUtil.java @@ -33,7 +33,7 @@ /** *

* Utility class for anchor point calculation of edges. This class provides two public methods. The - * first, {@link #nearestBorderPoint(KVector, double, double, KRendering, float)}, takes a reference + * first, {@link #nearestBorderPoint(KVector, double, double, KRendering, double)}, takes a reference * point and returns the point on the figure's border that is nearest to that reference point. This * method is usually used to ensure that edges touch the border of nodes or ports they connect to. * The second, {@link #collideTowardsCenter(KVector, double, double, KRendering)}, calculates the diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java index 8a4a0e89b..e446eda77 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java @@ -45,7 +45,7 @@ /** * The abstract base class for KLighD diagram synthesis implementations.
*
- * Implementations of this class have to implement {@link #transform(S)} that performs the mapping + * Implementations of this class have to implement {@code #transform(S)} that performs the mapping * of the semantic/business objects into instances of the KGraph/KRendering view model format.
*
* Some hints for the use with Xtend (www.xtend-lang.org):
diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java index 389f8eb47..a3032a9aa 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/DiagramSyntheses.java @@ -843,7 +843,7 @@ public static T setTooltip(final T krendering, final Stri /** * Wraps the given rendering in a rendering displayed on selection and adds that to the given KGraph * element. The selection rendering is returned to be modified further and is the one obtained by - * calling {@link #wrapWithStandardNodeSelectionRendering(ren)}. + * calling {@link #wrapWithStandardNodeSelectionRendering(KRendering)}. * * @param kge the KGraph element the rendering should be added to. * @param ren the rendering to be wrapped. May be {@code null}, in which case no rendering is added diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 480602525..02c0d71fa 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -196,7 +196,7 @@ public static boolean isSelectable(final EObject viewElement) { * Property determining the upper visibility bound of a certain * {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElement} or * {@link de.cau.cs.kieler.klighd.krendering.KRendering KRendering} wrt. the diagram scale/zoom. - * If the diagram is shown in equal or higher scale (>=) than the determined value the + * If the diagram is shown in equal or higher scale (>=) than the determined value the * corresponding diagram or figure element is not visible anymore. */ public static final IProperty VISIBILITY_SCALE_UPPER_BOUND = new Property( From 1b1714d71b370352b7d554fa9574bc30c9da475b Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Tue, 6 Jun 2023 19:10:51 +0200 Subject: [PATCH 59/76] all: set versions on master to '2.3.1.qualifier' --- .../category.xml | 30 +++++++++---------- .../pom.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 4 +-- .../feature.xml | 2 +- .../de.cau.cs.kieler.klighd.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 4 +-- features/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.kgraph.text.ide/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.kgraph.text.ui/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.kgraph/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.lsp/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.piccolo/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.ui.emf/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.ui.view/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.ui.wizard/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd/pom.xml | 4 +-- plugins/pom.xml | 2 +- pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- test/de.cau.cs.kieler.klighd.test/pom.xml | 4 +-- test/pom.xml | 2 +- 61 files changed, 102 insertions(+), 102 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index 7a6c16389..ce72249af 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -11,10 +11,10 @@ - + - + @@ -25,43 +25,43 @@ --> - + - + - + - + - + - + - + - + - + - + - - - + + + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index c3748ca98..3c96be4a1 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -10,7 +10,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml b/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml index a1398f4a5..099422a6c 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml +++ b/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml @@ -10,7 +10,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml b/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml index b81a6978e..80769d408 100644 --- a/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml b/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml index 0bedb7f16..628041024 100644 --- a/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.draw2d.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.klighd.feature/feature.xml b/features/de.cau.cs.kieler.klighd.feature/feature.xml index 64dc214b1..ae57c2232 100644 --- a/features/de.cau.cs.kieler.klighd.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.feature/pom.xml b/features/de.cau.cs.kieler.klighd.feature/pom.xml index 76c0a876b..1a17d3c80 100644 --- a/features/de.cau.cs.kieler.klighd.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml b/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml index 111fed13b..2d968f29e 100644 --- a/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml b/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml index e1f10e415..dac9f9b4d 100644 --- a/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.freehep.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml b/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml index 065591dbf..6c8b8e1fb 100644 --- a/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml b/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml index a29092e53..47d8b48ce 100644 --- a/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ide.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml b/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml index df4237809..900cf8856 100644 --- a/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml b/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml index b785b81bf..2d9fdc1bf 100644 --- a/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.sdk.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.klighd.view.feature/feature.xml b/features/de.cau.cs.kieler.klighd.view.feature/feature.xml index 4413a0970..f8dc8d7eb 100644 --- a/features/de.cau.cs.kieler.klighd.view.feature/feature.xml +++ b/features/de.cau.cs.kieler.klighd.view.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/de.cau.cs.kieler.klighd.view.feature/pom.xml b/features/de.cau.cs.kieler.klighd.view.feature/pom.xml index 6c98bd618..e35335f26 100644 --- a/features/de.cau.cs.kieler.klighd.view.feature/pom.xml +++ b/features/de.cau.cs.kieler.klighd.view.feature/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd features - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.view.feature - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-feature diff --git a/features/pom.xml b/features/pom.xml index efe0be71e..56e99b3a9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -9,7 +9,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF index 70f3ee94d..89f145d46 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER KGraph Text Ide Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ide -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.kgraph.text, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml index 144fd70ee..eccab3beb 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.kgraph.text.ide - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER KGraph Text Ide diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF index be26dc4fe..19cf491b9 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Textual KGraph Language UI Bundle-Vendor: Kiel University -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml index a6474d218..b9f5789c4 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.kgraph.text.ui - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Textual KGraph Language UI diff --git a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF index fd29d7870..48bb9cdd0 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Textual ELK KGraph Language Bundle-Vendor: Kiel University -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, diff --git a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml index 2e63efd3f..95678b8ce 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/pom.xml +++ b/plugins/de.cau.cs.kieler.kgraph.text/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.kgraph.text - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Textual KGraph Language diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index 2f3db016e..5dfed97ed 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Ide Components Bundle-SymbolicName: de.cau.cs.kieler.klighd.ide;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.ide Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, de.cau.cs.kieler.klighd.kgraph, diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml index a1dc8179b..6612f8570 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ide - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Ide Components diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF index 7d0b2cce8..4ffbed71e 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KlighD incremental update extension Bundle-SymbolicName: de.cau.cs.kieler.klighd.incremental;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.klighd, diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml index 33fbaf509..1e5bf7d01 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.incremental/pom.xml @@ -5,12 +5,12 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.incremental - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KlighD incremental update extension diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF index 875ce3f4c..c4aa8b08d 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Graph Model Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgraph;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: de.cau.cs.kieler.klighd.kgraph, diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml index 7384cf43b..5f3bed2b4 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.kgraph - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Graph Model diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF index e2e8dc398..d4cbf9620 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Xtend-based Extension Library Bundle-SymbolicName: de.cau.cs.kieler.klighd.krendering.extensions -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Activator: de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensionsPlugin Bundle-Vendor: Kiel University Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml index dea1bcd61..e9abc6ae6 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.krendering.extensions - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Xtend-based Extension Library diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF index 39dd2ef24..c707850ae 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KIELER Transient Diagram Format Definition Bundle-SymbolicName: de.cau.cs.kieler.klighd.krendering;singleton:=true Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml index d86f61582..342a7f3bd 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.krendering/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.krendering - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Transient Diagram Format Definition diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF index dd80b0673..c61328d68 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams as Language Server Bundle-SymbolicName: de.cau.cs.kieler.klighd.lsp;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.lsp, diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml index e19172042..01029cca8 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml @@ -5,7 +5,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF index 48f470179..b36cfcb69 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KLighD Piccolo Binding Extension Supporting Draw2d Figures Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.draw2d;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml index c687b625c..996a21695 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.piccolo.draw2d - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KLighD Piccolo Binding Extension Supporting Draw2d Figures diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF index a2852b671..7677b38ba 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Vector Graphics Export Powered by FreeHEP Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.freehep;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml index e77794435..7590954db 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.piccolo.freehep - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Vector Graphics Export Powered by FreeHEP diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF index 3ec543b15..9aeef5e0e 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Powered by Piccolo2D Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml b/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml index 7072ed8e9..5f3838361 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.piccolo - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Powered by Piccolo2D diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF index f2099ebc7..f3822bf83 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Standalone Setup Bundle-SymbolicName: de.cau.cs.kieler.klighd.standalone -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: KIELER Lightweight Diagrams (KLighD) Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.emf.ecore.xmi, diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml b/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml index 6bf328f7f..9b5d953c2 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.standalone/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.standalone - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams Standalone Setup diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF index 6a1f90332..f48b7252a 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KLighD-specific Eclipse 3x UI contributions Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.contrib3x;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml index 23a709c8a..e8a710641 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ui.contrib3x - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KLighD-specific Eclipse 3x UI contributions diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF index 4c8b6f188..380259f9c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KLighD Model Modification Extensions for EMF Domains Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.emf;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Fragment-Host: de.cau.cs.kieler.klighd.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.emf.transaction, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml index fd47b7ac4..cf5e4012e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ui.emf - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KLighD Model Modification Extensions for EMF Domains diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF index 5727fd077..fceca165a 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Diagram View Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.view;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.view Bundle-Activator: de.cau.cs.kieler.klighd.ui.view.KlighdViewPlugin Require-Bundle: org.eclipse.emf, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml index 0716f9242..5fb6d6705 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ui.view - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Diagram View diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF index 25b6a4a4a..45a32a9ab 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Plug-In Wizard for KLighD-Based Projects Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.wizard;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Activator: de.cau.cs.kieler.klighd.ui.wizard.KlighdWizardPlugin Require-Bundle: org.apache.log4j, org.eclipse.core.expressions, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml index 61d31ddb3..74fab9893 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ui.wizard - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Plug-In Wizard for KLighD-Based Projects diff --git a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF index 37bcbdf7f..36762da7f 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams UI Components Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Activator: de.cau.cs.kieler.klighd.ui.KlighdUIPlugin Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.resources;bundle-version="3.8.0", diff --git a/plugins/de.cau.cs.kieler.klighd.ui/pom.xml b/plugins/de.cau.cs.kieler.klighd.ui/pom.xml index 20c60de58..5de1dd2d4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui/pom.xml @@ -5,13 +5,13 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.ui - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams UI Components diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index 9995c36b2..2b072ffb9 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams (KLighD) Bundle-SymbolicName: de.cau.cs.kieler.klighd;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: de.cau.cs.kieler.klighd.kgraph, diff --git a/plugins/de.cau.cs.kieler.klighd/pom.xml b/plugins/de.cau.cs.kieler.klighd/pom.xml index 046c8845d..49723fb51 100644 --- a/plugins/de.cau.cs.kieler.klighd/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd/pom.xml @@ -5,7 +5,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT ../../pom.xml @@ -13,7 +13,7 @@ de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-plugin KIELER Lightweight Diagrams (KLighD) diff --git a/plugins/pom.xml b/plugins/pom.xml index 51e7be334..1a1fb1332 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -9,7 +9,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index b3a840ab6..5cd6928d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT pom @@ -288,7 +288,7 @@ de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.targetplatform - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF index 63330c7d5..20a66716d 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KLighD Piccolo2D Binding Tests Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.test;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.8.0", diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml index dbeb819f7..6e48ffc5a 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd test - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.piccolo.test - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-test-plugin src diff --git a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF index 0161d95b7..abf2acd1e 100644 --- a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KLighD Tests Bundle-SymbolicName: de.cau.cs.kieler.klighd.test;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, diff --git a/test/de.cau.cs.kieler.klighd.test/pom.xml b/test/de.cau.cs.kieler.klighd.test/pom.xml index eb938280e..05c1bd1f0 100644 --- a/test/de.cau.cs.kieler.klighd.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.test/pom.xml @@ -5,11 +5,11 @@ de.cau.cs.kieler.klighd test - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.test - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT eclipse-test-plugin diff --git a/test/pom.xml b/test/pom.xml index 9e7f0d2c5..f6d9769f9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -9,7 +9,7 @@ de.cau.cs.kieler.klighd parent - 2.2.1-SNAPSHOT + 2.3.1-SNAPSHOT From c212072c5168cde7415712b3c53a879920c7982b Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 23 Jun 2023 11:21:19 +0200 Subject: [PATCH 60/76] Add property to automatically set minimal paddings for rounded rectangles Signed-off-by: Max Kasperowski --- .../KlighdDiagramLayoutConnector.java | 20 ++++++++++++++++++- .../kieler/klighd/util/KlighdProperties.java | 7 +++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java index af30c2533..067b64b13 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java @@ -22,6 +22,7 @@ import java.util.Map.Entry; import java.util.Set; +import org.eclipse.elk.core.math.ElkPadding; import org.eclipse.elk.core.math.KVector; import org.eclipse.elk.core.options.CoreOptions; import org.eclipse.elk.core.service.IDiagramLayoutConnector; @@ -377,9 +378,26 @@ private void createNode(final LayoutMapping mapping, final KNode node, // KLighD is somewhat mean and doesn't care about existing insets node.setInsets(insets); - node.getProperty(CoreOptions.PADDING); // The Insets are used in {@link KlighdLayoutConfigurationStore} to retrieve the padding // of the node + + if (node.getProperty(KlighdProperties.ROUNDED_RECTANGLE_AUTOPADDING) != null) { + KVector radii = node.getProperty(KlighdProperties.ROUNDED_RECTANGLE_AUTOPADDING); + double padding = 0; + // x and y cannot be zero, if one of the two is zero use the larger value + if (radii.x < 0.00001 && radii.y >= 0.00001) { + radii.x = 0.00001; + } else if (radii.x >= 0.00001 && radii.y < 0.00001) { + radii.y = 0.00001; + } + if (!(radii.x < 0.00001 && radii.y < 0.00001)) { + // computes a padding x such that the corners of the inner rectangle fit exactly within the rounded rectangle + double numerator = radii.x * radii.y * (-Math.sqrt(2) * Math.sqrt(radii.x * radii.y) + radii.x + radii.y); + double denominator = radii.x * radii.x + radii.y * radii.y; + padding = numerator / denominator; + } + node.setProperty(CoreOptions.PADDING, new ElkPadding(padding)); + } layoutParent.getChildren().add(layoutNode); mapping.getGraphMap().put(layoutNode, node); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 02c0d71fa..4810a1720 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -375,4 +375,11 @@ public static boolean isSelectable(final EObject viewElement) { */ public static final IProperty IS_NODE_TITLE = new Property("klighd.isNodeTitle", false); + + /** + * Automatically computes the padding required to fit the content of a node within the bounds of a + * rounded rectangle. The x and y corner radii are specified as x and y of a KVector. + */ + public static final IProperty ROUNDED_RECTANGLE_AUTOPADDING = + new Property("klighd.roundedRectangle.autopadding", null); } From 157fe2b997d4495c3e15074b16a9e3b7b095177f Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 12 Jul 2023 15:15:21 +0200 Subject: [PATCH 61/76] build with Java17 --- .github/workflows/buildAndTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 4f8cc8f96..98a4b65de 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -25,7 +25,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 11 + java-version: 17 distribution: adopt - name: Cache Maven packages uses: actions/cache@v2 From 6ef6809a7d3f0c7c5e26e660700b6791c7621402 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 18 Jul 2023 08:55:21 +0200 Subject: [PATCH 62/76] remove magic numbers and update documentation Signed-off-by: Max Kasperowski --- .../macrolayout/KlighdDiagramLayoutConnector.java | 12 +++++++----- .../cau/cs/kieler/klighd/util/KlighdProperties.java | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java index 067b64b13..8a1577b00 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java @@ -384,13 +384,15 @@ private void createNode(final LayoutMapping mapping, final KNode node, if (node.getProperty(KlighdProperties.ROUNDED_RECTANGLE_AUTOPADDING) != null) { KVector radii = node.getProperty(KlighdProperties.ROUNDED_RECTANGLE_AUTOPADDING); double padding = 0; + // threshold to check for almost zero-ness + double EPSILON = 0.00001; // x and y cannot be zero, if one of the two is zero use the larger value - if (radii.x < 0.00001 && radii.y >= 0.00001) { - radii.x = 0.00001; - } else if (radii.x >= 0.00001 && radii.y < 0.00001) { - radii.y = 0.00001; + if (radii.x < EPSILON && radii.y >= EPSILON) { + radii.x = EPSILON; + } else if (radii.x >= EPSILON && radii.y < EPSILON) { + radii.y = EPSILON; } - if (!(radii.x < 0.00001 && radii.y < 0.00001)) { + if (!(radii.x < EPSILON && radii.y < EPSILON)) { // computes a padding x such that the corners of the inner rectangle fit exactly within the rounded rectangle double numerator = radii.x * radii.y * (-Math.sqrt(2) * Math.sqrt(radii.x * radii.y) + radii.x + radii.y); double denominator = radii.x * radii.x + radii.y * radii.y; diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java index 4810a1720..af50c7c8e 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java @@ -378,7 +378,9 @@ public static boolean isSelectable(final EObject viewElement) { /** * Automatically computes the padding required to fit the content of a node within the bounds of a - * rounded rectangle. The x and y corner radii are specified as x and y of a KVector. + * rounded rectangle. The x and y corner radii are specified as x and y of a KVector. If this property + * is set, the ElkPadding set on the graph will be overridden internally. This property should only be + * used if no padding is manually set on the graph element. */ public static final IProperty ROUNDED_RECTANGLE_AUTOPADDING = new Property("klighd.roundedRectangle.autopadding", null); From 580692824b8d56051804a80d41fdb35795a6c5da Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Mon, 31 Jul 2023 10:50:12 +0200 Subject: [PATCH 63/76] lsp: Remove javadoc link to internal piccolo stuff. --- .../de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 11eeac5db..c8a9420cd 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -178,7 +178,7 @@ final class RenderingPreparer { /** * Calculate the size and position of all child renderings recursively. The boundsMap and decorationMap again indicate * if is should be stored in them (not null) or in the rendering's properties themselves. - * Inspired by {@link de.cau.cs.kieler.klighd.piccolo.internal.controller.AbstractKGERenderingController}. + * Inspired by {@code de.cau.cs.kieler.klighd.piccolo.internal.controller.AbstractKGERenderingController}. * * @param renderings The child renderings to calculate the sizes and decorations for. * @param placement The defined placement of the child renderings. From 80cb6588af1729115dba25fde1c4e4a333ca6f0e Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Tue, 1 Aug 2023 11:56:21 +0200 Subject: [PATCH 64/76] klighd: "Fixed" broken ChildArea Placement See https://github.com/kieler/KLighD/commit/f613c1758bdc05c4461e4a2cc47dee0cb8556416 This line was removed thinking it was not needed in #165, but in fact it was needed. Reverting this to its working previous state. --- .../internal/macrolayout/KlighdDiagramLayoutConnector.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java index 8a1577b00..077b07c98 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java @@ -378,6 +378,10 @@ private void createNode(final LayoutMapping mapping, final KNode node, // KLighD is somewhat mean and doesn't care about existing insets node.setInsets(insets); + // This line should not be needed as it just sets the default paddings if none existed yet, and every use of + // this property needs to "get" it first, theoretically resulting in always setting the default values. + // But this still seems to be necessary to fix child area placement. See also f613c1758bdc05c4461e4a2cc47dee0cb8556416 + node.getProperty(CoreOptions.PADDING); // The Insets are used in {@link KlighdLayoutConfigurationStore} to retrieve the padding // of the node From 81803238efea618e4296cbd8fed1a79ba95b07a8 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 1 Sep 2023 09:18:54 +0200 Subject: [PATCH 65/76] update javadoc to fix errors --- .../klighd/filtering/IdentityConnective.java | 14 +++++--------- .../klighd/filtering/LessEqualsConnective.java | 4 ++-- .../klighd/filtering/LessThanConnective.java | 4 ++-- .../filtering/NumericAdditionConnective.java | 6 ++---- .../filtering/NumericDivisionConnective.java | 6 ++---- .../filtering/NumericMultiplicationConnective.java | 6 ++---- .../filtering/NumericSubtractionConnective.java | 6 ++---- .../filtering/parser/SemanticFilterRuleParser.java | 10 +++++----- 8 files changed, 22 insertions(+), 34 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java index a025602b6..fd9f88aaf 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -28,8 +28,7 @@ public class IdentityConnective extends UnaryConnective { /** * Constructor for unnamed rule. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand */ public IdentityConnective(SemanticFilterRule operand) { this(operand, null, null); @@ -37,8 +36,7 @@ public IdentityConnective(SemanticFilterRule operand) { /** * Constructor for unnamed rule with default value. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param defaultValue the default value */ public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue) { @@ -47,8 +45,7 @@ public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue) { /** * Constructor for named rule. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param ruleName rule name */ public IdentityConnective(SemanticFilterRule operand, String ruleName) { @@ -57,8 +54,7 @@ public IdentityConnective(SemanticFilterRule operand, String ruleName) { /** * Constructor for named rule with default value. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param defaultValue the default value * @param ruleName rule name */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java index fe16b303a..05f08e4bc 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -19,7 +19,7 @@ /** * A LessEquals Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R1 <= R2 + * {@code R1 <= R2} * * @author mka * diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 4f77983ee..55635aa45 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -19,7 +19,7 @@ /** * A LessThan Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R1 < R2 + * {@code R1 < R2} * @author tik, mka * */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java index 566e1c733..1f47d207c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericAdditionConnective extends BinaryConnective implements Numer protected static final String NAME = "NUMERICADDITION"; /** - * Constructor for named rule with default value. + * Constructor for numeric addition connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericAdditionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java index c7fb01c7d..5ce9218b7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericDivisionConnective extends BinaryConnective implements Numer protected static final String NAME = "NUMERICDIVISION"; /** - * Constructor for named rule with default value. + * Constructor for numeric division connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericDivisionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java index 38bdbb88c..b44f106c0 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericMultiplicationConnective extends BinaryConnective implements protected static final String NAME = "NUMERICMULTIPLICATION"; /** - * Constructor for named rule with default value. + * Constructor for numeric multiplication connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericMultiplicationConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java index 6b93635ee..55b383be5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericSubtractionConnective extends BinaryConnective implements Nu protected static final String NAME = "NUMERICSUBSTRACTION"; /** - * Constructor for named rule with default value. + * Constructor for numeric subtraction connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericSubtractionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index 2de6bdf99..4d94077d9 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -48,13 +48,13 @@ /** * Provides a parser for the semantic filter language. The syntax is of the form - * for all binary operators. The most basic rule is a tag - * # that evaluates to true if an element has that tag and false otherwise. - * Tags may also contain numeric values in which case they are written as $. + * <rule> <operator> <rule> for all binary operators. The most basic rule is a tag + * #<tag> that evaluates to true if an element has that tag and false otherwise. + * Tags may also contain numeric values in which case they are written as $<tag>. * Constant values can be expressed as true, false or a number. Brackets may be used * to override precedences. The full list of available operators is given in the table * below. - * + * 

{@code
  * | Operator       |  Syntax                |  Input          | Output  | Precedence |
  * |----------------|------------------------|-----------------|---------|------------|
  * | And            | \ && \   | boolean         | boolean | 4          |
@@ -70,7 +70,7 @@
  * | LessThan       | \ < \    | numeric         | boolean | 8          |
  * | Equals         | \ = \    | numeric/boolean | boolean | 7          |
  * | NotEqual       | \ != \   | numeric/boolean | boolean | 7          |
-
+ * }
* @author mka * */ From dc6a768fdf36242598d48590cd4ae0c6e4fd080a Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 1 Sep 2023 11:59:20 +0200 Subject: [PATCH 66/76] fixed JavaDoc reference to restricted code and cast issue arising with new Java in piccolo. --- .../de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend | 2 +- .../cs/kieler/klighd/piccolo/draw2d/Draw2DConnectionNode.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index c8a9420cd..9a5024e2d 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -466,7 +466,7 @@ final class RenderingPreparer { static val StyleModificationContext singletonModContext = new StyleModificationContext(); /** - * @see de.cau.cs.kieler.klighd.piccolo.internal.controller.AbstractKGERenderingController#processModifiableStyles + * See {@code de.cau.cs.kieler.klighd.piccolo.internal.controller.AbstractKGERenderingController#processModifiableStyles} */ private static def void processModifiableStyles(KRendering rendering, KGraphElement parent) { val styles = if (rendering instanceof KRenderingRef) diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DConnectionNode.java b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DConnectionNode.java index 5620a9e60..4572acf93 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DConnectionNode.java +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/src/de/cau/cs/kieler/klighd/piccolo/draw2d/Draw2DConnectionNode.java @@ -79,7 +79,7 @@ public Draw2DConnectionNode(final Connection theFigure) { public void setPoints(final PointList pts) { @SuppressWarnings("unchecked") final - List children = this.getChildren(); + List children = (List) this.getChildren(); for (final Connection child : Iterables.filter(children, Connection.class)) { child.setPoints(pts); } From 4445b8dccf99f90e7a0ceddf65840dca8b516865 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Mon, 4 Sep 2023 14:14:55 +0200 Subject: [PATCH 67/76] build: ignore most tycho plugin goals in m2e as Eclipse should build the tycho plugins on its own and not with m2e. --- pom.xml | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/pom.xml b/pom.xml index 5cd6928d7..3d7756eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -535,6 +535,77 @@ + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + compile + testCompile + validate-classpath + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.0.0,) + + clean + + + + + + + + + org.eclipse.tycho + target-platform-configuration + [2.7.3,) + + target-platform + + + + + + + + + + From f758969ec79df52f7760a079a65da8309245ad28 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 8 Sep 2023 10:59:00 +0200 Subject: [PATCH 68/76] fix handling of edges by incremental update (#171) * fix handling of edges by incremental update * incremental: fixed wrong handling of new/old nodes in edges. Added a more complex test for the incremental update with multiple new elements. Something is off with the ID generation, possibly causing further issues (see the test and the FIXME in the KGraphMerger), but solution still seems to work for the previous issue for now. * incremental: fixes some issues arising when adding more complex structures. This includes nodes that are added together with edges and ports, which previously could cause issues. Also fixes elements without own IDs being inserted e.g. in the beginning of lists to not get updated correctly. --------- Co-authored-by: Niklas Rentz --- .../klighd/incremental/diff/KComparison.java | 29 +++ .../incremental/merge/KGraphMerger.java | 182 ++++++++++++------ .../klighd/incremental/util/UIDAdapter.java | 85 +++++--- .../klighd/incremental/util/UIDAdapters.java | 2 +- .../klighd/test/IncrementalUpdateTest.java | 117 ++++++++++- 5 files changed, 320 insertions(+), 95 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java index 08ea83d2c..3bdd57e32 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/diff/KComparison.java @@ -38,6 +38,7 @@ public class KComparison { private UIDAdapter baseAdapter; private UIDAdapter newAdapter; private MapDifference nodeDifference; + private MapDifference edgeDifference; /** * Create new comparison. @@ -51,6 +52,7 @@ public KComparison(final UIDAdapter baseAdapter, final UIDAdapter newAdapter) { this.baseAdapter = baseAdapter; this.newAdapter = newAdapter; nodeDifference = Maps.difference(baseAdapter.getNodeMap(), newAdapter.getNodeMap()); + edgeDifference = Maps.difference(baseAdapter.getEdgeMap(), newAdapter.getEdgeMap()); } /** @@ -185,5 +187,32 @@ public Collection getRemovedNodes() { public Collection> getMatchedNodes() { return nodeDifference.entriesDiffering().values(); } + + /** + * Get newly added edges. + * + * @return the newly added edges. + */ + public Collection getAddedEdges() { + return edgeDifference.entriesOnlyOnRight().values(); + } + + /** + * Get removed edges. + * + * @return removed edges. + */ + public Collection getRemovedEdges() { + return edgeDifference.entriesOnlyOnLeft().values(); + } + + /** + * Get matched edges, that are present in both models. + * + * @return pairs of matched edges. + */ + public Collection> getMatchedEdges() { + return edgeDifference.entriesDiffering().values(); + } } diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/merge/KGraphMerger.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/merge/KGraphMerger.java index 55a877af2..3d1e9a538 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/merge/KGraphMerger.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/merge/KGraphMerger.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2016,2020 by + * Copyright 2016-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -36,7 +36,6 @@ import com.google.common.collect.MapDifference.ValueDifference; import com.google.common.collect.Sets; -import de.cau.cs.kieler.klighd.KlighdDataManager; import de.cau.cs.kieler.klighd.incremental.diff.KComparison; import de.cau.cs.kieler.klighd.kgraph.KEdge; import de.cau.cs.kieler.klighd.kgraph.KGraphData; @@ -88,9 +87,54 @@ public void merge() { handleRemovedNodes(); handleAddedNodes(); handleMatchedNodes(); + + // handle edges after everything else is done, because they are contained in their source, therefore we can't be + // sure the target exists until we have gone through the entire model + handleRemovedEdges(); + handleAddedEdges(); + handleMatchedEdges(); + updatePositions(); } + + /** + * Removes edges from the base model. + */ + private void handleRemovedEdges() { + for (KEdge edge : comparison.getRemovedEdges()) { + removeEdge(edge); + } + } + + /** + * Removes the edge from the graph it is contained in. + */ + private void removeEdge(KEdge edge) { + edge.setSource(null); + edge.setTarget(null); + edge.setSourcePort(null); + edge.setTargetPort(null); + } + /** + * Adds edges from the new model to the base model. + */ + private void handleAddedEdges() { + Stream newEdges = comparison.getAddedEdges().stream(); + newEdges.forEach( + (KEdge edge) -> handleAddedEdge(edge) + ); + } + + /** + * Handles edges that are present in both the base model and the new model. + */ + private void handleMatchedEdges() { + for (ValueDifference diff : comparison.getMatchedEdges()) { + handleMatchedEdge(diff.rightValue()); + } + } + /** * Remove nodes from the base model that are not longer present in the new model. */ @@ -142,10 +186,6 @@ private void handleAddedNodes() { )).forEachOrdered( (KNode node) -> addNode(node) ); - // Add edges after adding the nodes to ensure that all targets are available. - for (KNode node : comparison.getAddedNodes()) { - handleEdges(comparison.lookupBaseNode(node), node); - } } /** @@ -161,7 +201,10 @@ private void addNode(final KNode node) { // and just copy the node and add it to the base adapter, without putting it into the base model directly. if (comparison.lookupBaseNode(node) == null) { KNode copiedNode = EcoreUtil.copy(node); - comparison.getBaseAdapter().generateIDs(copiedNode); + // Edges from this node are handled later individually when the target is guaranteed to be added already, + // remove them for now. + allNewEdgesForCopiedNode(copiedNode).forEach(edge -> removeEdge(edge)); + comparison.getBaseAdapter().generateIDs(copiedNode, true, -1); } return; } @@ -180,11 +223,35 @@ private void addNode(final KNode node) { if (comparison.lookupBaseNode(node) == null) { int oldPosition = node.getParent().getChildren().indexOf(node); KNode copiedNode = EcoreUtil.copy(node); + // Edges from this node are handled later individually when the target is guaranteed to be added already, + // remove them for now. + allNewEdgesForCopiedNode(copiedNode).forEach(edge -> removeEdge(edge)); baseParent.getChildren().add(oldPosition, copiedNode); - comparison.getBaseAdapter().generateIDs(copiedNode); + comparison.getBaseAdapter().generateIDs(copiedNode, true, oldPosition); } } } + + /** + * Returns all edges of this copied node, that are copied alongside it. Includes all outgoing edges, also of potential + * children of this node. + */ + private List allNewEdgesForCopiedNode(KNode node) { + List allEdges = new ArrayList(); + allNewEdgesForCopiedNode(node, allEdges); + return allEdges; + } + + /** + * Adds all edges of this copied node, that are copied alongside it to the {@code allEdges} list. + * Includes all outgoing edges, also of potential children of this node. Adds the result to the given list. + */ + private void allNewEdgesForCopiedNode(KNode node, List allEdges) { + allEdges.addAll(node.getOutgoingEdges()); + for (KNode childNode : node.getChildren()) { + allNewEdgesForCopiedNode(childNode, allEdges); + } + } /** * Update nodes that are present in both the base and new model. @@ -194,28 +261,6 @@ private void handleMatchedNodes() { updateKnode(diff.leftValue(), diff.rightValue()); } } - - /** - * Updates the positions of all nodes, edges, ports and labels in their containment and reference lists to match the - * new model. - */ - private void updatePositions() { - for (Entry entry : updatedElements.entrySet()) { - if (entry.getKey() instanceof KNode) { - updatePosition((KNode) entry.getKey(), (KNode) entry.getValue()); - } - if (entry.getKey() instanceof KEdge) { - updatePosition((KEdge) entry.getKey(), (KEdge) entry.getValue()); - } - if (entry.getKey() instanceof KPort) { - updatePosition((KPort) entry.getKey(), (KPort) entry.getValue()); - } - if (entry.getKey() instanceof KLabel) { - updatePosition((KLabel) entry.getKey(), (KLabel) entry.getValue()); - } - } - updatedElements.clear(); - } /** * Update the given node pair. @@ -231,43 +276,32 @@ private void updateKnode(final KNode baseNode, final KNode newNode) { copyInsets(newNode.getInsets(), baseNode.getInsets()); handleLabels(baseNode, newNode); handlePorts(baseNode, newNode); - handleEdges(baseNode, newNode); + // edges are handled after all possible sources and targets have been handled updatedElements.put(baseNode, newNode); } /** - * Update all outgoing edges of the given node pair. Edges are removed, copied from the new - * model or updated. + * Update the matched edge. * - * @param baseNode - * the node to update to. - * @param newNode - * the node to update from. + * @param matchedEdge the matched edge. */ - private void handleEdges(final KNode baseNode, final KNode newNode) { - Set oldEdges = null; - if (baseNode != null) { - oldEdges = new HashSet(baseNode.getOutgoingEdges()); - } - for (KEdge newEdge : Lists.newLinkedList(newNode.getOutgoingEdges())) { - KEdge baseEdge = comparison.lookupBaseEdge(newEdge); - if (baseEdge == null || baseEdge.getTarget() == null) { - baseEdge = EcoreUtil.copy(newEdge); - updateEdge(baseEdge, newEdge); - } else { - if (oldEdges != null) { - oldEdges.remove(baseEdge); - } - updateEdge(baseEdge, newEdge); - } + private void handleMatchedEdge(final KEdge matchedEdge) { + KEdge baseEdge = comparison.lookupBaseEdge(matchedEdge); + if (baseEdge != null && baseEdge.getTarget() != null) { + updateEdge(baseEdge, matchedEdge); } - if (baseNode != null) { - for (KEdge oldEdge : oldEdges) { - oldEdge.setSource(null); - oldEdge.setTarget(null); - oldEdge.setSourcePort(null); - oldEdge.setTargetPort(null); - } + } + + /** + * Update the added edge. + * + * @param newEdge the added edge. + */ + private void handleAddedEdge(final KEdge newEdge) { + KEdge baseEdge = comparison.lookupBaseEdge(newEdge); + if (baseEdge == null || baseEdge.getTarget() == null) { + baseEdge = EcoreUtil.copy(newEdge); + updateEdge(baseEdge, newEdge); } } @@ -374,7 +408,8 @@ private void updateLabel(final KLabel baseLabel, final KLabel newLabel) { updateShapeLayout(baseLabel, newLabel); baseLabel.setText(newLabel.getText()); copyInsets(newLabel.getInsets(), baseLabel.getInsets()); - comparison.getBaseAdapter().generateIDs(baseLabel); + int newPosition = newLabel.getParent().getLabels().indexOf(newLabel); + comparison.getBaseAdapter().generateIDs(baseLabel, newPosition); updatedElements.put(baseLabel, newLabel); } @@ -428,7 +463,8 @@ private void updatePort(final KPort basePort, final KPort newPort) { updateGraphElement(basePort, newPort); updateShapeLayout(basePort, newPort); copyInsets(newPort.getInsets(), basePort.getInsets()); - comparison.getBaseAdapter().generateIDs(basePort); + int newPosition = newPort.getNode().getPorts().indexOf(newPort); + comparison.getBaseAdapter().generateIDs(basePort, newPosition); handleLabels(basePort, newPort); updatedElements.put(basePort, newPort); } @@ -458,6 +494,28 @@ private void updateGraphElement(final KGraphElement baseElement, baseProperties.removeKey(property); } } + + /** + * Updates the positions of all nodes, edges, ports and labels in their containment and reference lists to match the + * new model. + */ + private void updatePositions() { + for (Entry entry : updatedElements.entrySet()) { + if (entry.getKey() instanceof KNode) { + updatePosition((KNode) entry.getKey(), (KNode) entry.getValue()); + } + if (entry.getKey() instanceof KEdge) { + updatePosition((KEdge) entry.getKey(), (KEdge) entry.getValue()); + } + if (entry.getKey() instanceof KPort) { + updatePosition((KPort) entry.getKey(), (KPort) entry.getValue()); + } + if (entry.getKey() instanceof KLabel) { + updatePosition((KLabel) entry.getKey(), (KLabel) entry.getValue()); + } + } + updatedElements.clear(); + } /** * Updates the position of this node in the child list of its parent. diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java index 0f926ca3b..684087979 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapter.java @@ -320,9 +320,11 @@ protected void handleContainment(final Notification notification) { * * @param node * the node to add. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. * @return the new or existing id, or {@code null} if the id is already taken. */ - private String addId(final KNode node) { + private String addId(final KNode node, int position) { String id = getId(node); if (id != null) { return id; @@ -334,7 +336,7 @@ private String addId(final KNode node) { parentId = ""; localId = "root"; } else { - parentId = addId(parent); + parentId = addId(parent, -1); // parent should already be generated. KIdentifier identifier = node.getData(KIdentifier.class); if (identifier != null) { localId = identifier.getId(); @@ -343,7 +345,7 @@ private String addId(final KNode node) { localId += label.getText(); } } else { - localId = "N" + parent.getChildren().indexOf(node); + localId = "N" + position; } } id = parentId + ID_SEPARATOR + localId; @@ -383,19 +385,19 @@ private String addId(final KEdge edge) { localId = "E"; KPort sourcePort = edge.getSourcePort(); if (sourcePort != null) { - localId += addId(sourcePort); + localId += addId(sourcePort, -1); // port should already be generated. } localId += "->"; KNode targetNode = edge.getTargetPort() == null ? edge.getTarget() : edge.getTargetPort().getNode(); if (targetNode != null) { - localId += addId(targetNode); + localId += addId(targetNode, -1); // node should already be generated. } localId += ":"; KPort targetPort = edge.getTargetPort(); if (targetPort != null) { - localId += addId(targetPort); + localId += addId(targetPort, -1); // port should already be generated. } } id = parentId + ID_SEPARATOR + localId; @@ -411,9 +413,11 @@ private String addId(final KEdge edge) { * * @param label * the label to add. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. * @return the new or existing id, or {@code null} if the id is already taken. */ - private String addId(final KLabel label) { + private String addId(final KLabel label, int position) { String id = getId(label); if (id != null) { return id; @@ -436,7 +440,7 @@ private String addId(final KLabel label) { if (identifier != null) { localId = identifier.getId(); } else { - localId = "L" + parent.getLabels().indexOf(label); + localId = "L" + position; } id = parentId + ID_SEPARATOR + localId; } @@ -451,9 +455,11 @@ private String addId(final KLabel label) { * * @param port * the port to add. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. * @return the new or existing id, or {@code null} if the id is already taken. */ - private String addId(final KPort port) { + private String addId(final KPort port, int position) { String id = getId(port); if (id != null) { return id; @@ -463,13 +469,13 @@ private String addId(final KPort port) { // This is a dangling element and should not be included in the graph. Give it a unique ID anyway. id = DANGLING_ELEMENT + port.hashCode(); } else { - String parentId = addId(parent); + String parentId = addId(parent, -1); // parent should already be generated. String localId = ""; KIdentifier identifier = port.getData(KIdentifier.class); if (identifier != null) { localId = identifier.getId(); } else { - localId = "P" + parent.getPorts().indexOf(port); + localId = "P" + position; } id = parentId + ID_SEPARATOR + localId; } @@ -543,21 +549,34 @@ private void removeId(final KPort port) { * Generate IDs recursively for this {@link KNode} and all its child {@link KGraphElement}s. * * @param node the node to start generating IDs from. + * @param skipEdges if the ID generation of the edges should be skipped. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. */ - public void generateIDs(final KNode node) { - addId(node); + public void generateIDs(final KNode node, boolean skipEdges, int position) { + internalGenerateIDs(node, true, position); + // Make sure that the edges are always generated last after all connected elements are ready. + if (!skipEdges) { + internalGenerateIDs(node, false, position); + } + } + + private void internalGenerateIDs(final KNode node, boolean skipEdges, int position) { + addId(node, position); - for (KNode childNode : node.getChildren()) { - generateIDs(childNode); + for (int i = 0; i < node.getChildren().size(); ++i) { + internalGenerateIDs(node.getChildren().get(i), skipEdges, i); } - for (KPort port : node.getPorts()) { - generateIDs(port); + for (int i = 0; i < node.getPorts().size(); ++i) { + generateIDs(node.getPorts().get(i), i); } - for (KLabel label : node.getLabels()) { - generateIDs(label); + for (int i = 0; i < node.getLabels().size(); ++i) { + generateIDs(node.getLabels().get(i), i); } - for (KEdge edge : node.getOutgoingEdges()) { - generateIDs(edge); + if (!skipEdges) { + for (KEdge edge : node.getOutgoingEdges()) { + generateIDs(edge); + } } } @@ -565,12 +584,14 @@ public void generateIDs(final KNode node) { * Generate IDs recursively for this {@link KPort} and all its child {@link KGraphElement}s. * * @param port the port to start generating IDs from. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. */ - public void generateIDs(final KPort port) { - addId(port); - - for (KLabel label : port.getLabels()) { - generateIDs(label); + public void generateIDs(final KPort port, int position) { + addId(port, position); + + for (int i = 0; i < port.getLabels().size(); ++i) { + generateIDs(port.getLabels().get(i), i); } } @@ -578,9 +599,11 @@ public void generateIDs(final KPort port) { * Generate IDs recursively for this {@link KLabel} and all its child {@link KGraphElement}s. * * @param label the label to start generating IDs from. + * @param position the position in its parent reference list where this element will be placed. + * Used for creating a consistent and unique ID if the element has no identifier. */ - public void generateIDs(final KLabel label) { - addId(label); + public void generateIDs(final KLabel label, int position) { + addId(label, position); } /** @@ -590,9 +613,9 @@ public void generateIDs(final KLabel label) { */ public void generateIDs(final KEdge edge) { addId(edge); - - for (KLabel label : edge.getLabels()) { - generateIDs(label); + + for (int i = 0; i < edge.getLabels().size(); ++i) { + generateIDs(edge.getLabels().get(i), i); } } diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapters.java b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapters.java index 867777397..718850fa4 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapters.java +++ b/plugins/de.cau.cs.kieler.klighd.incremental/src/de/cau/cs/kieler/klighd/incremental/util/UIDAdapters.java @@ -58,7 +58,7 @@ public static UIDAdapter retrieveAdapter(final KNode node) { UIDAdapter newAdapter = new UIDAdapter(); node.eAdapters().add(newAdapter); adapters.put(node, new WeakReference(newAdapter)); - newAdapter.generateIDs(node); + newAdapter.generateIDs(node, false, 0); return newAdapter; } diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java index 7e8d0e492..4e266b958 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2020 by + * Copyright 2020-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -51,6 +51,34 @@ private ViewContext createViewContext() { return new ViewContext((IDiagramWorkbenchPart) null, null); } + /* + * method for programatically creating the following KGraph in kgt notion: + * + * kgraph nodeRoot + * + * knode nodeA { + * kport portA1 + * kport portA2 + * + * klabel labelA1 "labelA1" + * klabel labelA2 "labelA2" + * + * kedge (->nodeB) // edgeAB + * kedge (->nodeC) // edgeAC + * + * kedge (:portA1->nodeB:portB1) // edgeA1B1 + * kedge (:portA1->nodeB:portB1) // edgeA1B1_2 + * } + * knode nodeB { + * kport portB1 + * + * kedge (->nodeC) // edgeBC + * } + * knode nodeC { + * kedge (->nodeB) // edgeCB + * } + * + */ private KNode createTestGraph() { final KNode nodeRoot = KGraphUtil.createInitializedNode(); addIdentifier(nodeRoot, "nodeRoot"); @@ -558,6 +586,93 @@ public void testAddEdgeOnPort() { Assert.assertSame(newEdgeTargetPosition, baseEdgeTargetPosition); } + /** + * Tests adding an edge to an added port of an added node. Checks if the elements are added and if the edge is + * connected to the new port at the correct positions in various reference lists. + */ + @Test + public void testAddEdgeNewNodeToNewTargetPort() { + final KNode baseGraph = createTestGraph(); + final KNode newGraph = createTestGraph(); + + // Create a new source node on index 0. + final KNode newSourceNode = KGraphUtil.createInitializedNode(); + final EObject newSourceNodeSource = new EObjectImpl() { }; + newSourceNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newSourceNodeSource); + final int newSourceNodePosition = 0; + + newGraph.getChildren().add(newSourceNodePosition, newSourceNode); + + // Create the new target port on another node with index 1. + final KPort newTargetPort = KGraphUtil.createInitializedPort(); + final EObject newTargetPortSource = new EObjectImpl() { }; + newTargetPort.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newTargetPortSource); + final int targetNodePosition = 1; + final int newTargetPortPosition = 0; + + final KNode targetNode = newGraph.getChildren().get(targetNodePosition); + targetNode.getPorts().add(newTargetPortPosition, newTargetPort); + + // Create a new edge from the new source node to the new target port. + final KEdge newEdge = KGraphUtil.createInitializedEdge(); + final EObject newEdgeSource = new EObjectImpl() { }; + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + + newEdge.setSource(newSourceNode); + newEdge.setTargetPort(newTargetPort); + newEdge.setTarget(targetNode); + final int newEdgeSourcePosition = 0; + final int newEdgeTargetPortPosition = 0; + final int newEdgeTargetPosition = 0; + newSourceNode.getOutgoingEdges().move(newEdgeSourcePosition, newEdge); + newTargetPort.getEdges().move(newEdgeTargetPortPosition, newEdge); + targetNode.getIncomingEdges().move(newEdgeTargetPosition, newEdge); + + final ViewContext viewContext = createViewContext(); + // Initialize the view context with the base graph. + INCREMENTAL_UPDATE_STRATEGY.update(viewContext.getViewModel(), baseGraph, viewContext); + // Update with the new graph. + INCREMENTAL_UPDATE_STRATEGY.update(viewContext.getViewModel(), newGraph, viewContext); + + // Assert the new node is in the updated base model. + EObject baseNewNode = viewContext.getTargetElements(newSourceNodeSource).stream().findFirst().orElse(null); + Assert.assertNotNull(baseNewNode); + Assert.assertTrue(baseNewNode instanceof KNode); + + // Assert the new port is in the updated base model. + EObject baseNewPort = viewContext.getTargetElements(newTargetPortSource).stream().findFirst().orElse(null); + Assert.assertNotNull(baseNewPort); + Assert.assertTrue(baseNewPort instanceof KPort); + + // Assert the new edge is in the updated base model. + EObject baseNewEdge = viewContext.getTargetElements(newEdgeSource).stream().findFirst().orElse(null); + Assert.assertNotNull(baseNewEdge); + Assert.assertTrue(baseNewEdge instanceof KEdge); + // Assert the new edge also connects to the new port correctly. + Assert.assertSame(baseNewPort, ((KEdge) baseNewEdge).getTargetPort()); + + + // Assert that the new node is in the same positions in the updated base graph as it is in the new graph. + int baseNodePosition = viewContext.getViewModel().getChildren().indexOf(baseNewNode); + Assert.assertSame(newSourceNodePosition, baseNodePosition); + + // Assert that the new port is in the same positions in the updated base graph as it is in the new graph. + int basePortPosition = viewContext.getViewModel().getChildren().get(targetNodePosition).getPorts() + .indexOf(baseNewPort); + Assert.assertSame(newTargetPortPosition, basePortPosition); + + // Assert that the new edge is in the same positions in the updated base graph as it is in the new graph. + int baseEdgeSourcePosition = viewContext.getViewModel().getChildren().get(newSourceNodePosition) + .getOutgoingEdges().indexOf(baseNewEdge); + Assert.assertSame(newEdgeSourcePosition, baseEdgeSourcePosition); + int baseEdgeTargetPosition = viewContext.getViewModel().getChildren().get(targetNodePosition).getIncomingEdges() + .indexOf(baseNewEdge); + Assert.assertSame(newEdgeTargetPosition, baseEdgeTargetPosition); + int baseEdgeTargetPortPosition = viewContext.getViewModel().getChildren().get(targetNodePosition).getPorts() + .get(newTargetPortPosition).getEdges().indexOf(baseNewEdge); + Assert.assertSame(newEdgeTargetPortPosition, baseEdgeTargetPortPosition); + } + /** * Tests removing an edge plainly on a node. */ From dd39614e742af9af190d651371047d597dd3e86d Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Mon, 6 Nov 2023 17:42:34 +0100 Subject: [PATCH 69/76] update to Eclipse 2023-09 and corresponding new Orbit release. Replace any javax.inject with jakarta.inject imports. --- .../category.xml | 6 +-- .../pom.xml | 6 +-- ...er.klighd.targetplatform-elkNightly.target | 11 +++--- ...d.targetplatform-piccolo-elkNightly.target | 11 +++--- ...ieler.klighd.targetplatform-piccolo.target | 11 +++--- ...cau.cs.kieler.klighd.targetplatform.target | 11 +++--- .../contentassist/KGraphProposalProvider.java | 2 +- .../kgraph/text/KGraphValueConverters.java | 2 +- .../syntheses/EObjectFallbackSynthesis.xtend | 2 +- .../ide/syntheses/ErrorModelSynthesis.xtend | 2 +- .../ide/syntheses/MessageModelSynthesis.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../lsp/KGraphDiagramServerManager.xtend | 4 +- .../ui/wizard/KlighdProjectContributor.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 38 ++++++++++--------- ...hlightedEdgeToForegroundTestModelGen.xtend | 2 +- .../META-INF/MANIFEST.MF | 3 +- 18 files changed, 63 insertions(+), 56 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index ce72249af..d95c6d0f9 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 3c96be4a1..7ab1ceefb 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -52,17 +52,17 @@ - https://download.eclipse.org/releases/2022-09/ + https://download.eclipse.org/releases/2023-09/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ https://download.eclipse.org/elk/updates/releases/0.8.1/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/ + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0 https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 7c913547e..378ba46eb 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,18 +25,19 @@ - + - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index 9fd6a5984..15fa75331 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,11 +36,12 @@ - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index 5c4d0fff2..f7d9928be 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,11 +36,12 @@ - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 9d4a9872d..2dfc84fb4 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -25,18 +25,19 @@ - + - + - - + + + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java index 9bee4845b..ad211e736 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java @@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.elk.core.data.LayoutAlgorithmData; import org.eclipse.elk.core.data.LayoutMetaDataService; diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java index b072dd450..d02e2f691 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index c594c448d..4350cfc84 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -39,7 +39,7 @@ import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsActio import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.List import java.util.Map -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy import org.eclipse.elk.alg.layered.options.FixedAlignment import org.eclipse.elk.alg.layered.options.LayeredOptions diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index 61fd73754..69c3bb781 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -27,7 +27,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ide.model.ErrorModel import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction -import javax.inject.Inject +import jakarta.inject.Inject /** * Diagram synthesis for a {@link MessageModel}. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index f5af0a26c..43287e19a 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -22,7 +22,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensio import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import javax.inject.Inject +import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF index d4cbf9620..d2041547a 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.3.1.qualifier Bundle-Activator: de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensionsPlugin Bundle-Vendor: Kiel University Require-Bundle: org.eclipse.core.runtime, - javax.inject;bundle-version="1.0.0", + jakarta.inject.jakarta.inject-api;bundle-version="2.0.1", com.google.inject;bundle-version="3.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.4.0", org.eclipse.elk.core;bundle-version="0.1.0", diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend index 964adab69..ade55703b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend @@ -18,8 +18,8 @@ package de.cau.cs.kieler.klighd.lsp import java.util.ArrayList import java.util.List -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import jakarta.inject.Provider import org.eclipse.sprotty.xtext.IDiagramServerFactory import org.eclipse.sprotty.xtext.ls.DiagramServerManager diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index c1a37ba46..65fda1d33 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -88,7 +88,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor { ''' package «projectInfo.transformationPackage» - import javax.inject.Inject + import jakarta.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.KRenderingFactory diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index d718971e1..c065d4b46 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: de.cau.cs.kieler.klighd.kgraph, org.eclipse.ui.workbench;bundle-version="3.103.0";visibility:=reexport, com.google.guava;bundle-version="10.0.0";visibility:=reexport, com.google.inject;bundle-version="3.0.0", - javax.inject;bundle-version="1.0.0";visibility:=reexport + jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin Export-Package: de.cau.cs.kieler.klighd, diff --git a/pom.xml b/pom.xml index 3d7756eb3..9a4d3cc40 100644 --- a/pom.xml +++ b/pom.xml @@ -51,24 +51,26 @@ - 3.18.0 - 3.26.0 0.8.1 - 2.26.0 - 2.28.0 - 2.17.0 - 2.9.0 - 31.1-jre - 5.1.0 - 3.27.0 - 0.15.0 + 2.10.1 + 32.1.2-jre + 7.0.0 + 3.31.0 + 0.21.1 0.9.0 0.1.0 - 3.121.0 + 3.124.100 2.7.3 - 3.126.0 - 2.28.0 - 2.28.0 + 2.32.0 + 2.32.0 + + + 3.19.100 + 3.29.0 + 2.29.0 + 2.35.0 + 2.19.0 + 3.130.0 @@ -189,7 +191,7 @@ org.eclipse.platform org.eclipse.ui.workbench - 3.110.0 + ${ui-workbench-version} org.eclipse.platform @@ -217,12 +219,12 @@ org.eclipse.platform org.eclipse.e4.ui.workbench.renderers.swt - 0.15.600 + 0.16.100 org.eclipse.emf org.eclipse.emf.ecore.change - 2.14.0 + 2.15.0 @@ -331,7 +333,7 @@ org.eclipse.xtend xtend-maven-plugin - ${xtext-version} + ${xtend-version} diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend index f84ca0981..5f06724a3 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend @@ -23,7 +23,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.core.options.EdgeRouting import org.eclipse.elk.core.options.PortConstraints import org.eclipse.elk.core.options.PortSide diff --git a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF index abf2acd1e..76355fb24 100644 --- a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, org.eclipse.elk.core.service, - org.hamcrest.library, + org.hamcrest.library;bundle-version="[0.0.0,2.0.0)", + org.hamcrest.core;bundle-version="[0.0.0,2.0.0)", de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.incremental;resolution:=optional, de.cau.cs.kieler.klighd.piccolo;resolution:=optional, From f235e17d412931e183faf0671fb8211b05f97983 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 9 Nov 2023 16:21:51 +0100 Subject: [PATCH 70/76] enforce Java-11. --- plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath | 2 +- .../de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath | 2 +- .../de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text/.classpath | 2 +- .../de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ide/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.incremental/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.kgraph/.classpath | 2 +- .../de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.krendering/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.piccolo.freehep/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.piccolo/.classpath | 2 +- .../de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.standalone/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath | 2 +- .../de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.view/.classpath | 2 +- .../de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../klighd/ui/wizard/KlighdProjectContributor.xtend | 3 ++- plugins/de.cau.cs.kieler.klighd.ui/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF | 2 +- pom.xml | 9 ++++----- test/de.cau.cs.kieler.klighd.piccolo.test/.classpath | 2 +- .../runConfigs/AdapterTest.launch | 2 +- .../DiagramClipGlobalPortLabelVisiblityConfigTest.launch | 2 +- .../runConfigs/DiagramClipPortLabelVisibilityTest.launch | 2 +- .../runConfigs/DiagramClipTest.launch | 2 +- .../DiagramZoomControllerBoundsComputerTest.launch | 2 +- .../runConfigs/FreeHEPSVGOffscreenRenderingTest.launch | 2 +- .../runConfigs/HighlightedEdgeToForegroundTest.launch | 2 +- .../runConfigs/RenderingTest.launch | 2 +- .../de.cau.cs.kieler.klighd.piccolo.test.launch | 2 +- test/de.cau.cs.kieler.klighd.test/.classpath | 2 +- test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF | 2 +- .../runConfigs/ConnectedEdgesTest.launch | 2 +- .../runConfigs/IncrementalUpdateTest.launch | 2 +- .../runConfigs/Iterables2Test.launch | 2 +- .../runConfigs/KGraphUtilTest.launch | 2 +- .../runConfigs/ModelingUtilTest.launch | 2 +- .../runConfigs/SizeEstimationTest.launch | 2 +- .../runConfigs/SizeEstimationTestWithFailings.launch | 2 +- .../ViewChangedNotificationSuppressionTest.launch | 2 +- .../runConfigs/ViewChangedNotificationTest.launch | 2 +- .../runConfigs/ViewContextSourceModelTrackingTest.launch | 2 +- .../runConfigs/de.cau.cs.kieler.klighd.test.launch | 2 +- 67 files changed, 71 insertions(+), 71 deletions(-) diff --git a/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath b/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath +++ b/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF b/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF index 5e41d7e6e..a36267692 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF +++ b/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Custom XMI Resource Factory Implementat Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgx;singleton:=true Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.kgx -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd Require-Bundle: org.eclipse.emf.ecore.xmi diff --git a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath +++ b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF index 4c239448d..21e770e0e 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF +++ b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD Offscreen Rendering Application Bundle-SymbolicName: de.cau.cs.kieler.klighd.offscreen.application;singleton:=true Bundle-Version: 0.45.0.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore, org.eclipse.emf.ecore.xmi, de.cau.cs.kieler.klighd, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath index ad52d9d4d..0a3b82d4d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF index 89f145d46..073b7d2a6 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER KGraph Text Ide Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ide Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.kgraph.text, org.eclipse.xtext.ide, com.google.guava, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath index 0377d772d..9891e0694 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF index 19cf491b9..3decd4c4b 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.ui, de.cau.cs.kieler.klighd.kgraph Import-Package: org.apache.log4j DynamicImport-Package: de.cau.cs.kieler.klighd.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.kgraph.text.ui, de.cau.cs.kieler.kgraph.text.ui.contentassist, de.cau.cs.kieler.kgraph.text.ui.internal, diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.classpath b/plugins/de.cau.cs.kieler.kgraph.text/.classpath index 0377d772d..9891e0694 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF index 48bb9cdd0..98c4ad22c 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, de.cau.cs.kieler.klighd;resolution:=optional Import-Package: org.apache.log4j DynamicImport-Package: de.cau.cs.kieler.klighd.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.kgraph.text, de.cau.cs.kieler.kgraph.text.formatting, de.cau.cs.kieler.kgraph.text.generator, diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.classpath b/plugins/de.cau.cs.kieler.klighd.ide/.classpath index 2f5ffb21d..e769fecbe 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index 5dfed97ed..36090a5ff 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, org.eclipse.elk.alg.layered, org.eclipse.elk.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ide, de.cau.cs.kieler.klighd.ide.model, diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath index 43b986286..1db08c6b4 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF index 4ffbed71e..90654d3c8 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KlighD incremental update extension Bundle-SymbolicName: de.cau.cs.kieler.klighd.incremental;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.kgraph, com.google.guava diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath index cf36b5611..bc57d2383 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF index c4aa8b08d..f9da6c450 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Graph Model Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgraph;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.kgraph.impl, de.cau.cs.kieler.klighd.kgraph.util diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath index 2f5ffb21d..e769fecbe 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF index d2041547a..a6665cf9d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.elk.core;bundle-version="0.1.0", de.cau.cs.kieler.klighd.krendering, de.cau.cs.kieler.klighd.kgraph -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: de.cau.cs.kieler.klighd.krendering.extensions Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering.extensions diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath index 8d0c758d4..bd4b424b6 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF index c707850ae..4992c4b9d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.krendering, de.cau.cs.kieler.klighd.krendering.impl, de.cau.cs.kieler.klighd.krendering.util diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath index 711341e8d..9715836f2 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath @@ -7,7 +7,7 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF index 977fe3bd6..a78256dc0 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.batik;singleton:=true Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo;bundle-version="0.10.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: ., lib/batik.jar, lib/lib/batik-dom.jar, diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF index b36cfcb69..41b86dd32 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.draw2d;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava;bundle-version="10.0.0", org.eclipse.draw2d;bundle-version="3.7.0" Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo.draw2d diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath index ec88fe259..91cbc7b24 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF index 7677b38ba..4d04a2f6a 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.freehep;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: ., lib/freehep-graphics2d-2.3.jar, lib/freehep-graphicsbase-2.3.jar, diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath index 43b986286..1db08c6b4 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF index 9aeef5e0e..b53001927 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Powered by Piccolo2D Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava;bundle-version="10.0.0", de.cau.cs.kieler.klighd;bundle-version="0.3.0";visibility:=reexport, diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/.classpath b/plugins/de.cau.cs.kieler.klighd.standalone/.classpath index cf36b5611..bc57d2383 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.standalone/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF index f3822bf83..531c019e7 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Standalone Setup Bundle-SymbolicName: de.cau.cs.kieler.klighd.standalone Bundle-Version: 2.3.1.qualifier Bundle-Vendor: KIELER Lightweight Diagrams (KLighD) -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore.xmi, org.eclipse.elk.core, de.cau.cs.kieler.klighd, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath index dc7ce67ee..19ef143f2 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath @@ -1,5 +1,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF index f48b7252a..989d621fb 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD-specific Eclipse 3x UI contributions Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.contrib3x;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", de.cau.cs.kieler.klighd.ui;bundle-version="0.5.0" Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.contrib3x diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF index 380259f9c..9a597657c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD Model Modification Extensions for EMF Domains Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.emf;singleton:=true Bundle-Version: 2.3.1.qualifier Fragment-Host: de.cau.cs.kieler.klighd.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.transaction, org.eclipse.emf.workspace Bundle-Vendor: Kiel University diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF index fceca165a..7f8a56046 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf, org.eclipse.elk.alg.layered, de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ui.view, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath index 428337e56..47ce7cd07 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF index 45a32a9ab..d7cea6946 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.apache.log4j, org.eclipse.xtext.xbase.lib, org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.wizard diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index 65fda1d33..26de2e48e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -64,7 +64,8 @@ class KlighdProjectContributor implements IProjectFactoryContributor { case "JavaSE-1.6": "1.6" case "JavaSE-1.7": "1.7" case "JavaSE-1.8": "1.8" - default: "1.8" + case "JavaSE-11" : "11" + default: "11" } ''' diff --git a/plugins/de.cau.cs.kieler.klighd.ui/.classpath b/plugins/de.cau.cs.kieler.klighd.ui/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF index 36762da7f..c85ca4504 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.elk.core.service;bundle-version="0.1.0", org.eclipse.core.databinding.property;bundle-version="1.8.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ui, de.cau.cs.kieler.klighd.ui.internal;x-friends:="de.cau.cs.kieler.klighd.ui.contrib3x", diff --git a/plugins/de.cau.cs.kieler.klighd/.classpath b/plugins/de.cau.cs.kieler.klighd/.classpath index 6122403cc..1d45a8a9f 100644 --- a/plugins/de.cau.cs.kieler.klighd/.classpath +++ b/plugins/de.cau.cs.kieler.klighd/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index c065d4b46..4d9008e8a 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams (KLighD) Bundle-SymbolicName: de.cau.cs.kieler.klighd;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.krendering;visibility:=reexport, org.eclipse.core.runtime;bundle-version="3.6.0";visibility:=reexport, diff --git a/pom.xml b/pom.xml index 9a4d3cc40..f0db7cb8a 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,10 @@ UTF-8 UTF-8 - - 1.8 + + 11 - - + 11 @@ -399,6 +397,7 @@ maven-javadoc-plugin 3.5.0 + 8 diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath b/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath index 428337e56..47ce7cd07 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch index c8f09e5ab..b0eff6b72 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch index d4eb4e7ed..2befe26ac 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch index bae5b84aa..fa93140b6 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch index 100cc1857..006490d0c 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch index 5d418e96a..2c526ce9c 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch index 3a6c88b70..8a7c8354e 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch index 1eaf256d3..745bc633b 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch index 291428ba0..c55e05e91 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch index acc444dc5..d637b0049 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/.classpath b/test/de.cau.cs.kieler.klighd.test/.classpath index eca7bdba8..e801ebfb4 100644 --- a/test/de.cau.cs.kieler.klighd.test/.classpath +++ b/test/de.cau.cs.kieler.klighd.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF index 76355fb24..760b8eb26 100644 --- a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KLighD Tests Bundle-SymbolicName: de.cau.cs.kieler.klighd.test;singleton:=true Bundle-Version: 2.3.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, org.eclipse.elk.core.service, diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch index b0cc24401..960040f7d 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch index 635496efb..66307c027 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch index 2acd2050d..e936f6683 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch index 12b9c64bc..925808c3b 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch index aad6b0db1..43c3a7441 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch index 9b3cb36fd..84a56ec49 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch index 9b27a8b7c..561af6bba 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch index 8014f08cb..0997fe0aa 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch index 4067eb61c..f90365ece 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch index 796e576ff..8d6eb52bf 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch index 1a19cb1f7..b9e732a35 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch @@ -25,7 +25,7 @@ - + From 01eae363c199a3685a35660bb1a8c7ec3253e76d Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 9 Nov 2023 16:25:58 +0100 Subject: [PATCH 71/76] re-inject diagram server fields because old javax.inject uses in dependent Sprotty release. --- .../klighd/lsp/KGraphDiagramServer.xtend | 49 +++++++++++++++++++ ...edInteractiveLanguageServerExtension.xtend | 2 +- ...ngInteractiveLanguageServerExtension.xtend | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend index aad234347..d67576498 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend @@ -61,8 +61,13 @@ import org.eclipse.elk.graph.properties.IProperty import org.eclipse.emf.ecore.EObject import org.eclipse.sprotty.Action import org.eclipse.sprotty.ActionMessage +import org.eclipse.sprotty.ComputedBoundsApplicator +import org.eclipse.sprotty.IDiagramExpansionListener +import org.eclipse.sprotty.IDiagramOpenListener +import org.eclipse.sprotty.IDiagramSelectionListener import org.eclipse.sprotty.ILayoutEngine import org.eclipse.sprotty.IModelUpdateListener +import org.eclipse.sprotty.IPopupModelFactory import org.eclipse.sprotty.LayoutAction import org.eclipse.sprotty.RejectAction import org.eclipse.sprotty.RequestBoundsAction @@ -638,4 +643,48 @@ class KGraphDiagramServer extends LanguageAwareDiagramServer { override SModelRoot getModel() { return currentRoot; } + + // Repeat injection of multiple methods of the DefaultDiagramServer as the javax.inject->jakarta.inject transition + // broke something here. + // TODO: remove when not necessary anymore + + @Inject + override setModelUpdateListener(IModelUpdateListener listener) { + super.modelUpdateListener = listener; + } + + @Inject + override setLayoutEngine(ILayoutEngine engine) { + super.layoutEngine = engine; + } + + @Inject + override setComputedBoundsApplicator(ComputedBoundsApplicator computedBoundsApplicator) { + super.computedBoundsApplicator = computedBoundsApplicator; + } + + @Inject + override setPopupModelFactory(IPopupModelFactory factory) { + super.popupModelFactory = factory; + } + + @Inject + override setSelectionListener(IDiagramSelectionListener listener) { + super.selectionListener = listener; + } + + @Inject + override setExpansionListener(IDiagramExpansionListener diagramExpansionListener) { + super.expansionListener = diagramExpansionListener; + } + + @Inject + override setOpenListener(IDiagramOpenListener diagramOpenListener) { + super.openListener = diagramOpenListener; + } + + @Inject + override setSModelCloner(SModelCloner smodelCloner) { + super.SModelCloner = smodelCloner; + } } diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index fa9819f16..a14cf6fe2 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -29,7 +29,7 @@ import java.io.ByteArrayOutputStream import java.util.HashMap import java.util.List import java.util.Map -import javax.inject.Singleton +import jakarta.inject.Singleton import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.graph.ElkNode import org.eclipse.elk.graph.properties.IProperty diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 61ad1b56f..40ea40f4b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -28,7 +28,7 @@ import java.io.ByteArrayOutputStream import java.util.Arrays import java.util.List import java.util.Map -import javax.inject.Singleton +import jakarta.inject.Singleton import org.eclipse.elk.alg.rectpacking.options.RectPackingOptions import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.graph.ElkNode From 7e6552481e154d867e69527832913239dda665ee Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 22 Feb 2024 12:50:49 +0100 Subject: [PATCH 72/76] updated to Eclipse 2023-12 release and ELK 0.9.0. Replaced all injections with com.google.inject (which in turn aliases jakarta.inject) --- .../category.xml | 8 +++--- .../pom.xml | 8 +++--- ...er.klighd.targetplatform-elkNightly.target | 7 ++--- ...d.targetplatform-piccolo-elkNightly.target | 7 ++--- ...ieler.klighd.targetplatform-piccolo.target | 9 +++--- ...cau.cs.kieler.klighd.targetplatform.target | 9 +++--- .../contentassist/KGraphProposalProvider.java | 4 +-- .../kgraph/text/KGraphValueConverters.java | 4 +-- .../META-INF/MANIFEST.MF | 3 +- plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 5 ++++ .../syntheses/EObjectFallbackSynthesis.xtend | 2 +- .../ide/syntheses/ErrorModelSynthesis.xtend | 2 +- .../ide/syntheses/MessageModelSynthesis.xtend | 2 +- .../lsp/KGraphDiagramServerManager.xtend | 4 +-- ...edInteractiveLanguageServerExtension.xtend | 2 +- ...ngInteractiveLanguageServerExtension.xtend | 2 +- .../ui/wizard/KlighdProjectContributor.xtend | 2 +- .../syntheses/AbstractDiagramSynthesis.java | 4 +-- pom.xml | 28 +++++++++++-------- ...hlightedEdgeToForegroundTestModelGen.xtend | 2 +- 20 files changed, 61 insertions(+), 53 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index d95c6d0f9..7d0c7f9d5 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - - + + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 7ab1ceefb..eb94937db 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -52,17 +52,17 @@ - https://download.eclipse.org/releases/2023-09/ + https://download.eclipse.org/releases/2023-12/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ - https://download.eclipse.org/elk/updates/releases/0.8.1/> + https://download.eclipse.org/elk/updates/releases/0.9.0/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0 + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0 https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 378ba46eb..9a0a2908c 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,19 +25,18 @@ - + - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index 15fa75331..d25ae8287 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,12 +36,11 @@ - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index f7d9928be..f1cf44ae6 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -21,11 +21,11 @@ - + - + @@ -36,12 +36,11 @@ - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 2dfc84fb4..57ac08e32 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -21,23 +21,22 @@ - + - + - - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java index ad211e736..fdf9c1c73 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java @@ -20,8 +20,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; -import jakarta.inject.Inject; - import org.eclipse.elk.core.data.LayoutAlgorithmData; import org.eclipse.elk.core.data.LayoutMetaDataService; import org.eclipse.elk.core.data.LayoutOptionData; @@ -46,6 +44,8 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; import org.eclipse.xtext.util.Strings; +import com.google.inject.Inject; + import de.cau.cs.kieler.kgraph.text.KGraphResource; import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess; import de.cau.cs.kieler.klighd.kgraph.PersistentEntry; diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java index d02e2f691..17e29a109 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java @@ -18,8 +18,6 @@ import java.util.regex.Pattern; -import jakarta.inject.Inject; - import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; @@ -32,6 +30,8 @@ import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.util.Strings; +import com.google.inject.Inject; + /** * Value converter for the KGraph grammar. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index 36090a5ff..4dfd25fa7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: KIELER Lightweight Diagrams Ide Components Bundle-SymbolicName: de.cau.cs.kieler.klighd.ide;singleton:=true Bundle-Version: 2.3.1.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.ide -Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, +Require-Bundle: com.google.inject, + de.cau.cs.kieler.klighd;visibility:=reexport, de.cau.cs.kieler.klighd.kgraph, org.eclipse.xtext.xbase, de.cau.cs.kieler.klighd.krendering.extensions, diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml index 6612f8570..880ba53d3 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -19,6 +19,11 @@ https://github.com/kieler/KLighD + + com.google.inject + guice + ${guice-version} + ${project.groupId} de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index 4350cfc84..7692d8c14 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -18,6 +18,7 @@ package de.cau.cs.kieler.klighd.ide.syntheses import com.google.common.collect.HashBasedTable import com.google.common.collect.Table +import com.google.inject.Inject import de.cau.cs.kieler.klighd.KlighdConstants import de.cau.cs.kieler.klighd.SynthesisOption import de.cau.cs.kieler.klighd.kgraph.KNode @@ -39,7 +40,6 @@ import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsActio import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.List import java.util.Map -import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy import org.eclipse.elk.alg.layered.options.FixedAlignment import org.eclipse.elk.alg.layered.options.LayeredOptions diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index 69c3bb781..2ee5813eb 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.ide.syntheses +import com.google.inject.Inject import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.ide.syntheses.MessageModelSynthesis import de.cau.cs.kieler.klighd.kgraph.KNode @@ -27,7 +28,6 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ide.model.ErrorModel import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction -import jakarta.inject.Inject /** * Diagram synthesis for a {@link MessageModel}. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index 43287e19a..dbb44990b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -16,13 +16,13 @@ */ package de.cau.cs.kieler.klighd.ide.syntheses +import com.google.inject.Inject import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend index ade55703b..dcb15e8da 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend @@ -16,10 +16,10 @@ */ package de.cau.cs.kieler.klighd.lsp +import com.google.inject.Inject +import com.google.inject.Provider import java.util.ArrayList import java.util.List -import jakarta.inject.Inject -import jakarta.inject.Provider import org.eclipse.sprotty.xtext.IDiagramServerFactory import org.eclipse.sprotty.xtext.ls.DiagramServerManager diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index a14cf6fe2..0466b5320 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.lsp.interactive.layered import com.google.inject.Inject +import com.google.inject.Singleton import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.lsp.KGraphDiagramState @@ -29,7 +30,6 @@ import java.io.ByteArrayOutputStream import java.util.HashMap import java.util.List import java.util.Map -import jakarta.inject.Singleton import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.graph.ElkNode import org.eclipse.elk.graph.properties.IProperty diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 40ea40f4b..5310c0c09 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.lsp.interactive.rectpacking import com.google.inject.Inject +import com.google.inject.Singleton import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.lsp.KGraphDiagramState @@ -28,7 +29,6 @@ import java.io.ByteArrayOutputStream import java.util.Arrays import java.util.List import java.util.Map -import jakarta.inject.Singleton import org.eclipse.elk.alg.rectpacking.options.RectPackingOptions import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.graph.ElkNode diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index 26de2e48e..627559a0f 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -89,7 +89,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor { ''' package «projectInfo.transformationPackage» - import jakarta.inject.Inject + import com.google.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.KRenderingFactory diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java index e446eda77..38d806383 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java @@ -58,7 +58,7 @@ * e.g. for accessing the transformation context, this can be realized by means of Guice, too. The * helper transformation implementation must declare an injected field of type * AbstractDiagramSynthesis<?>, the actual {@link AbstractDiagramSynthesis} implementation - * must be annotated with {@link javax.inject.Singleton @Singleton} on class level. This way the + * must be annotated with {@link com.google.inject.Singleton @Singleton} on class level. This way the * helper classes are provided with the current instance of the main transformation.
*
* Furthermore, diagram syntheses may leverage other ones, e.g. for realizing composed views. This @@ -68,7 +68,7 @@ * {@link com.google.inject.Provider Provider<yourTransformationClass>} can be declared. Each * time calling {@link com.google.inject.Provider#get() get()} on this provider a new instance will * be obtained as long as the provided class is not declared as singleton (via - * {@link javax.inject.Singleton @Singleton}). The + * {@link com.google.inject.Singleton @Singleton}). The * {@link de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared ViewSynthesisShared} * annotation helps if the described feature of employing helper classes is required. * diff --git a/pom.xml b/pom.xml index f0db7cb8a..8a6fd02f4 100644 --- a/pom.xml +++ b/pom.xml @@ -51,26 +51,26 @@ - 0.8.1 + 0.9.0 2.10.1 - 32.1.2-jre + 32.1.3-jre 7.0.0 - 3.31.0 + 3.32.0 0.21.1 0.9.0 0.1.0 - 3.124.100 + 3.124.200 2.7.3 - 2.32.0 - 2.32.0 + 2.33.0 + 2.33.0 - 3.19.100 - 3.29.0 + 3.20.0 + 3.30.0 2.29.0 2.35.0 - 2.19.0 - 3.130.0 + 2.20.0 + 3.131.0 @@ -224,6 +224,12 @@ org.eclipse.emf.ecore.change 2.15.0 + + + xml-apis + xml-apis-ext + 1.3.04 + @@ -373,7 +379,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 + 3.5.0 add-source diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend index 5f06724a3..6f32a8ee4 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.piccolo.test.highlightedEdgeToForeground +import com.google.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.kgraph.KPort import de.cau.cs.kieler.klighd.krendering.Colors @@ -23,7 +24,6 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import jakarta.inject.Inject import org.eclipse.elk.core.options.EdgeRouting import org.eclipse.elk.core.options.PortConstraints import org.eclipse.elk.core.options.PortSide From 3359aa141fd1dba77a8693f041cec65027a79858 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 22 Feb 2024 16:37:00 +0100 Subject: [PATCH 73/76] fixed test execution in Maven build and from Eclipse --- ...er.klighd.targetplatform-elkNightly.target | 5 + ...d.targetplatform-piccolo-elkNightly.target | 5 + ...ieler.klighd.targetplatform-piccolo.target | 5 + ...cau.cs.kieler.klighd.targetplatform.target | 5 + .../pom.xml | 6 + .../runConfigs/AdapterTest.launch | 224 +++++++++--- ...pGlobalPortLabelVisiblityConfigTest.launch | 224 +++++++++--- .../DiagramClipPortLabelVisibilityTest.launch | 224 +++++++++--- .../runConfigs/DiagramClipTest.launch | 224 +++++++++--- ...ramZoomControllerBoundsComputerTest.launch | 224 +++++++++--- .../FreeHEPSVGOffscreenRenderingTest.launch | 53 ++- .../HighlightedEdgeToForegroundTest.launch | 52 ++- .../runConfigs/RenderingTest.launch | 224 +++++++++--- ...e.cau.cs.kieler.klighd.piccolo.test.launch | 224 +++++++++--- test/de.cau.cs.kieler.klighd.test/pom.xml | 6 + .../runConfigs/ConnectedEdgesTest.launch | 223 +++++++++--- .../runConfigs/IncrementalUpdateTest.launch | 324 ++++++++++-------- .../runConfigs/Iterables2Test.launch | 223 +++++++++--- .../runConfigs/KGraphUtilTest.launch | 223 +++++++++--- .../runConfigs/ModelingUtilTest.launch | 223 +++++++++--- .../runConfigs/SizeEstimationTest.launch | 223 +++++++++--- .../SizeEstimationTestWithFailings.launch | 223 +++++++++--- ...wChangedNotificationSuppressionTest.launch | 223 +++++++++--- .../ViewChangedNotificationTest.launch | 53 ++- .../ViewContextSourceModelTrackingTest.launch | 224 +++++++++--- .../de.cau.cs.kieler.klighd.test.launch | 146 +++++++- 26 files changed, 3175 insertions(+), 838 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 9a0a2908c..3d08e692f 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -31,6 +31,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index d25ae8287..8f00f2b0c 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -35,6 +35,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index f1cf44ae6..d1f752741 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -35,6 +35,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 57ac08e32..9ec8e1d19 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -31,6 +31,11 @@ + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml index 6e48ffc5a..f46957026 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml @@ -34,6 +34,12 @@ de.cau.cs.kieler.klighd.piccolo.freehep 0.0.0 + + + eclipse-plugin + javax.annotation + 0.0.0 + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch index b0eff6b72..eccfcc1b8 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch index 2befe26ac..7ae5919f5 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch index fa93140b6..366712e58 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch index 006490d0c..6a2478e9f 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch index 2c526ce9c..7729d79ed 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch index 8a7c8354e..ed23bf4cc 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,11 +70,8 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,26 +139,40 @@ - + + + - - - - + + + + + + + + + + + + + + + + + - diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch index 745bc633b..cee8dc0da 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,12 +70,9 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,20 +139,35 @@ - + + + - - - - + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch index c55e05e91..3f01f996a 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch index d637b0049..2ae7622ee 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/pom.xml b/test/de.cau.cs.kieler.klighd.test/pom.xml index 05c1bd1f0..6895bc375 100644 --- a/test/de.cau.cs.kieler.klighd.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.test/pom.xml @@ -26,6 +26,12 @@ org.eclipse.elk.alg.layered ${elk-version} + + + eclipse-plugin + javax.annotation + 0.0.0 + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch index 960040f7d..13b08295a 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch index 66307c027..c18cf4ef5 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch @@ -1,153 +1,177 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch index e936f6683..c41fa7c4f 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch index 925808c3b..947408325 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch index 43c3a7441..156c447c2 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch index 84a56ec49..9a9ab3be5 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch index 561af6bba..002d29cea 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch index 0997fe0aa..66b7db84d 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch index f90365ece..1a302c429 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,12 +70,9 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,20 +139,36 @@ - + + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch index 8d6eb52bf..9e75b4db3 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch index b9e732a35..52f6d0faf 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch @@ -12,8 +12,10 @@ + + @@ -24,8 +26,10 @@ + + - + @@ -34,8 +38,144 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4b6db2dcee1589d75f3a89173295443cd8de9d6c Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 7 Sep 2023 16:38:18 +0200 Subject: [PATCH 74/76] lsp: improved ID generation to be consistent between syntheses, yet unique. With this, the LSP does not need to be run with the incremental update strategy anymore to show animations. --- .../klighd/lsp/KGraphLayoutEngine.xtend | 4 +- .../lsp/utils/KGraphElementIDGenerator.xtend | 56 ++++++++----------- .../klighd/lsp/utils/RenderingPreparer.xtend | 33 ++++++----- 3 files changed, 42 insertions(+), 51 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend index 9e7b91019..68be39e76 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2018,2019 by + * Copyright 2018-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -80,7 +80,7 @@ class KGraphLayoutEngine extends ElkLayoutEngine { synchronized (kGraphContext.viewModel) { lightDiagramLayoutConfig.performLayout - RenderingPreparer.prepareRendering(kGraphContext.viewModel) + RenderingPreparer.prepareRendering(kGraphContext.viewModel, diagramState.getKGraphToSModelElementMap(uri)) } } diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend index 73c73ac12..69dc8b628 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2018,2019 by + * Copyright 2018-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -34,8 +34,7 @@ import static extension de.cau.cs.kieler.klighd.lsp.utils.SprottyProperties.* /** * Class for generating unique IDs for any {@link KGraphElement}. Use a single instance of this and call getId() for all - * the elements you need IDs for. IDs will be unique, assuming that hashCode() on KGraphElements returns unique hashes - * per instance. + * the elements you need IDs for. IDs will be unique, based on the position in their parent graph element. * * @author nre */ @@ -109,9 +108,7 @@ class KGraphElementIdGenerator { // the root node is just called $root val parent = element.eContainer as KGraphElement var String parentId = null - if (parent !== null) { - parentId = getId(parent) - } else { + if (parent === null) { id = ID_SEPARATOR + 'root' if (idToElementMap.get(id) !== null) { // The graph already contains a root node, this is a connected node dangling without a parent and will @@ -122,6 +119,7 @@ class KGraphElementIdGenerator { idToElementMap.put(id, element) return id } + parentId = getId(parent) // use a prefix depending on the class of the element + the {@link KIdentifier} as id if an identifier is // defined, otherwise make up a new id based on the position in the model hierarchy with a Separator not @@ -130,19 +128,24 @@ class KGraphElementIdGenerator { val identifier = element.data.filter(KIdentifier) var char elementSeparator + var int index switch (element) { KNode: { elementSeparator = NODE_SEPARATOR + index = element.parent.children.indexOf(element) } KEdge: { elementSeparator = EDGE_SEPARATOR + index = element.source.outgoingEdges.indexOf(element) } KLabel: { elementSeparator = LABEL_SEPARATOR + index = element.parent.labels.indexOf(element) } KPort: { elementSeparator = PORT_SEPARATOR + index = element.node.ports.indexOf(element) } default: { throw new IllegalArgumentException("Can not generate an id for element of type " + element.class) @@ -150,7 +153,7 @@ class KGraphElementIdGenerator { } if (identifier.empty) { - elementId = "" + ID_SEPARATOR + elementSeparator + element.hashCode + elementId = "" + ID_SEPARATOR + elementSeparator + index } else { elementId = elementSeparator + identifier.head.id } @@ -169,8 +172,8 @@ class KGraphElementIdGenerator { } /** - * Class for generating unique IDs for any {@link KRendering}. IDs will be unique, assuming that hashCode() on - * KRenderings returns unique hashes per instance. + * Class for generating unique IDs for any {@link KRendering}. IDs will be unique, based on the position in their + * parent graph element / rendering. * * @author nre */ @@ -196,21 +199,11 @@ class KRenderingIdGenerator { * and puts it in the {@link SprottyProperties#RENDERING_ID} property. This ID can be used for uniquely identifying * renderings between systems. * - * @param rendering The rendering - */ - static def void generateIdsRecursive(KRendering rendering) { - if (rendering !== null) { - generateIdsRecursive(rendering, null) - } - } - - /** - * Recursive method implementing the behavior described in {@link #generateIdsRecursive(KStyleHolder)}. - * * @param rendering The rendering that should currently get an ID. - * @paran parentRendering The parent rendering of the current rendering, for convenience. + * @param parentId The ID of the parent to be added as the ID's prefix. + * @param renderingIndex The index of this rendering in relation to the parent. */ - private static def void generateIdsRecursive(KRendering rendering, KContainerRendering parentRendering) { + static def void generateIdsRecursive(KRendering rendering, String parentId, int renderingIndex) { if (rendering === null) { return } @@ -220,15 +213,10 @@ class KRenderingIdGenerator { return } - if (parentRendering === null) { - rendering.renderingId = "" + RENDERING_SEPERATOR + rendering.hashCode - } else { - val parentId = parentRendering.renderingId - // Generate a new ID based on the parent rendering's ID. - rendering.renderingId = parentId - + ID_SEPARATOR + RENDERING_SEPERATOR - + rendering.hashCode - } + // Generate a new ID based on the parent rendering's ID. + rendering.renderingId = parentId + + ID_SEPARATOR + RENDERING_SEPERATOR + + renderingIndex if (rendering instanceof KPolyline) { // Special case for KPolyline: It has a junctionPointRendering that also needs an ID. // Use a new separator and think of this as a new rendering hierarchy with possible children. @@ -240,8 +228,8 @@ class KRenderingIdGenerator { } if (rendering instanceof KContainerRendering) { // Each KContainerRendering has child renderings that also need new IDs. - for (childRendering : rendering.children) { - generateIdsRecursive(childRendering, rendering) + for (var int i = 0; i < rendering.children.size; i++) { + generateIdsRecursive(rendering.children.get(i), rendering.renderingId, i) } } } @@ -255,7 +243,7 @@ class KRenderingIdGenerator { * @return The {@link KRendering} with the given ID. */ static def findRenderingById(KGraphElement element, String id) { - val ids = id.split("\\" + ID_SEPARATOR) + val ids = id.split("\\" + ID_SEPARATOR + "\\" + ID_SEPARATOR + "\\" + ID_SEPARATOR).get(1).split("\\" + ID_SEPARATOR) // Every rendering ID is built hierarchically, separated by the RENDERING_SEPERATOR symbol. val renderings = element.data.filter(KRendering) + element.data.filter(KRenderingRef) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 596633a5a..b52bd17f5 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -51,6 +51,7 @@ import java.util.ArrayList import java.util.HashMap import java.util.List import java.util.Map +import org.eclipse.sprotty.SModelElement import static com.google.common.collect.Iterables.filter @@ -76,17 +77,20 @@ final class RenderingPreparer { * Finally, modifiable styles defined by the synthesis are processed for the rendering. * * @param element The parent element containing the graph to calculate all rendering bounds for. + * @param kGraphToSGraph A map for identifying the SGraph element for each KGraph element in this graph. */ - static def void prepareRendering(KGraphElement element) { + static def void prepareRendering(KGraphElement element, Map kGraphToSGraph) { // calculate the sizes of all renderings: - for (data : element.data) { + for (var int i = 0; i < element.data.size; i++) { + val data = element.data.get(i) switch(data) { KRenderingLibrary: { // The library needs to generate ids for all later KRenderingRefs to refer to, but no own bounds, // since these are generic renderings. - for (rendering : data.renderings) { + for (var int j = 0; j < data.renderings.size; j++) { + val rendering = data.renderings.get(j) if (rendering instanceof KRendering) { - KRenderingIdGenerator.generateIdsRecursive(rendering) + KRenderingIdGenerator.generateIdsRecursive(rendering, "$$lib$$", j) } } } @@ -101,12 +105,11 @@ final class RenderingPreparer { // and the decorationMap data.properties.put(CALCULATED_DECORATION_MAP, decorationMap) // remember the id of the rendering in the reference - data.renderingId = data.rendering.renderingId - + data.renderingId = kGraphToSGraph.get(element)?.id + data.rendering.renderingId } KRendering: { // every rendering needs an ID, generate it here - KRenderingIdGenerator.generateIdsRecursive(data) + KRenderingIdGenerator.generateIdsRecursive(data, kGraphToSGraph.get(element)?.id + "$$", i) handleKRendering(element, data, null, null) } } @@ -117,25 +120,26 @@ final class RenderingPreparer { if (element instanceof KLabeledGraphElement) { for (label : element.labels) { - prepareRendering(label) + prepareRendering(label, kGraphToSGraph) } } if (element instanceof KNode) { for (node : element.children) { - prepareRendering(node) + prepareRendering(node, kGraphToSGraph) } for (edge : element.outgoingEdges) { - prepareRendering(edge) + prepareRendering(edge, kGraphToSGraph) } for (port : element.ports) { - prepareRendering(port) + prepareRendering(port, kGraphToSGraph) } } // Also calculate the sizes of all proxy-renderings val proxyRendering = element.getProperty(KlighdProperties.PROXY_VIEW_PROXY_RENDERING) if (element.getProperty(KlighdProperties.PROXY_VIEW_RENDER_NODE_AS_PROXY) && proxyRendering !== null) { - for (data : proxyRendering) { + for (var int i = 0; i < proxyRendering.size; i++) { + val data = proxyRendering.get(i) switch(data) { KRenderingRef: { // all references to KRenderings need to place a map with the ids of the renderings and their @@ -148,12 +152,12 @@ final class RenderingPreparer { // and the decorationMap data.properties.put(CALCULATED_DECORATION_MAP, decorationMap) // remember the id of the rendering in the reference - data.renderingId = data.rendering.renderingId + data.renderingId = kGraphToSGraph.get(element)?.id + data.rendering.renderingId } KRendering: { // every rendering needs an ID, generate it here - KRenderingIdGenerator.generateIdsRecursive(data) + KRenderingIdGenerator.generateIdsRecursive(data, kGraphToSGraph.get(element)?.id + "$$", i) if (data.eContainer instanceof KNode) { // Calculate the size and layout of the proxy first. val parent = data.eContainer as KNode @@ -331,7 +335,6 @@ final class RenderingPreparer { // to call KLighD's DecoratorPlacementUtil#evaluateDecoratorPlacement the points of the path of the // parent rendering have to be stored. var Point2D[] path = #[] -// var path = new KlighdPath(rendering) // TODO: Can I also only use the points of the rendering? val parentRendering = rendering.eContainer // Get inset from parent region From 8ac15941ed6ec9981cdecb90aff19449116216ce Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 28 Feb 2024 12:02:52 +0100 Subject: [PATCH 75/76] Deprecated the miss-spelled MODEL_ELEMEMT internal property for a new MODEL_ELEMENT property. --- ...edInteractiveLanguageServerExtension.xtend | 4 +- ...ngInteractiveLanguageServerExtension.xtend | 6 +- .../klighd/lsp/utils/LazyTraceProvider.xtend | 4 +- .../de/cau/cs/kieler/klighd/KlighdSetup.java | 2 +- .../de/cau/cs/kieler/klighd/ViewContext.java | 4 +- .../KlighdLayoutConfigurationStore.java | 2 +- .../util/KlighdInternalProperties.java | 9 ++- .../util/SourceModelTrackingAdapter.java | 2 +- .../klighd/test/IncrementalUpdateTest.java | 62 +++++++++---------- .../ViewContextSourceModelTrackingTest.java | 14 ++--- 10 files changed, 58 insertions(+), 51 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index 0466b5320..0b34f516b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -239,7 +239,7 @@ class LayeredInteractiveLanguageServerExtension implements ILanguageServerExtens for (entry : changedNodes.keySet) { // set Property of corresponding elkNode val kNode = entry.KNode - val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val value = changedNodes.get(entry) @@ -251,7 +251,7 @@ class LayeredInteractiveLanguageServerExtension implements ILanguageServerExtens } } - val elkNode = changedNodes.keySet().head.KNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = changedNodes.keySet().head.KNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode && changed) { val Map> changes = newHashMap diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 5310c0c09..7d9ef43d0 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -165,7 +165,7 @@ class RectpackingInteractiveLanguageServerExtension implements ILanguageServerEx resource.save(outputStream, emptyMap) val codeBefore = outputStream.toString - val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val Map> changes = newHashMap elkNode.setProperty(RectPackingOptions.ASPECT_RATIO, constraint.aspectRatio) @@ -199,12 +199,12 @@ class RectpackingInteractiveLanguageServerExtension implements ILanguageServerEx val codeBefore = outputStream.toString for (node : changedNodes) { - val elkNode = node.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = node.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { InteractiveUtil.copyAllConstraints(elkNode, node) } } - val elkNode = changedNodes.get(0).getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = changedNodes.get(0).getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val Map> changes = newHashMap diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend index d93372c48..fd389c7f0 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend @@ -77,7 +77,7 @@ class LazyTraceProvider extends XtextTraceProvider { /** * Generates a trace for the {@code kElement}'s source EObject on the {@code sElement}. * The kElement must be synthesized by a KLighD synthesis before and must have its source EObject stored in the - * {@link KlighdInternalProperties#MODEL_ELEMEMT} property. + * {@link KlighdInternalProperties#MODEL_ELEMENT} property. * * @param sElement The SModelElement that needs a trace to its model element. * @param kElement The KGraphElement that was generated from some model element. @@ -86,7 +86,7 @@ class LazyTraceProvider extends XtextTraceProvider { // The real model element that can be traced is the EObject that got synthesized in the // {@link KGraphDiagramGenerator#translateModel} function. That model element has to be stored in the properties // during the synthesis. Otherwise the tracing will not work. - val modelElement = kElement.properties.get(KlighdInternalProperties.MODEL_ELEMEMT) + val modelElement = kElement.properties.get(KlighdInternalProperties.MODEL_ELEMENT) if (modelElement instanceof EObject) { if (modelElement.eResource instanceof XtextResource) { trace(sElement, modelElement) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java index 8baa308cb..fd58a23d8 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java @@ -33,7 +33,7 @@ public class KlighdSetup implements IKlighdStartupHook { @Override public void execute() { KlighdDataManager.getInstance() - .registerBlacklistedProperty(KlighdInternalProperties.MODEL_ELEMEMT) + .registerBlacklistedProperty(KlighdInternalProperties.MODEL_ELEMENT) .registerBlacklistedProperty(LabelManagementOptions.LABEL_MANAGER) .registerBlacklistedProperty(GridPlacementUtil.ESTIMATED_GRID_DATA) .registerBlacklistedProperty(GridPlacementUtil.CHILD_AREA_POSITION); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java index 5325f9a48..cbce20a6d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java @@ -654,10 +654,10 @@ public void setZoomStyle(final ZoomStyle zoomStyle) { */ public void associateSourceTargetPair(final Object source, final EObject target) { if (KGraphPackage.eINSTANCE.getKGraphData().isInstance(target)) { - ((KGraphData) target).setProperty(KlighdInternalProperties.MODEL_ELEMEMT, source); + ((KGraphData) target).setProperty(KlighdInternalProperties.MODEL_ELEMENT, source); } else if (KGraphPackage.eINSTANCE.getKGraphElement().isInstance(target)) { - ((KGraphElement) target).setProperty(KlighdInternalProperties.MODEL_ELEMEMT, source); + ((KGraphElement) target).setProperty(KlighdInternalProperties.MODEL_ELEMENT, source); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java index 552ab7bef..d44e5fe2b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java @@ -283,7 +283,7 @@ public Collection getAffectedOptions() { final String msg = "Concurrent modification in KGraphPropertyLayoutConfig:" + Klighd.LINE_SEPARATOR + " element == " + graphElement + Klighd.LINE_SEPARATOR + " sourceElement == " - + graphElement.getProperty(KlighdInternalProperties.MODEL_ELEMEMT); + + graphElement.getProperty(KlighdInternalProperties.MODEL_ELEMENT); Klighd.log(new Status(IStatus.ERROR, Klighd.PLUGIN_ID, msg)); } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java index c7dada30a..570c9f0d5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java @@ -47,7 +47,14 @@ private KlighdInternalProperties() { * KGraphData}, for {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElements} it is to * be attached to their layout data. */ - public static final IProperty MODEL_ELEMEMT = new Property("klighd.modelElement"); + public static final IProperty MODEL_ELEMENT = new Property("klighd.modelElement"); + + /** + * Deprecated property with a typo, see {@link #MODEL_ELEMENT} as the replacement. + * + * @deprecated + */ + public static final IProperty MODEL_ELEMEMT = MODEL_ELEMENT; /** * Property indicating that the node has been populated. A node is populated, if and only if the diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java index 809a5ecae..b3117f26d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java @@ -53,7 +53,7 @@ public class SourceModelTrackingAdapter extends EContentAdapter { private static final Predicate CANDIDATES = KlighdPredicates.instanceOf( KGraphElement.class, KRendering.class, IPropertyToObjectMapImpl.class); - private static final IProperty MODEL_ELEMENT = KlighdInternalProperties.MODEL_ELEMEMT; + private static final IProperty MODEL_ELEMENT = KlighdInternalProperties.MODEL_ELEMENT; private Object mapsMonitor = this; private Multimap sourceTargetsMap = ArrayListMultimap.create(); diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java index 4e266b958..3fac91d95 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java @@ -168,7 +168,7 @@ public void testAddNode() { final KNode newNode = KGraphUtil.createInitializedNode(); final EObject newNodeSource = new EObjectImpl() { }; - newNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource); + newNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource); final int newNodePosition = 0; newGraph.getChildren().add(newNodePosition, newNode); @@ -208,9 +208,9 @@ public void testAddMultipleNodes() { final EObject newNodeSource0 = new EObjectImpl() { }; final EObject newNodeSource1 = new EObjectImpl() { }; final EObject newNodeSource2 = new EObjectImpl() { }; - newNode0.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource0); - newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource1); - newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource2); + newNode0.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource0); + newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource1); + newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource2); final int newNode0Position = 0; final int newNode1Position = 1; final int newNode2Position = 2; @@ -253,7 +253,7 @@ public void testRemoveNode() { final KNode baseGraph = createTestGraph(); final KNode baseNodeToRemove = baseGraph.getChildren().get(toRemovePosition); final EObject baseNodeToRemoveSource = new EObjectImpl() { }; - baseNodeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseNodeToRemoveSource); + baseNodeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseNodeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -281,11 +281,11 @@ public void testUpdateNodePosition() { final KNode baseGraph = createTestGraph(); final KNode baseNodeToMove = baseGraph.getChildren().get(oldPosition); final EObject nodeToMoveSource = new EObjectImpl() { }; - baseNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, nodeToMoveSource); + baseNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, nodeToMoveSource); final KNode newGraph = createTestGraph(); final KNode newNodeToMove = newGraph.getChildren().get(oldPosition); - newNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, nodeToMoveSource); + newNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, nodeToMoveSource); newGraph.getChildren().move(newPosition, newNodeToMove); @@ -314,7 +314,7 @@ public void testAddPort() { final KPort newPort = KGraphUtil.createInitializedPort(); final EObject newPortSource = new EObjectImpl() { }; - newPort.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newPortSource); + newPort.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newPortSource); final int parentNodePosition = 0; final int newPortPosition = 0; @@ -346,7 +346,7 @@ public void testRemovePort() { final KNode baseGraph = createTestGraph(); final KPort basePortToRemove = baseGraph.getChildren().get(parentNodePosition).getPorts().get(toRemovePosition); final EObject basePortToRemoveSource = new EObjectImpl() { }; - basePortToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, basePortToRemoveSource); + basePortToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, basePortToRemoveSource); final KNode newGraph = createTestGraph(); @@ -375,11 +375,11 @@ public void testUpdatePortPosition() { final KNode baseGraph = createTestGraph(); final KPort basePortToMove = baseGraph.getChildren().get(parentNodePosition).getPorts().get(oldPosition); final EObject portToMoveSource = new EObjectImpl() { }; - basePortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, portToMoveSource); + basePortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, portToMoveSource); final KNode newGraph = createTestGraph(); final KPort newPortToMove = newGraph.getChildren().get(parentNodePosition).getPorts().get(oldPosition); - newPortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, portToMoveSource); + newPortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, portToMoveSource); newGraph.getChildren().get(parentNodePosition).getPorts().move(newPosition, newPortToMove); @@ -412,7 +412,7 @@ public void testAddLabel() { final KNode parentNode = newGraph.getChildren().get(parentNodePosition); final KLabel newLabel = KGraphUtil.createInitializedLabel(parentNode); final EObject newLabelSource = new EObjectImpl() { }; - newLabel.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newLabelSource); + newLabel.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newLabelSource); parentNode.getLabels().move(newLabelPosition, newLabel); final ViewContext viewContext = createViewContext(); @@ -441,7 +441,7 @@ public void testRemoveLabel() { final KNode baseGraph = createTestGraph(); final KLabel baseLabelToRemove = baseGraph.getChildren().get(parentNodePosition).getLabels().get(toRemovePosition); final EObject baseLabelToRemoveSource = new EObjectImpl() { }; - baseLabelToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseLabelToRemoveSource); + baseLabelToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseLabelToRemoveSource); final KNode newGraph = createTestGraph(); @@ -470,11 +470,11 @@ public void testUpdateLabelPosition() { final KNode baseGraph = createTestGraph(); final KLabel baseLabelToMove = baseGraph.getChildren().get(parentNodePosition).getLabels().get(oldPosition); final EObject labelToMoveSource = new EObjectImpl() { }; - baseLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, labelToMoveSource); + baseLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, labelToMoveSource); final KNode newGraph = createTestGraph(); final KLabel newLabelToMove = newGraph.getChildren().get(parentNodePosition).getLabels().get(oldPosition); - newLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, labelToMoveSource); + newLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, labelToMoveSource); newGraph.getChildren().get(parentNodePosition).getLabels().move(newPosition, newLabelToMove); @@ -505,7 +505,7 @@ public void testAddEdgePlain() { final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); final int sourceNodePosition = 0; final int targetNodePosition = 1; @@ -548,7 +548,7 @@ public void testAddEdgeOnPort() { final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); final int sourceNodePosition = 0; final int targetNodePosition = 1; @@ -598,7 +598,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create a new source node on index 0. final KNode newSourceNode = KGraphUtil.createInitializedNode(); final EObject newSourceNodeSource = new EObjectImpl() { }; - newSourceNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newSourceNodeSource); + newSourceNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newSourceNodeSource); final int newSourceNodePosition = 0; newGraph.getChildren().add(newSourceNodePosition, newSourceNode); @@ -606,7 +606,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create the new target port on another node with index 1. final KPort newTargetPort = KGraphUtil.createInitializedPort(); final EObject newTargetPortSource = new EObjectImpl() { }; - newTargetPort.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newTargetPortSource); + newTargetPort.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newTargetPortSource); final int targetNodePosition = 1; final int newTargetPortPosition = 0; @@ -616,7 +616,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create a new edge from the new source node to the new target port. final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); newEdge.setSource(newSourceNode); newEdge.setTargetPort(newTargetPort); @@ -684,7 +684,7 @@ public void testRemoveEdgePlain() { final KEdge baseEdgeToRemove = baseGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(toRemovePosition); final EObject baseEdgeToRemoveSource = new EObjectImpl() { }; - baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseEdgeToRemoveSource); + baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseEdgeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -714,7 +714,7 @@ public void testRemoveEdgeOnPort() { final KEdge baseEdgeToRemove = baseGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(toRemovePosition); final EObject baseEdgeToRemoveSource = new EObjectImpl() { }; - baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseEdgeToRemoveSource); + baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseEdgeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -746,12 +746,12 @@ public void testUpdateEdgePositionPlain() { final KEdge baseEdgeToMove = baseGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(oldSourcePosition); final EObject edgeToMoveSource = new EObjectImpl() { }; - baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newGraph = createTestGraph(); final KEdge newEdgeToMove = newGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(oldSourcePosition); - newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newTargetNode = newEdgeToMove.getTarget(); newGraph.getChildren().get(sourceNodePosition).getOutgoingEdges().move(newSourcePosition, newEdgeToMove); newTargetNode.getIncomingEdges().move(newTargetPosition, newEdgeToMove); @@ -789,12 +789,12 @@ public void testUpdateEdgePositionOnPort() { final KEdge baseEdgeToMove = baseGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(oldSourcePosition); final EObject edgeToMoveSource = new EObjectImpl() { }; - baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newGraph = createTestGraph(); final KEdge newEdgeToMove = newGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(oldSourcePosition); - newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KPort newTargetPort = newEdgeToMove.getTargetPort(); newGraph.getChildren().get(sourceNodePosition).getPorts().get(sourceNodePortPosition).getEdges() .move(newSourcePosition, newEdgeToMove); @@ -897,11 +897,11 @@ public void testIssue48() { final EObject newNodeSource3 = new EObjectImpl() { }; final EObject newNodeSourceL = new EObjectImpl() { }; final EObject newNodeSource2 = new EObjectImpl() { }; - newNodeC.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSourceC); - newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource1); - newNode3.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource3); - newNodeL.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSourceL); - newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource2); + newNodeC.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSourceC); + newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource1); + newNode3.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource3); + newNodeL.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSourceL); + newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource2); final KPort newPortCOut = KGraphUtil.createInitializedPort(); newPortCOut.setNode(newNodeC); diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java index db2f4f725..550f9bd98 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java @@ -108,11 +108,11 @@ private void checkTracerMaps(final ViewContext viewContext, final int expectedEn public void test00() { final Object elementB = new Object(); final KNode nodeB = KGraphUtil.createInitializedNode(); - nodeB.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, elementB); + nodeB.setProperty(KlighdInternalProperties.MODEL_ELEMENT, elementB); final Object elementA = new Object(); final KNode nodeA = KGraphUtil.createInitializedNode(); - nodeA.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, elementA); + nodeA.setProperty(KlighdInternalProperties.MODEL_ELEMENT, elementA); nodeA.getChildren().add(nodeB); final KNode root = KGraphUtil.createInitializedNode(); @@ -160,7 +160,7 @@ private ViewContext updateViewModelRootSourceElement(final ViewContext viewConte final EObject sourceModel = new EObjectImpl() { }; final KNode newModel = KGraphUtil.createInitializedNode(); - newModel.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, sourceModel); + newModel.setProperty(KlighdInternalProperties.MODEL_ELEMENT, sourceModel); UPDATE_STRATEGY.update(viewModel, newModel, viewContext); @@ -484,8 +484,8 @@ public void testIncrementalUpdate() { final EObject rootSource = new EObjectImpl() { }; final EObject childSource = new EObjectImpl() { }; - rootNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, rootSource); - childNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, childSource); + rootNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, rootSource); + childNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, childSource); final ViewContext viewContext = createViewContext(); INCREMENTAL_UPDATE_STRATEGY.update(viewContext.getViewModel(), rootNode, viewContext); @@ -498,8 +498,8 @@ public void testIncrementalUpdate() { final KNode newRoot = createSimpleNetwork(); final KNode newChildNode = newRoot.getChildren().get(1); - newRoot.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, rootSource); - newChildNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, childSource); + newRoot.setProperty(KlighdInternalProperties.MODEL_ELEMENT, rootSource); + newChildNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, childSource); final ViewContext newViewContext = createViewContext(); INCREMENTAL_UPDATE_STRATEGY.update(newViewContext.getViewModel(), newRoot, newViewContext); From a60f1abcef2946fa46750089a4a8e3e797a95891 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Wed, 28 Feb 2024 14:57:09 +0100 Subject: [PATCH 76/76] Support for topdown scale factor property (#173) * topdown layout scaling info elk-client communication * routes no layout edges correctly when crossing 1 hierarchy level Signed-off-by: Max Kasperowski --------- Signed-off-by: Max Kasperowski Co-authored-by: Niklas Rentz --- .../cs/kieler/klighd/lsp/TopDownPreservedProperties.java | 2 +- .../macrolayout/KlighdDiagramLayoutConnector.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/TopDownPreservedProperties.java b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/TopDownPreservedProperties.java index a8788453e..e6f8b57a6 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/TopDownPreservedProperties.java +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/TopDownPreservedProperties.java @@ -31,7 +31,7 @@ public class TopDownPreservedProperties implements IPreservedProperties { */ @Override public List> getProperties() { - return Arrays.asList(/*CoreOptions.TOP_DOWN_LAYOUT_RENDER_SCALE*/); + return Arrays.asList(CoreOptions.TOPDOWN_SCALE_FACTOR); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java index 077b07c98..eae0affb3 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdDiagramLayoutConnector.java @@ -1216,7 +1216,9 @@ private void handleExcludedEdge(final KEdge edge) { -sourceNode.getInsets().getTop()); } } else { - sourcePoint.add(sourceNode.getXpos(), sourceNode.getYpos()); + // TODO: this probably only works for edges crossing at most one hierarchy level + sourcePoint.add(sourceNode.getXpos() * sourceNode.getProperty(CoreOptions.TOPDOWN_SCALE_FACTOR), + sourceNode.getYpos() * sourceNode.getProperty(CoreOptions.TOPDOWN_SCALE_FACTOR)); } KPoint sourceKPoint = edge.getSourcePoint(); @@ -1228,7 +1230,9 @@ private void handleExcludedEdge(final KEdge edge) { // determine the target point final KVector targetPoint = toElementBorder(targetNode, targetPort, sourceNode, sourcePort); - targetPoint.add(targetNode.getXpos(), targetNode.getYpos()); + // TODO: this probably only works for edges crossing at most one hierarchy level + targetPoint.add(targetNode.getXpos() * targetNode.getParent().getProperty(CoreOptions.TOPDOWN_SCALE_FACTOR), + targetNode.getYpos() * targetNode.getParent().getProperty(CoreOptions.TOPDOWN_SCALE_FACTOR)); if (targetInSource) { KGraphUtil.toAbsolute(targetPoint, targetNode.getParent()); KGraphUtil.toRelative(targetPoint, sourceNode);