[NONE] Migrated from Xtext 2.7.3 to Xtext 2.17.

.travis.yml

@@ -15,7 +15,7 @@ sudo: false
 language: java
 
 jdk: 
- - oraclejdk8
+ - openjdk11
 
 dist: trusty
 
@@ -24,11 +24,14 @@ cache:
   - $HOME/.m2
 
 before_script:
+  - "wget https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_linux-x64_bin-sdk.zip -O /tmp/openjfx11.zip"
+  - "unzip  /tmp/openjfx11.zip"
+  - "export JAVAFX.HOME=/tmp/openjfx11"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - sleep 3 
 
 script:
 - cd org.eclipse.gef.releng
 # skip wikidoc generation, which does not affect build result, but generate javadoc and ensure test failures are respected.
-- mvn clean verify -Dmaven.test.failure.ignore=false -Dwikidoc.skip=true -PNEON.target
+- mvn clean verify -Dmaven.test.failure.ignore=false -Dwikidoc.skip=true -P2019-03.target

org.eclipse.gef.common/about.mappings

@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
+0=201912101408

org.eclipse.gef.dot-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.gef.dot"
       label="GEF DOT"
-      version="5.0.500.qualifier"
+      version="5.1.0.qualifier"
       provider-name="Eclipse GEF"
       plugin="org.eclipse.gef.dot"
       license-feature="org.eclipse.license"

org.eclipse.gef.dot-feature/pom.xml

@@ -21,6 +21,6 @@
 	</parent>
 	<groupId>org.eclipse.gef.features</groupId>
 	<artifactId>org.eclipse.gef.dot</artifactId>
-	<version>5.0.500-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

org.eclipse.gef.dot.doc-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.gef.dot.doc"
       label="GEF DOT Developer Documentation"
-      version="5.0.500.qualifier"
+      version="5.1.0.qualifier"
       provider-name="Eclipse GEF"
       plugin="org.eclipse.gef.dot.doc"
       license-feature="org.eclipse.license"

org.eclipse.gef.dot.doc-feature/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.features</groupId>
 	<artifactId>org.eclipse.gef.dot.doc</artifactId>
-	<version>5.0.500-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<build>
 		<plugins>

org.eclipse.gef.dot.doc.user-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.gef.dot.doc.user"
       label="GEF DOT User Guide"
-      version="5.0.500.qualifier"
+      version="5.1.0.qualifier"
       provider-name="Eclipse GEF"
       plugin="org.eclipse.gef.dot.doc.user"
       license-feature="org.eclipse.license"

org.eclipse.gef.dot.doc.user-feature/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.features</groupId>
 	<artifactId>org.eclipse.gef.dot.doc.user</artifactId>
-	<version>5.0.500-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<build>
 		<plugins>

org.eclipse.gef.dot.doc.user/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF DOT User Guide
 Bundle-SymbolicName: org.eclipse.gef.dot.doc.user;singleton:=true
-Bundle-Version: 5.0.500.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-Vendor: Eclipse GEF

org.eclipse.gef.dot.doc.user/pom.xml

@@ -21,6 +21,6 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.dot.doc.user</artifactId>
-	<version>5.0.500-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.gef.dot.doc/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF DOT Developer Documentation
 Bundle-SymbolicName: org.eclipse.gef.dot.doc;singleton:=true
-Bundle-Version: 5.0.500.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-Vendor: Eclipse GEF
 Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)";resolution:=optional,

org.eclipse.gef.dot.doc/javadocOptions.txt

@@ -1,7 +1,7 @@
 -verbose
 -encoding "UTF-8"
 -charset "UTF-8"
--sourcepath "../org.eclipse.gef.dot/src@path.separator@../org.eclipse.gef.dot/src-gen@path.separator@../org.eclipse.gef.dot/xtend-gen@path.separator@../org.eclipse.gef.dot.ui/src@path.separator@../org.eclipse.gef.dot.ui/src-gen"
+-sourcepath "../org.eclipse.gef.dot/src@path.separator@../org.eclipse.gef.dot/src-gen@path.separator@../org.eclipse.gef.dot/emf-gen@path.separator@../org.eclipse.gef.dot/xtend-gen@path.separator@../org.eclipse.gef.dot.ide/src/@path.separator@../org.eclipse.gef.dot.ide/src-gen@path.separator@../org.eclipse.gef.dot.ui/src@path.separator@../org.eclipse.gef.dot.ui/src-gen"
 -d reference/api
 -classpath "@classpath@"
 -use

org.eclipse.gef.dot.doc/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.dot.doc</artifactId>
-	<version>5.0.500-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>

org.eclipse.gef.dot.examples/META-INF/MANIFEST.MF

@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF DOT Examples
 Bundle-SymbolicName: org.eclipse.gef.dot.examples
-Bundle-Version: 5.0.500.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-Vendor: Eclipse GEF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: 
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.gef.common;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.gef.dot;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.gef.dot.ide;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.gef.dot.ui;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.gef.geometry;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.gef.graph;bundle-version="[5.0.0,6.0.0)",

