Merge c74e613 into c987ae9

LorenzoBettini · Jan 3, 2018 · fdff718 · fdff718
2 parents c987ae9 + c74e613
commit fdff718
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 145 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -43,6 +43,6 @@ node {
        execPattern: '**/**.exec',
        sourcePattern: '**/edelta/src,**/edelta.ui/src,**/edelta.lib/src',
        classPattern: '**/edelta/**/classes,**/edelta.lib/**/classes,**/edelta.ui/**/classes',
-       exclusionPattern: '**/*Test*.class,**/edelta/edelta/**/*.class,**/antlr/**/*.class,**/serializer/*.class,**/*Abstract*RuntimeModule.class,**/*StandaloneSetup*.class,**/*Abstract*Validator.class,**/*GrammarAccess*.class,**/*Abstract*UiModule.class,**/*Abstract*ProposalProvider.class,**/internal/*.class,**/*NewProjectWizard.class,**/*ProjectCreator.class'])
+       exclusionPattern: '**/*Test*.class,**/edelta/edelta/**/*.class,**/antlr/**/*.class,**/serializer/*.class,**/*Abstract*RuntimeModule.class,**/*StandaloneSetup*.class,**/*Abstract*Validator.class,**/*GrammarAccess*.class,**/*Abstract*UiModule.class,**/**ExecutableExtensionFactory.class,**/*Abstract*ProposalProvider.class,**/internal/*.class,**/*NewProjectWizard.class,**/*ProjectCreator.class'])
    }
 }
diff --git a/edelta.parent/edelta.feature/feature.xml b/edelta.parent/edelta.feature/feature.xml
@@ -6,8 +6,8 @@
       provider-name="Lorenzo Bettini">
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.12.0" match="equivalent"/>
-      <import feature="org.eclipse.xtext.ui" version="2.12.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.13.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.ui" version="2.13.0" match="equivalent"/>
       <import plugin="org.eclipse.pde.ui"/>
    </requires>
 

diff --git a/edelta.parent/edelta.mwe2/META-INF/MANIFEST.MF b/edelta.parent/edelta.mwe2/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-Vendor: Lorenzo Bettini
 Bundle-Version: 0.2.1.qualifier
 Bundle-SymbolicName: edelta.mwe2;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.xtext.generator
+Require-Bundle: org.eclipse.xtext.xtext.generator,
+ org.eclipse.emf.mwe.utils
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: edelta.mwe2
 Import-Package: org.apache.log4j
diff --git a/edelta.parent/edelta.mwe2/build.properties b/edelta.parent/edelta.mwe2/build.properties
@@ -6,7 +6,6 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.xtext.common.types,\
                      org.eclipse.xtext.xtext.generator,\
                      org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
                      org.eclipse.emf.mwe2.launch,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\

diff --git a/edelta.parent/edelta.target/edelta.target.target b/edelta.parent/edelta.target/edelta.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="edelta.target" sequenceNumber="2">
+<target name="edelta.target" sequenceNumber="3">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -20,7 +20,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0/"/>
 </location>
 </locations>
 </target>
diff --git a/edelta.parent/edelta.tests.parent/pom.xml b/edelta.parent/edelta.tests.parent/pom.xml
@@ -1,62 +1,63 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edelta</groupId>
-		<artifactId>edelta.parent</artifactId>
-		<version>0.2.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>edelta.tests.parent</artifactId>
-	<packaging>pom</packaging>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>edelta</groupId>
+    <artifactId>edelta.parent</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>edelta.tests.parent</artifactId>
+  <packaging>pom</packaging>
 
-	<properties>
-		<jacoco-version>0.7.9</jacoco-version>
-		<os-jvm-flags />
-	</properties>
+  <properties>
+    <jacoco-version>0.7.9</jacoco-version>
+    <os-jvm-flags />
+  </properties>
 
