Merge remote-tracking branch 'origin/master' into sdo/interactiveMrTree

kieler · Mar 14, 2024 · b0c908c · b0c908c
2 parents 4a6ad21 + 408ed02
commit b0c908c
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 322 deletions.
diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml
@@ -60,14 +60,11 @@
    </feature>
 
    <bundle id="de.cau.cs.kieler.klighd.standalone" version="2.3.1.qualifier"/>
-   <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/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.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/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>
diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml
@@ -63,8 +63,6 @@
                 <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/simrel/orbit-aggregation/release/4.30.0</associateSite>
-                <!-- Sprotty ... -->
-                <associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
               </associateSites>
               <siteTemplateFolder>siteTemplate</siteTemplateFolder>
               <symbols>

diff --git a/....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target
@@ -43,9 +43,5 @@
       <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"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
-    </location>
   </locations>
 </target>
diff --git a/...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target
@@ -47,9 +47,5 @@
       <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"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
-    </location>
   </locations>
 </target>
diff --git a/...cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/...cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target
@@ -47,9 +47,5 @@
       <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"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
-    </location>
   </locations>
 </target>
diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target
@@ -43,9 +43,5 @@
       <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"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
-    </location>
   </locations>
 </target>
diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/build.properties b/plugins/de.cau.cs.kieler.kgraph.text.ide/build.properties
@@ -4,3 +4,5 @@ source.. = src-gen/,\
 output.. = bin/
 bin.includes = META-INF/,\
                .
+bin.excludes = **/*.xtend,\
+               **/*.java._trace
diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/build.properties b/plugins/de.cau.cs.kieler.kgraph.text.ui/build.properties
@@ -6,4 +6,6 @@ bin.includes = META-INF/,\
                about.html,\
                icons/,\
                plugin.xml
+bin.excludes = **/*.xtend,\
+               **/*.java._trace
 
diff --git a/plugins/de.cau.cs.kieler.kgraph.text/build.properties b/plugins/de.cau.cs.kieler.kgraph.text/build.properties
@@ -6,3 +6,7 @@ bin.includes = model/generated/,\
                about.html,\
                .,\
                plugin.xml
+bin.excludes = **/*.xtend,\
+               **/*.mwe2,\
+               **/*.xtext,\
+               **/*.java._trace
diff --git a/plugins/de.cau.cs.kieler.klighd.ide/build.properties b/plugins/de.cau.cs.kieler.klighd.ide/build.properties
@@ -6,3 +6,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                icons/
+bin.excludes = **/*.xtend,\
+               **/*.java._trace
diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/build.properties b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/build.properties
@@ -4,3 +4,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                about.html,\
                .
+bin.excludes = **/*.xtend,\
+               **/*.java._trace
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.classpath b/plugins/de.cau.cs.kieler.klighd.lsp/.classpath
@@ -5,8 +5,28 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="xtend-gen/"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src-gen">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.project b/plugins/de.cau.cs.kieler.klighd.lsp/.project
@@ -15,16 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -35,6 +25,5 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding/<project>=UTF-8
 encoding/src=UTF-8
+encoding/xtend-gen=UTF-8
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/de.cau.cs.kieler.klighd.lsp/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -2,5 +2,7 @@ BuilderConfiguration.is_project_specific=true
 eclipse.preferences.version=1
 outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
 outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
 outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
 outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/build.properties b/plugins/de.cau.cs.kieler.klighd.lsp/build.properties
@@ -5,5 +5,6 @@ bin.includes = .,\
                plugin.xml,\
                about.html
                META-INF/,
-bin.excludes = **/*.xtend
+bin.excludes = **/*.xtend,\
+               **/*.java._trace
 src.includes = about.html
diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml b/plugins/de.cau.cs.kieler.klighd.lsp/pom.xml
@@ -10,7 +10,6 @@
   </parent>
 
   <artifactId>de.cau.cs.kieler.klighd.lsp</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>KIELER Lightweight Diagrams as Language Server</name>
   <description>KIELER Lightweight Diagrams as Language Server</description>