org.eclipse.gef.dot.generator/.settings/.api_filters

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.gef.dot.generator" version="2">
+    <resource path="xtext-generator-extensions/org/eclipse/gef/dot/internal/generator/DotGeneratorModule.java" type="org.eclipse.gef.dot.internal.generator.DotGeneratorModule$DotNaming">
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="TypeReference"/>
+                <message_argument value="DotNaming"/>
+                <message_argument value="getEclipsePluginActivator()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>

org.eclipse.gef.dot.generator/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: GEF DOT
 Bundle-SymbolicName: org.eclipse.gef.dot.generator;singleton:=true
 Bundle-Vendor: Eclipse GEF
-Bundle-Version: 5.0.300.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtend.core;bundle-version="[2.7.3,3.0.0)",
  org.eclipse.xtext;bundle-version="[2.7.3,3.0.0)",

org.eclipse.gef.dot.generator/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2016, 2017 itemis AG and others. All rights reserved. This program 
+<!-- Copyright (c) 2019 itemis AG and others. All rights reserved. This program 
 	and the accompanying materials are made available under the terms of the 
 	Eclipse Public License v1.0 which accompanies this distribution, and is available 
 	at http://www.eclipse.org/legal/epl-v10.html Contributors: Alexander Nyßen 
@@ -16,6 +16,6 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.dot.generator</artifactId>
-	<version>5.0.300-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.gef.dot.generator/xtext-generator-extensions/org/eclipse/gef/dot/internal/generator/DotGeneratorModule.java

@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2019 itemis AG and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alexander Nyßen (itemis AG) - initial API and implementation
+ *     
+ *******************************************************************************/
+package org.eclipse.gef.dot.internal.generator;
+
+import org.eclipse.xtext.Grammar;
+import org.eclipse.xtext.xtext.generator.DefaultGeneratorModule;
+import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
+import org.eclipse.xtext.xtext.generator.model.TypeReference;
+
+/**
+ * A custom generator module to bind a custom naming extension.
+ * 
+ * @author nyssen
+ *
+ */
+public class DotGeneratorModule extends DefaultGeneratorModule {
+
+	/**
+	 * Binds the naming of the Xtext generator to the custom naming extension.
+	 * 
+	 * @return A custom naming extension to properly name internal packages.
+	 */
+	public Class<? extends XtextGeneratorNaming> bindNaming() {
+		return DotNaming.class;
+	}
+
+	/**
+	 * This class enables the customization of the ide and ui package name
+	 * within the Xtext code generation workflow for the dot grammar (host
+	 * grammar and sub-grammars).
+	 */
+	public static class DotNaming extends XtextGeneratorNaming {
+
+		@Override
+		public String getGenericIdeBasePackage(Grammar g) {
+			if (g.getName()
+					.startsWith("org.eclipse.gef.dot.internal.language.Dot")) {
+				return "org.eclipse.gef.dot.internal.ide.language";
+			} else {
+				return super.getGenericIdeBasePackage(g);
+			}
+		}
+
+		@Override
+		public String getEclipsePluginBasePackage(Grammar g) {
+			if (g.getName()
+					.startsWith("org.eclipse.gef.dot.internal.language.Dot")) {
+				return "org.eclipse.gef.dot.internal.ui.language";
+			} else {
+				return super.getEclipsePluginBasePackage(g);
+			}
+		}
+
+		@Override
+		public String getRuntimeTestBasePackage(Grammar g) {
+			return "org.eclipse.gef.dot.tests";
+		}
+
+		@Override
+		public String getEclipsePluginTestBasePackage(Grammar g) {
+			return "org.eclipse.gef.dot.tests.ui";
+		}
+
+		@Override
+		public TypeReference getEclipsePluginActivator() {
+			return new TypeReference("org.eclipse.gef.dot.internal.ui.language",
+					"DotActivator");
+		}
+	}
+}

org.eclipse.gef.dot.ide/.classpath

@@ -0,0 +1,8 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

org.eclipse.gef.dot.ide/.project

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.gef.dot.ide</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

org.eclipse.gef.dot.ide/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.eclipse.gef.dot.ide/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=1.8

org.eclipse.gef.dot.ide/META-INF/MANIFEST.MF

@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.gef.dot.ide
+Bundle-ManifestVersion: 2
+Bundle-Name: GEF DOT
+Bundle-SymbolicName: org.eclipse.gef.dot.ide;singleton:=true
+Bundle-Vendor: Eclipse GEF
+Bundle-Version: 5.1.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.gef.dot;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.xtext.ide,org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+Export-Package: org.eclipse.gef.dot.internal.ide.language;x-internal:=true,
+ org.eclipse.gef.dot.internal.ide.language.contentassist.antlr;x-internal:=true,
+ org.eclipse.gef.dot.internal.ide.language.contentassist.antlr.internal;x-internal:=true,
+ org.eclipse.gef.dot.internal.ide.language.contentassist.antlr.lexer;x-internal:=true,
+ org.eclipse.gef.dot.internal.ide.language.highlighting.antlr.lexer;x-internal:=true
+

org.eclipse.gef.dot.ide/build.properties

@@ -0,0 +1,6 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/
+bin.excludes = **/*.xtend