-	<profiles>
-		<profile>
-			<id>jacoco</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>${jacoco-version}</version>
-						<configuration>
-							<excludes>
-								<!-- EMF model Java classes -->
-								<exclude>**/edelta/edelta/**/*.class</exclude>
-								<!-- Antlr generated Java classes -->
-								<exclude>**/antlr/**/*.class</exclude>
-								<!-- We don't have a custom serializer -->
-								<exclude>**/serializer/*.class</exclude>
-								<!-- generated files -->
-								<exclude>**/*Abstract*RuntimeModule.class</exclude>
-								<exclude>**/*StandaloneSetup*.class</exclude>
-								<exclude>**/*Abstract*Validator.class</exclude>
-								<exclude>**/*GrammarAccess*.class</exclude>
-								<exclude>**/*Abstract*UiModule.class</exclude>
-								<exclude>**/*Abstract*ProposalProvider.class</exclude>
-								<exclude>**/internal/*.class</exclude>
-								<exclude>**/*NewProjectWizard.class</exclude>
-								<exclude>**/*ProjectCreator.class</exclude>
-							</excludes>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+  <profiles>
+    <profile>
+      <id>jacoco</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${jacoco-version}</version>
+            <configuration>
+              <excludes>
+                <!-- EMF model Java classes -->
+                <exclude>**/edelta/edelta/**/*.class</exclude>
+                <!-- Antlr generated Java classes -->
+                <exclude>**/antlr/**/*.class</exclude>
+                <!-- We don't have a custom serializer -->
+                <exclude>**/serializer/*.class</exclude>
+                <!-- generated files -->
+                <exclude>**/*Abstract*RuntimeModule.class</exclude>
+                <exclude>**/*StandaloneSetup*.class</exclude>
+                <exclude>**/*Abstract*Validator.class</exclude>
+                <exclude>**/*GrammarAccess*.class</exclude>
+                <exclude>**/*Abstract*UiModule.class</exclude>
+                <exclude>**/**ExecutableExtensionFactory.class</exclude>
+                <exclude>**/*Abstract*ProposalProvider.class</exclude>
+                <exclude>**/internal/*.class</exclude>
+                <exclude>**/*NewProjectWizard.class</exclude>
+                <exclude>**/*ProjectCreator.class</exclude>
+              </excludes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/edelta.parent/edelta.tests/META-INF/MANIFEST.MF b/edelta.parent/edelta.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: edelta,
  edelta.testutils,
  org.junit;bundle-version="4.7.0",
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
  org.eclipse.xtext.ecore,
  org.eclipse.jdt.core,

diff --git a/edelta.parent/edelta.ui/META-INF/MANIFEST.MF b/edelta.parent/edelta.ui/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: edelta.ui
-Bundle-Vendor: Lorenzo Bettini
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: edelta.ui
+Bundle-Vendor: Lorenzo Bettini
 Bundle-Version: 0.2.1.qualifier
-Bundle-SymbolicName: edelta.ui; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: edelta,
- edelta.ide,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.ui,
- org.eclipse.xtext.xbase.ui,
- org.eclipse.compare,
- org.eclipse.xtext.builder,
- org.eclipse.jdt.debug.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources
-Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: edelta.ui.contentassist,
- edelta.ui.internal,
- edelta.ui.quickfix,
- edelta.ui.wizard
-Bundle-Activator: edelta.ui.internal.EdeltaActivator
+Bundle-SymbolicName: edelta.ui; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: edelta,
+ edelta.ide,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.ui,
+ org.eclipse.xtext.xbase.ui,
+ org.eclipse.compare,
+ org.eclipse.xtext.builder,
+ org.eclipse.jdt.debug.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: edelta.ui.contentassist,
+ edelta.ui.internal,
+ edelta.ui.quickfix,
+ edelta.ui.wizard
+Bundle-Activator: edelta.ui.internal.EdeltaActivator
diff --git a/edelta.parent/edelta.ui/plugin.xml b/edelta.parent/edelta.ui/plugin.xml
@@ -205,6 +205,15 @@
 			</activeWhen>
 		</handler>
 	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="edelta"
+			id="edelta.Edelta.contenttype"
+			name="Edelta File"
+			priority="normal">
+		</content-type>
+	</extension>
 	<!-- adding resource factories -->
 	<extension
 		point="org.eclipse.emf.ecore.extension_parser">

diff --git a/edelta.parent/edelta.ui/plugin.xml_gen b/edelta.parent/edelta.ui/plugin.xml_gen
@@ -205,6 +205,15 @@
 			</activeWhen>
 		</handler>
 	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="edelta"
+			id="edelta.Edelta.contenttype"
+			name="Edelta File"
+			priority="normal">
+		</content-type>
+	</extension>
 	<!-- adding resource factories -->
 	<extension
 		point="org.eclipse.emf.ecore.extension_parser">

diff --git a/edelta.parent/edelta.ui/src/edelta/ui/EdeltaUiModule.xtend b/edelta.parent/edelta.ui/src/edelta/ui/EdeltaUiModule.xtend
@@ -1,12 +1,7 @@
-/*
- * generated by Xtext 2.10.0
- */
 package edelta.ui
 
 import edelta.ui.wizard.EdeltaProjectCreatorCustom
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import org.eclipse.xtext.ui.editor.model.IResourceForEditorInputFactory
-import org.eclipse.xtext.xbase.ui.editor.XbaseResourceForEditorInputFactory
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
@@ -18,8 +13,4 @@ class EdeltaUiModule extends AbstractEdeltaUiModule {
 		EdeltaProjectCreatorCustom
 	}
 
