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

Update to Eclipse 2023-12 and corresponding new Orbit release. #176

Merged
merged 5 commits into from
Feb 26, 2024
Merged

Update to Eclipse 2023-12 and corresponding new Orbit release. #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd39614
update to Eclipse 2023-09 and corresponding new Orbit release. Replac…
NiklasRentzCAU Nov 6, 2023
f235e17
enforce Java-11.
NiklasRentzCAU Nov 9, 2023
01eae36
re-inject diagram server fields because old javax.inject uses in
NiklasRentzCAU Nov 9, 2023
7e65524
updated to Eclipse 2023-12 release and ELK 0.9.0. Replaced all
NiklasRentzCAU Feb 22, 2024
3359aa1
fixed test execution in Maven build and from Eclipse
NiklasRentzCAU Feb 22, 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
8 changes: 4 additions & 4 deletions build/de.cau.cs.kieler.klighd.repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
<bundle id="de.cau.cs.kieler.klighd.lsp" version="2.3.1.qualifier"/>
<bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.3.1.qualifier"/>

<repository-reference location="https://download.eclipse.org/releases/2022-09/" enabled="true" />
<repository-reference location="https://download.eclipse.org/releases/2023-12/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true" />
<repository-reference location="https://xtext.github.io/download/updates/releases/2.1.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true" />
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
</site>
8 changes: 4 additions & 4 deletions build/de.cau.cs.kieler.klighd.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@
<configuration>
<associateSites>
<!-- Eclipse -->
<associateSite>https://download.eclipse.org/releases/2022-09/</associateSite>
<associateSite>https://download.eclipse.org/releases/2023-12/</associateSite>
<!-- UML2 Tools (Meta Model Implemenetation, ...) -->
<associateSite>https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/</associateSite>
<!-- Eclipse Layout Kernel -->
<!-- associateSite>http://build.eclipse.org/modeling/elk/updates/nightly/</associateSite -->
<associateSite>https://download.eclipse.org/elk/updates/releases/0.8.1/</associateSite>>
<associateSite>https://download.eclipse.org/elk/updates/releases/0.9.0/</associateSite>>
<!-- Xtext -->
<associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/</associateSite>>
<associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/</associateSite>>
<associateSite>https://xtext.github.io/download/updates/releases/2.1.1/</associateSite>>
<!-- Eclipse Orbit for Google Guave, Apache Batik, ... -->
<associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/</associateSite>
<associateSite>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0</associateSite>
<!-- Sprotty ... -->
<associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
</associateSites>
Expand Down
15 changes: 10 additions & 5 deletions ....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,18 +25,23 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
<repository location="https://xtext.github.io/download/updates/releases/2.1.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.xml.bind" version="0.0.0"/>
<!-- Required for JUnit4 Tests to be able to run -->
<unit id="javax.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
<unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
15 changes: 10 additions & 5 deletions ...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,7 +25,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -36,11 +36,16 @@
<repository location="https://kieler.github.io/KLighD/v1.1.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.xml.bind" version="0.0.0"/>
<!-- Required for JUnit4 Tests to be able to run -->
<unit id="javax.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
<unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
17 changes: 11 additions & 6 deletions ...cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -21,11 +21,11 @@
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -36,11 +36,16 @@
<repository location="https://kieler.github.io/KLighD/v1.1.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.xml.bind" version="0.0.0"/>
<!-- Required for JUnit4 Tests to be able to run -->
<unit id="javax.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
<unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
17 changes: 11 additions & 6 deletions build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -21,22 +21,27 @@
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
<repository location="https://xtext.github.io/download/updates/releases/2.1.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="jakarta.servlet" version="0.0.0"/>
<!-- Required for JUnit4 Tests to be able to run -->
<unit id="javax.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
<unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Custom XMI Resource Factory Implementat
Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgx;singleton:=true
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: de.cau.cs.kieler.klighd.kgx
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: Kiel University
Fragment-Host: de.cau.cs.kieler.klighd
Require-Bundle: org.eclipse.emf.ecore.xmi
2 changes: 1 addition & 1 deletion plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: KLighD Offscreen Rendering Application
Bundle-SymbolicName: de.cau.cs.kieler.klighd.offscreen.application;singleton:=true
Bundle-Version: 0.45.0.qualifier
Bundle-Vendor: Kiel University
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.ecore.xmi,
de.cau.cs.kieler.klighd,
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="src" path="src"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: KIELER KGraph Text Ide
Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ide
Bundle-Version: 2.3.1.qualifier
Bundle-Vendor: Kiel University
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: de.cau.cs.kieler.kgraph.text,
org.eclipse.xtext.ide,
com.google.guava,
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.ui,
de.cau.cs.kieler.klighd.kgraph
Import-Package: org.apache.log4j
DynamicImport-Package: de.cau.cs.kieler.klighd.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: de.cau.cs.kieler.kgraph.text.ui,
de.cau.cs.kieler.kgraph.text.ui.contentassist,
de.cau.cs.kieler.kgraph.text.ui.internal,
Expand Down
4 changes: 2 additions & 2 deletions ...aph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;

import javax.inject.Inject;

import org.eclipse.elk.core.data.LayoutAlgorithmData;
import org.eclipse.elk.core.data.LayoutMetaDataService;
import org.eclipse.elk.core.data.LayoutOptionData;
Expand All @@ -46,6 +44,8 @@
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
import org.eclipse.xtext.util.Strings;

import com.google.inject.Inject;

import de.cau.cs.kieler.kgraph.text.KGraphResource;
import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess;
import de.cau.cs.kieler.klighd.kgraph.PersistentEntry;
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
de.cau.cs.kieler.klighd;resolution:=optional
Import-Package: org.apache.log4j
DynamicImport-Package: de.cau.cs.kieler.klighd.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: de.cau.cs.kieler.kgraph.text,
de.cau.cs.kieler.kgraph.text.formatting,
de.cau.cs.kieler.kgraph.text.generator,
Expand Down
Loading
Loading