From 9ba803a41382ccd6e0f3b26f8234cfe1ecade14f Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Thu, 4 Apr 2024 16:30:11 +0200 Subject: [PATCH 1/2] Change javax.inject to com.google.inject. --- .../lflang/diagram/synthesis/AbstractSynthesisExtensions.java | 2 +- .../org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java | 2 +- .../diagram/synthesis/postprocessor/ReactorPortAdjustment.java | 2 +- .../diagram/synthesis/styles/LinguaFrancaShapeExtensions.java | 2 +- .../diagram/synthesis/styles/LinguaFrancaStyleExtensions.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java index 4d32af61ef..dded56661d 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java @@ -24,9 +24,9 @@ ***************/ package org.lflang.diagram.synthesis; +import com.google.inject.Inject; import de.cau.cs.kieler.klighd.SynthesisOption; import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis; -import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; /** diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java index 5ac530e5dd..c19b213f4f 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java @@ -29,6 +29,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.collect.Table; +import com.google.inject.Inject; import de.cau.cs.kieler.klighd.DisplayedActionData; import de.cau.cs.kieler.klighd.Klighd; import de.cau.cs.kieler.klighd.SynthesisOption; @@ -69,7 +70,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.elk.alg.layered.options.LayerConstraint; diff --git a/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java b/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java index 315eb0ebf4..8076a63365 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java @@ -28,6 +28,7 @@ import com.google.inject.Guice; import com.google.inject.Scopes; import com.google.inject.TypeLiteral; +import com.google.inject.Inject; import de.cau.cs.kieler.klighd.IStyleModifier; import de.cau.cs.kieler.klighd.IViewer; import de.cau.cs.kieler.klighd.internal.ILayoutRecorder; @@ -39,7 +40,6 @@ import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared; import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis; import java.util.List; -import javax.inject.Inject; import org.eclipse.elk.core.options.CoreOptions; import org.eclipse.elk.graph.properties.Property; import org.eclipse.xtext.xbase.lib.Extension; diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java index 8aafcc2f89..b7ef406ee5 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java @@ -29,6 +29,7 @@ import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.BOTTOM; import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.TOP; +import com.google.inject.Inject; import de.cau.cs.kieler.klighd.KlighdConstants; import de.cau.cs.kieler.klighd.kgraph.KEdge; import de.cau.cs.kieler.klighd.kgraph.KNode; @@ -66,7 +67,6 @@ import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; import org.eclipse.elk.core.options.CoreOptions; import org.eclipse.elk.core.options.PortSide; import org.eclipse.elk.graph.properties.Property; diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java index 1973738d5a..629daf0d75 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java @@ -27,6 +27,7 @@ import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.*; import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.*; +import com.google.inject.Inject; import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties; import de.cau.cs.kieler.klighd.kgraph.KEdge; import de.cau.cs.kieler.klighd.kgraph.KLabel; @@ -51,7 +52,6 @@ import de.cau.cs.kieler.klighd.labels.decoration.IDecoratorRenderingProvider; import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator; import java.util.List; -import javax.inject.Inject; import org.eclipse.elk.core.math.ElkPadding; import org.eclipse.elk.graph.properties.Property; import org.eclipse.emf.ecore.util.EcoreUtil; From d17d6b668bf1f5fc22ae0fa5d1437029e0053ec3 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Sat, 13 Apr 2024 21:48:49 -0700 Subject: [PATCH 2/2] Apply Spotless --- .../diagram/synthesis/postprocessor/ReactorPortAdjustment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java b/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java index 8076a63365..0a508b45ad 100644 --- a/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java +++ b/core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java @@ -26,9 +26,9 @@ import com.google.inject.Binder; import com.google.inject.Guice; +import com.google.inject.Inject; import com.google.inject.Scopes; import com.google.inject.TypeLiteral; -import com.google.inject.Inject; import de.cau.cs.kieler.klighd.IStyleModifier; import de.cau.cs.kieler.klighd.IViewer; import de.cau.cs.kieler.klighd.internal.ILayoutRecorder;