From dc6a768fdf36242598d48590cd4ae0c6e4fd080a Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 1 Sep 2023 11:59:20 +0200 Subject: [PATCH 1/2] 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 2/2] 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 + + + + + + + + + +