Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacement of javax.inject with com.google.inject #2253

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Replacement of javax.inject with com.google.inject #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba803a
Change javax.inject to com.google.inject.
soerendomroes Apr 4, 2024
d17d6b6
Apply Spotless
lhstrh Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading