Code Review: tik/proxy-view

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,45 @@ final class RenderingPreparer {
                 prepareRendering(port)
             }
         }
+
+        // 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) {
+                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<String, Bounds>
+                        var decorationMap = new HashMap<String, Decoration>
+                        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)
+                        if (data.eContainer instanceof KGraphElement) {
+                            handleKRendering(data.eContainer as KGraphElement, data, null, null)
+                        }
+                    }
+                }
+            }
+        }
     }
 
     /**

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]);

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,

plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdOptions.java

@@ -16,14 +16,18 @@
  */
 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;
 import org.eclipse.elk.core.math.KVector;
 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;
 

plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/AndConnective.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 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.
+     * @param leftOperand left operand
+     * @param rightOperand right operand
+     */
+    public AndConnective(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 AndConnective(SemanticFilterRule leftOperand, SemanticFilterRule rightOperand, String ruleName) {
+        super(ruleName);
+        this.name = NAME;
+        this.leftOperand = leftOperand;
+        this.rightOperand = rightOperand;
+    }
+
+}

plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/BinaryConnective.java

@@ -0,0 +1,52 @@
+/*
+ * 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
+ *
+ */
+public abstract class BinaryConnective extends SemanticFilterRule {
+
+    protected String name;
+    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 'C(R1, R2)'.
+     * @return the rule string
+     */
+    public String getString() {
+        return name + "(" + leftOperand + ", " + rightOperand + ")";
+    }
+
+}

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.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;
+    }
+
+}

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;
+    }
+
+}

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;
+    }
+
+}