-	override Class<? extends IResourceForEditorInputFactory> bindIResourceForEditorInputFactory() {
-		return XbaseResourceForEditorInputFactory
-	}
-
 }
diff --git a/edelta.parent/edelta/META-INF/MANIFEST.MF b/edelta.parent/edelta/META-INF/MANIFEST.MF
@@ -1,40 +1,40 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: edelta
-Bundle-Vendor: Lorenzo Bettini
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: edelta
+Bundle-Vendor: Lorenzo Bettini
 Bundle-Version: 0.2.1.qualifier
-Bundle-SymbolicName: edelta; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.xbase,
- org.eclipse.equinox.common;bundle-version="3.5.0",
- org.eclipse.emf.ecore,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib,
- org.antlr.runtime,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtend.lib,
- org.eclipse.emf.common,
- edelta.lib;visibility:=reexport,
- edelta.mwe2;resolution:=optional,
- org.eclipse.jdt.core,
- org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: edelta,
- edelta.compiler,
- edelta.edelta,
- edelta.edelta.impl,
- edelta.edelta.util,
- edelta.interpreter,
- edelta.jvmmodel,
- edelta.parser.antlr,
- edelta.parser.antlr.internal,
- edelta.resource,
- edelta.scoping,
- edelta.serializer,
- edelta.services,
- edelta.typesystem,
- edelta.util,
- edelta.validation
-Import-Package: org.apache.log4j
+Bundle-SymbolicName: edelta; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.xbase,
+ org.eclipse.equinox.common;bundle-version="3.5.0",
+ org.eclipse.emf.ecore,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
+ org.antlr.runtime,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtend.lib;bundle-version="2.13.0",
+ org.eclipse.emf.common,
+ edelta.lib;visibility:=reexport,
+ edelta.mwe2;resolution:=optional,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: edelta,
+ edelta.compiler,
+ edelta.edelta,
+ edelta.edelta.impl,
+ edelta.edelta.util,
+ edelta.interpreter,
+ edelta.jvmmodel,
+ edelta.parser.antlr,
+ edelta.parser.antlr.internal,
+ edelta.resource,
+ edelta.scoping,
+ edelta.serializer,
+ edelta.services,
+ edelta.typesystem,
+ edelta.util,
+ edelta.validation
+Import-Package: org.apache.log4j
diff --git a/edelta.parent/launches/edelta.parent clean verify.launch b/edelta.parent/launches/edelta.parent clean verify.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:edelta.parent}"/>
+</launchConfiguration>