[contribs] Upgrade Python generator dependencies to Eclipse Oxygen.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Jul 18, 2017 · 9073e3c · 9073e3c
1 parent a60a503
commit 9073e3c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 37 deletions.
diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml
@@ -224,14 +224,16 @@
    <requires>
       <import plugin="io.sarl.lang" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.ui" version="0.6.0" match="greaterOrEqual"/>
+      <import plugin="io.sarl.eclipse" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util" version="2.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.core" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.11.3" match="greaterOrEqual"/>
-      <import plugin="io.sarl.eclipse" version="0.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.forms" version="3.7.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.builder" version="2.12.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Require-Bundle: io.sarl.lang;bundle-version="0.6.0",
  org.eclipse.xtext.ui;bundle-version="2.12.0",
  org.eclipse.xtend.core;bundle-version="2.12.0",
  javax.inject;bundle-version="1.0.0",
- org.eclipse.osgi;bundle-version="3.11.3",
- org.eclipse.ui.forms;bundle-version="3.7.1",
+ org.eclipse.osgi;bundle-version="3.12.0",
+ org.eclipse.ui.forms;bundle-version="3.7.100",
  org.eclipse.xtext.builder;bundle-version="2.12.0"
 Export-Package: io.sarl.pythongenerator,
  io.sarl.pythongenerator.configuration,

diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/plugin.xml b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/plugin.xml
@@ -6,7 +6,7 @@
       <extraGenerator
             configuration="io.sarl.pythongenerator.PyExecutableExtensionFactory:io.sarl.pythongenerator.configuration.PyOutputConfigurationProvider"
             generator="io.sarl.pythongenerator.PyExecutableExtensionFactory:io.sarl.pythongenerator.generator.PyGeneratorProvider"
-            validator="io.sarl.pythongenerator.PyExecutableExtensionFactory:io.sarl.pythongenerator.validator.PyValidator"
+            validator="io.sarl.pythongenerator.PyExecutableExtensionFactory:io.sarl.pythongenerator.validator.PyValidatorProvider"
             preferences="io.sarl.pythongenerator.PyExecutableExtensionFactory:io.sarl.pythongenerator.configuration.PyPreferenceInitializer">
       </extraGenerator>
    </extension>

diff --git a/...tor/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java b/...tor/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java
@@ -112,7 +112,7 @@ public void checkImportsMapping(XImportDeclaration importDeclaration) {
 		doTypeMappingCheck(importDeclaration, type, this.typeErrorHandler);
 	}
 
-	/** Check that member feature calls have a convertion mapping.
+	/** Check that member feature calls have a conversion mapping.
 	 *
 	 * @param featureCall the feature call.
 	 */

diff --git a/dev-tools/eclipse_workingsets.xml b/dev-tools/eclipse_workingsets.xml
@@ -1,72 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workingSetManager>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017497079_2" label="Plugins" name="Plugins">
-<item elementID="=io.sarl.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.eclipse" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.lang.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.lang.mwe2" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.lang" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.lang.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.m2e" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.plugins" type="4"/>
+<item elementID="=io.sarl.lang.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.util" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.m2e" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.lang.mwe2" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.eclipse" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017504015_3" label="Features" name="Features">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.baseplatform" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.compiler" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.features" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.ide" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.baseplatform" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.lib" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.ide" type="4"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017509351_4" label="Tests" name="Tests">
+<item elementID="=sarl-maven-plugin.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.tests.testdata" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.core.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.eclipse.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.lang.core.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.lang.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.lang.ui.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.m2e.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.tests" type="4"/>
 <item elementID="=io.sarl.tests.api" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.tests.api.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.tests.testdata" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.util.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=sarl-maven-plugin.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.lang.core.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.tests" type="4"/>
+<item elementID="=io.sarl.lang.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.maven.docs.generator.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017516240_5" label="SRE" name="SRE">
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.janusproject" type="4"/>
+<item elementID="=io.janusproject.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.janusproject.feature" type="4"/>
 <item elementID="=io.janusproject.kernel" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.janusproject.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.janusproject.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.sre" type="4"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017525200_6" label="Maven" name="Maven">
-<item elementID="=io.sarl.maven.batchcompiler" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.maven" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.maven.internal" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.maven.external" type="4"/>
+<item elementID="=io.sarl.maven.batchcompiler" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.maven.docs.generator" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.maven.docs.testing" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.maven.baselib" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.maven.sdk" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=io.sarl.maven.sre" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=sarl-maven-plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.maven.external" type="4"/>
+<item elementID="=io.sarl.maven.baselib" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017536048_7" label="Contributions" name="Contributions">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.examples" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.examples.feature" type="4"/>
-<item elementID="=io.sarl.examples.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.examples.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.experienceindex.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.examples" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.experienceindex" type="4"/>
+<item elementID="=io.sarl.examples.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.experienceindex.feature" type="4"/>
-<item elementID="=io.sarl.experienceindex.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=io.sarl.experienceindex.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=io.sarl.examples.tests" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.products.contribs" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.pythongenerator" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.pythongenerator.feature" type="4"/>
+<item elementID="=io.sarl.pythongenerator.plugin" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017551937_8" label="Product Engineering" name="Product Engineering">
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.lang.targetplatform" type="4"/>
-<item elementID="=io.sarl.lang.sarlc" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.lang.updatesite" type="4"/>
+<item elementID="=io.sarl.lang.sarlc" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/io.sarl.products" type="4"/>
 </workingSet>
 <workingSet editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1480017558193_9" label="Documentation" name="Documentation">
@@ -84,4 +81,5 @@
 <workingSet IMemento.internal.id="SRE"/>
 <workingSet IMemento.internal.id="Tests"/>
 </workingSet>
-</workingSetManager>
+<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1500311244769_11" label="Window Working Set" name="Aggregate for window 1500310837567"/>
+</workingSetManager>
diff --git a/products/updatesite/io.sarl.lang.product b/products/updatesite/io.sarl.lang.product
@@ -33,7 +33,6 @@
    <launcher name="eclipse-sarl">
       <linux icon="icons/sarl.xpm"/>
       <macosx icon="icons/sarl.icns"/>
-      <solaris/>
       <win useIco="true">
          <ico path="icons/sarl.ico"/>
          <bmp/>