Merge branch 'master' into sdo/ideaLSRunConfiguration

lf-lang · Apr 15, 2024 · bf5a631 · bf5a631
2 parents bef01db + 8c9a465
commit bf5a631
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -26,6 +26,7 @@
 
 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 de.cau.cs.kieler.klighd.IStyleModifier;
@@ -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
@@ -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
@@ -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;