From 5c095d62a99ad3ae51a682b8af9dc6ad68f63372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Galland?= Date: Fri, 22 Mar 2019 23:33:55 +0100 Subject: [PATCH] [all] Upgrade to Eclipse 2019-03. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Galland --- .../io.sarl.examples.feature/feature.xml | 12 +-- .../META-INF/MANIFEST.MF | 12 +-- .../io.sarl.examples.plugin/build.xml | 2 +- .../src-templates/build.xml | 2 +- .../feature.xml | 12 +-- .../META-INF/MANIFEST.MF | 12 +-- .../feature.xml | 16 ++-- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/MANIFEST.MF | 6 +- .../latex/sarl-beamer-listing.sty | 2 +- .../latex/sarl-colorized-listing.sty | 2 +- formatting-styles/latex/sarl-listing.sty | 2 +- .../io.sarl.javafx/META-INF/MANIFEST.MF | 2 +- .../io.sarl.util/META-INF/MANIFEST.MF | 2 +- .../io.sarl.eclipse/META-INF/MANIFEST.MF | 42 +++++------ main/coreplugins/io.sarl.eclipse/splash.bmp | Bin 409634 -> 409634 bytes .../io.sarl.lang.core/META-INF/MANIFEST.MF | 2 +- .../src-gen/io/sarl/lang/SARLVersion.java | 2 +- .../io.sarl.lang.mwe2/META-INF/MANIFEST.MF | 26 +++---- .../src/io/sarl/lang/mwe2/GenerateSARL2.mwe2 | 8 ++ .../io.sarl.lang.ui/META-INF/MANIFEST.MF | 30 ++++---- .../io/sarl/lang/ui/AbstractSARLUiModule.java | 7 ++ .../ui/editor/IDocumentAutoFormatter.java | 2 - .../io.sarl.lang/META-INF/MANIFEST.MF | 26 +++---- .../src-gen/io/sarl/lang/sarl/SarlAction.java | 4 - .../src-gen/io/sarl/lang/sarl/SarlAgent.java | 4 - .../io/sarl/lang/sarl/SarlArtifact.java | 4 - .../sarl/lang/sarl/SarlAssertExpression.java | 12 --- .../io/sarl/lang/sarl/SarlBehavior.java | 4 - .../io/sarl/lang/sarl/SarlBehaviorUnit.java | 12 --- .../io/sarl/lang/sarl/SarlCapacity.java | 4 - .../io/sarl/lang/sarl/SarlCapacityUses.java | 4 - .../src-gen/io/sarl/lang/sarl/SarlEvent.java | 4 - .../sarl/lang/sarl/SarlFormalParameter.java | 4 - .../sarl/lang/sarl/SarlRequiredCapacity.java | 4 - .../src-gen/io/sarl/lang/sarl/SarlSkill.java | 8 -- .../src-gen/io/sarl/lang/sarl/SarlSpace.java | 4 - .../sarl/lang/sarl/impl/SarlActionImpl.java | 1 + .../io/sarl/lang/sarl/impl/SarlAgentImpl.java | 4 + .../sarl/lang/sarl/impl/SarlArtifactImpl.java | 3 + .../sarl/impl/SarlAssertExpressionImpl.java | 6 ++ .../sarl/lang/sarl/impl/SarlBehaviorImpl.java | 4 + .../lang/sarl/impl/SarlBehaviorUnitImpl.java | 6 ++ .../sarl/lang/sarl/impl/SarlCapacityImpl.java | 1 + .../lang/sarl/impl/SarlCapacityUsesImpl.java | 1 + .../io/sarl/lang/sarl/impl/SarlEventImpl.java | 3 + .../sarl/lang/sarl/impl/SarlFactoryImpl.java | 24 ++++++ .../sarl/impl/SarlFormalParameterImpl.java | 2 + .../sarl/lang/sarl/impl/SarlPackageImpl.java | 42 +++++++++++ .../sarl/impl/SarlRequiredCapacityImpl.java | 1 + .../io/sarl/lang/sarl/impl/SarlSkillImpl.java | 5 ++ .../io/sarl/lang/sarl/impl/SarlSpaceImpl.java | 3 + .../compiler/batch/JavacBatchCompiler.java | 5 +- .../io.sarl.m2e/META-INF/MANIFEST.MF | 24 +++--- .../features/io.sarl.baseplatform/feature.xml | 26 ++----- main/features/io.sarl.compiler/feature.xml | 71 +++++++++--------- main/features/io.sarl.ide/feature.xml | 62 +++++++-------- main/features/io.sarl.lib/feature.xml | 6 +- .../io.sarl.lang.targetplatform.target | 39 +++++----- pom.xml | 16 +++- products/updatesite/io.sarl.lang.product | 8 +- .../META-INF/MANIFEST.MF | 14 ++-- .../io.janusproject.feature/feature.xml | 20 ++--- .../META-INF/MANIFEST.MF | 2 +- tycho-parent/pom.xml | 7 +- 65 files changed, 377 insertions(+), 342 deletions(-) diff --git a/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml b/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml index 15053a8db5..f0325e5953 100644 --- a/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml +++ b/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml @@ -224,12 +224,12 @@ - - - - - - + + + + + + - + diff --git a/contribs/io.sarl.examples/io.sarl.examples.plugin/src-templates/build.xml b/contribs/io.sarl.examples/io.sarl.examples.plugin/src-templates/build.xml index 6569303243..c16853638f 100644 --- a/contribs/io.sarl.examples/io.sarl.examples.plugin/src-templates/build.xml +++ b/contribs/io.sarl.examples/io.sarl.examples.plugin/src-templates/build.xml @@ -24,7 +24,7 @@ - + diff --git a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml index 2ad10a1bdf..0c8c24b675 100644 --- a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml +++ b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml @@ -225,13 +225,13 @@ - - - - - - + + + + + + - - - - - - - - + + + + + + + + OWoCFy1AUGwRvmKa++CQrxGzWNN6gXmoQCSr~NoT z`XQ6>l9z-oNBULGeh3ErPy}<5mkcpQMbwF6Py5zsNQbkt_j|tQd*A1MzxVq(ZKpeJ zr)^DwH`M2NHf}87NI-9IFXK$$PF|)2fqsaFyLpxRMO(+l#`gC1qN8I(A~9aG*?e$t z;BYw7($Zm&XM1~lcz9T$xIjR7BxHWb8wAJKXw3e*+V`)#WeSUlD=INfPEKxaZjO&n zPjP{1R2yxzSZXj=R#r};b#!zfgT%x{ zqGEb_TBVA$+3LZu+n*ki#t(Uemn>FkTwlJzmHFxOkc`{s)d>+&d0dR#+OsOJk^!g0M=xsI|4V@YB@v2t&Kw z4*S7_YBJ>~)LU+#EX%H}tgNrE&(F_;s?#MCD*u&AWscdRU}oqd_rpkOY3s|EeY?B6 zs7FObC00~b-3OOwL$V}2};C#vF=H`$Z&q31=a?jw9P-_UyGKJ)nhv@T!8m%fm zVPGx&M<&;lFjz;11A6~%a!`(^T{TT4sJFx}PFtyW)JTwH`*Qepzm zzfzf;H5e!z7m-J$)7G4vo8Yv!w~vgBtgf!gWO6WxEZ}(1>DURr(+Rk|yzGE^VB(X&zhow%= z39Mb()lMmKu1UIe!rhkYNUYZ)#|+Y`Gwux-ShKvxL_m#vCf!S z(M+%;N0Tg5a8@lFCxk$yN}HXXMF<7}C>P9Ug|Rete}8{@dD(34;Pv{83j4@%g%Jp7I>I&pJi z0@kjsZcKpj@p0QQ}6R#vvt>4dAd_pM{HkpEf16bU$U4I5>Ia&>jp>s ztQ#9Yj*gCqGm|p!i;MJ$h9)AGsI|!oRd`)3mODK?g?(gX zghXv_Zh~fHWMTq<5Ud7R#Hx@UU1cSK?5h z!B7F?+S(e;+R^cvB>v+02A7RO4DAoHI3{z$jnDVgGmpsUJoov0gM))ZLqpr! zzEJq3UIj+WEiEmfk&rd){Pz+UlxEevn)~ee_1jN6JXxx^EWi$h4_wGO18kHAEsYHS zc>+?I{P6G)+2nEsCcxI#7Ha3+%}fa?I|ixHx9|dl4*V8}JAUnUu2x)9ooF=Sj)`@Z zlKTZo3MHDG>`6#>M<z+1Uj!Ha12#5EKJcCReCb>29|hw4tGq z>?Z;plR11$D^o^libVzzOHx71b()z3R-!59K1DFXaMyFDd^RqGq6=}}xP;~9PZ6b5 zs%B bindIXtextEditorCallback() { return SARLNatureAddingEditorCallback.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindIDocumentAutoFormatter() { + return DocumentAutoFormatter.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindIExtraLanguageContributions() { return ExtensionPointExtraLanguageContributions.class; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java index ec8fd6073a..94d3b9142c 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java @@ -21,7 +21,6 @@ package io.sarl.lang.ui.editor; -import com.google.inject.ImplementedBy; import org.eclipse.jface.text.formatter.IContentFormatter; import org.eclipse.xtext.ui.editor.model.IXtextDocument; @@ -32,7 +31,6 @@ * @mavengroupid $GroupId$ * @mavenartifactid $ArtifactId$ */ -@ImplementedBy(DocumentAutoFormatter.class) public interface IDocumentAutoFormatter { /** Create an instance of document auto formatter. diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF index 90182d8a18..e8d0c5fced 100644 --- a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF +++ b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF @@ -8,22 +8,22 @@ Automatic-Module-Name: io.sarl.lang Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0";visibility:=reexport, - org.eclipse.xtend.core;bundle-version="2.15.0", - org.eclipse.xtext;bundle-version="2.15.0", - org.eclipse.xtext.xbase;bundle-version="2.15.0", - org.eclipse.xtext.xbase.lib;bundle-version="2.15.0", - org.eclipse.xtext.common.types;bundle-version="2.15.0", - org.eclipse.xtext.util;bundle-version="2.15.0", - org.eclipse.emf.codegen;bundle-version="2.14.0", - org.eclipse.osgi;bundle-version="3.13.100", + org.eclipse.xtend.core;bundle-version="2.17.0", + org.eclipse.xtext;bundle-version="2.17.0", + org.eclipse.xtext.xbase;bundle-version="2.17.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.17.0", + org.eclipse.xtext.common.types;bundle-version="2.17.0", + org.eclipse.xtext.util;bundle-version="2.17.0", + org.eclipse.emf.codegen;bundle-version="2.15.0", + org.eclipse.osgi;bundle-version="3.13.300", org.antlr.runtime;bundle-version="3.2.0", - org.objectweb.asm;bundle-version="6.2.1";resolution:=optional, - org.eclipse.jdt.core;bundle-version="3.15.0", - org.eclipse.emf.ecore;bundle-version="2.15.0", + org.objectweb.asm;bundle-version="7.0.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.17.0", + org.eclipse.emf.ecore;bundle-version="2.17.0", org.eclipse.emf.common;bundle-version="2.15.0", - org.eclipse.core.runtime;bundle-version="3.15.0", + org.eclipse.core.runtime;bundle-version="3.15.200", org.slf4j.api;bundle-version="1.7.2", - org.apache.commons.io;bundle-version="2.2.0" + org.apache.commons.io;bundle-version="2.6.0" Bundle-Activator: io.sarl.lang.SARLLangActivator Export-Package: io.sarl.lang, io.sarl.lang.bugfixes.pending.bug621, diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAction.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAction.java index ae603bb783..c395d8464e 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAction.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAction.java @@ -30,10 +30,6 @@ public interface SarlAction extends XtendFunction * Returns the value of the 'Fired Events' containment reference list. * The list contents are of type {@link org.eclipse.xtext.common.types.JvmTypeReference}. * - *

- * If the meaning of the 'Fired Events' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Fired Events' containment reference list. * @see io.sarl.lang.sarl.SarlPackage#getSarlAction_FiredEvents() diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAgent.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAgent.java index d0375e85cd..89ad1a3834 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAgent.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAgent.java @@ -27,10 +27,6 @@ public interface SarlAgent extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlArtifact.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlArtifact.java index 9eb4b8bba7..d0f5a5d4c4 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlArtifact.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlArtifact.java @@ -27,10 +27,6 @@ public interface SarlArtifact extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAssertExpression.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAssertExpression.java index a37ce0ef8e..7393155348 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAssertExpression.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlAssertExpression.java @@ -31,10 +31,6 @@ public interface SarlAssertExpression extends XExpression /** * Returns the value of the 'Condition' containment reference. * - *

- * If the meaning of the 'Condition' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Condition' containment reference. * @see #setCondition(XExpression) @@ -57,10 +53,6 @@ public interface SarlAssertExpression extends XExpression /** * Returns the value of the 'Message' attribute. * - *

- * If the meaning of the 'Message' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Message' attribute. * @see #setMessage(String) @@ -83,10 +75,6 @@ public interface SarlAssertExpression extends XExpression /** * Returns the value of the 'Is Static' attribute. * - *

- * If the meaning of the 'Is Static' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Is Static' attribute. * @see #setIsStatic(boolean) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehavior.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehavior.java index e1c2a45d80..157dba19b6 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehavior.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehavior.java @@ -27,10 +27,6 @@ public interface SarlBehavior extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehaviorUnit.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehaviorUnit.java index d3e922184f..fd9b5748da 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehaviorUnit.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlBehaviorUnit.java @@ -31,10 +31,6 @@ public interface SarlBehaviorUnit extends XtendMember /** * Returns the value of the 'Name' containment reference. * - *

- * If the meaning of the 'Name' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Name' containment reference. * @see #setName(JvmParameterizedTypeReference) @@ -57,10 +53,6 @@ public interface SarlBehaviorUnit extends XtendMember /** * Returns the value of the 'Guard' containment reference. * - *

- * If the meaning of the 'Guard' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Guard' containment reference. * @see #setGuard(XExpression) @@ -83,10 +75,6 @@ public interface SarlBehaviorUnit extends XtendMember /** * Returns the value of the 'Expression' containment reference. * - *

- * If the meaning of the 'Expression' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Expression' containment reference. * @see #setExpression(XExpression) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacity.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacity.java index feb650a80c..9c359060a5 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacity.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacity.java @@ -30,10 +30,6 @@ public interface SarlCapacity extends XtendTypeDeclaration * Returns the value of the 'Extends' containment reference list. * The list contents are of type {@link org.eclipse.xtext.common.types.JvmParameterizedTypeReference}. * - *

- * If the meaning of the 'Extends' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference list. * @see io.sarl.lang.sarl.SarlPackage#getSarlCapacity_Extends() diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacityUses.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacityUses.java index dd34be0c7e..9dccdc7e01 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacityUses.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlCapacityUses.java @@ -30,10 +30,6 @@ public interface SarlCapacityUses extends XtendMember * Returns the value of the 'Capacities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.common.types.JvmParameterizedTypeReference}. * - *

- * If the meaning of the 'Capacities' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Capacities' containment reference list. * @see io.sarl.lang.sarl.SarlPackage#getSarlCapacityUses_Capacities() diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlEvent.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlEvent.java index d31949e694..471c60dfd2 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlEvent.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlEvent.java @@ -27,10 +27,6 @@ public interface SarlEvent extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlFormalParameter.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlFormalParameter.java index 224761bcbc..69f7904188 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlFormalParameter.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlFormalParameter.java @@ -27,10 +27,6 @@ public interface SarlFormalParameter extends XtendParameter /** * Returns the value of the 'Default Value' containment reference. * - *

- * If the meaning of the 'Default Value' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Default Value' containment reference. * @see #setDefaultValue(XExpression) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlRequiredCapacity.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlRequiredCapacity.java index 0e725a79a2..22aa4d3e29 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlRequiredCapacity.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlRequiredCapacity.java @@ -30,10 +30,6 @@ public interface SarlRequiredCapacity extends XtendMember * Returns the value of the 'Capacities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.common.types.JvmParameterizedTypeReference}. * - *

- * If the meaning of the 'Capacities' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Capacities' containment reference list. * @see io.sarl.lang.sarl.SarlPackage#getSarlRequiredCapacity_Capacities() diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSkill.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSkill.java index 04d7bba1c3..52b0e8c0d8 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSkill.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSkill.java @@ -30,10 +30,6 @@ public interface SarlSkill extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) @@ -57,10 +53,6 @@ public interface SarlSkill extends XtendTypeDeclaration * Returns the value of the 'Implements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.common.types.JvmParameterizedTypeReference}. * - *

- * If the meaning of the 'Implements' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Implements' containment reference list. * @see io.sarl.lang.sarl.SarlPackage#getSarlSkill_Implements() diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSpace.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSpace.java index 27e959d859..d6e81f814d 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSpace.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/SarlSpace.java @@ -27,10 +27,6 @@ public interface SarlSpace extends XtendTypeDeclaration /** * Returns the value of the 'Extends' containment reference. * - *

- * If the meaning of the 'Extends' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extends' containment reference. * @see #setExtends(JvmParameterizedTypeReference) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlActionImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlActionImpl.java index 1510df5d32..cd72285f81 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlActionImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlActionImpl.java @@ -72,6 +72,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public EList getFiredEvents() { if (firedEvents == null) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAgentImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAgentImpl.java index b9dbd59eea..849b5c7dcc 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAgentImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAgentImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -95,6 +96,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -116,6 +118,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method @@ -128,6 +131,7 @@ public boolean isAbstract() * * @generated */ + @Override public boolean isStrictFloatingPoint() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlArtifactImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlArtifactImpl.java index 0a0aa8f1a8..1c024158b2 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlArtifactImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlArtifactImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -95,6 +96,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -116,6 +118,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAssertExpressionImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAssertExpressionImpl.java index 0ce1991728..bdca60227b 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAssertExpressionImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlAssertExpressionImpl.java @@ -111,6 +111,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public XExpression getCondition() { return condition; @@ -138,6 +139,7 @@ public NotificationChain basicSetCondition(XExpression newCondition, Notificatio * * @generated */ + @Override public void setCondition(XExpression newCondition) { if (newCondition != condition) @@ -159,6 +161,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public String getMessage() { return message; @@ -169,6 +172,7 @@ public String getMessage() * * @generated */ + @Override public void setMessage(String newMessage) { String oldMessage = message; @@ -182,6 +186,7 @@ public void setMessage(String newMessage) * * @generated */ + @Override public boolean isIsStatic() { return isStatic; @@ -192,6 +197,7 @@ public boolean isIsStatic() * * @generated */ + @Override public void setIsStatic(boolean newIsStatic) { boolean oldIsStatic = isStatic; diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorImpl.java index d7dc71d2f0..89fbf3cce1 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -95,6 +96,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -116,6 +118,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method @@ -128,6 +131,7 @@ public boolean isAbstract() * * @generated */ + @Override public boolean isStrictFloatingPoint() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorUnitImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorUnitImpl.java index c46007a9cb..2ba3faafe4 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorUnitImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlBehaviorUnitImpl.java @@ -92,6 +92,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getName() { return name; @@ -119,6 +120,7 @@ public NotificationChain basicSetName(JvmParameterizedTypeReference newName, Not * * @generated */ + @Override public void setName(JvmParameterizedTypeReference newName) { if (newName != name) @@ -140,6 +142,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public XExpression getGuard() { return guard; @@ -167,6 +170,7 @@ public NotificationChain basicSetGuard(XExpression newGuard, NotificationChain m * * @generated */ + @Override public void setGuard(XExpression newGuard) { if (newGuard != guard) @@ -188,6 +192,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public XExpression getExpression() { return expression; @@ -215,6 +220,7 @@ public NotificationChain basicSetExpression(XExpression newExpression, Notificat * * @generated */ + @Override public void setExpression(XExpression newExpression) { if (newExpression != expression) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityImpl.java index 0ebc2c5c67..9c93b7fcbf 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityImpl.java @@ -72,6 +72,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public EList getExtends() { if (extends_ == null) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityUsesImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityUsesImpl.java index 9f1089a6a8..ad87df4c04 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityUsesImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlCapacityUsesImpl.java @@ -72,6 +72,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public EList getCapacities() { if (capacities == null) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlEventImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlEventImpl.java index 25f7f4cd6d..509f7f74a5 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlEventImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlEventImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -95,6 +96,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -116,6 +118,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFactoryImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFactoryImpl.java index 16ec3c13bf..1e533a6c50 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFactoryImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFactoryImpl.java @@ -97,6 +97,7 @@ public EObject create(EClass eClass) * * @generated */ + @Override public SarlScript createSarlScript() { SarlScriptImpl sarlScript = new SarlScriptImpl(); @@ -108,6 +109,7 @@ public SarlScript createSarlScript() * * @generated */ + @Override public SarlField createSarlField() { SarlFieldImplCustom sarlField = new SarlFieldImplCustom(); @@ -120,6 +122,7 @@ public SarlField createSarlField() * @since 0.5 * @generated */ + @Override public SarlBreakExpression createSarlBreakExpression() { SarlBreakExpressionImpl sarlBreakExpression = new SarlBreakExpressionImpl(); @@ -132,6 +135,7 @@ public SarlBreakExpression createSarlBreakExpression() * @since 0.7 * @generated */ + @Override public SarlContinueExpression createSarlContinueExpression() { SarlContinueExpressionImpl sarlContinueExpression = new SarlContinueExpressionImpl(); @@ -144,6 +148,7 @@ public SarlContinueExpression createSarlContinueExpression() * @since 0.6 * @generated */ + @Override public SarlAssertExpression createSarlAssertExpression() { SarlAssertExpressionImpl sarlAssertExpression = new SarlAssertExpressionImpl(); @@ -155,6 +160,7 @@ public SarlAssertExpression createSarlAssertExpression() * * @generated */ + @Override public SarlAction createSarlAction() { SarlActionImplCustom sarlAction = new SarlActionImplCustom(); @@ -166,6 +172,7 @@ public SarlAction createSarlAction() * * @generated */ + @Override public SarlConstructor createSarlConstructor() { SarlConstructorImpl sarlConstructor = new SarlConstructorImpl(); @@ -177,6 +184,7 @@ public SarlConstructor createSarlConstructor() * * @generated */ + @Override public SarlBehaviorUnit createSarlBehaviorUnit() { SarlBehaviorUnitImpl sarlBehaviorUnit = new SarlBehaviorUnitImpl(); @@ -188,6 +196,7 @@ public SarlBehaviorUnit createSarlBehaviorUnit() * * @generated */ + @Override public SarlCapacityUses createSarlCapacityUses() { SarlCapacityUsesImpl sarlCapacityUses = new SarlCapacityUsesImpl(); @@ -199,6 +208,7 @@ public SarlCapacityUses createSarlCapacityUses() * * @generated */ + @Override public SarlRequiredCapacity createSarlRequiredCapacity() { SarlRequiredCapacityImpl sarlRequiredCapacity = new SarlRequiredCapacityImpl(); @@ -210,6 +220,7 @@ public SarlRequiredCapacity createSarlRequiredCapacity() * * @generated */ + @Override public SarlClass createSarlClass() { SarlClassImplCustom sarlClass = new SarlClassImplCustom(); @@ -221,6 +232,7 @@ public SarlClass createSarlClass() * * @generated */ + @Override public SarlInterface createSarlInterface() { SarlInterfaceImplCustom sarlInterface = new SarlInterfaceImplCustom(); @@ -232,6 +244,7 @@ public SarlInterface createSarlInterface() * * @generated */ + @Override public SarlEnumeration createSarlEnumeration() { SarlEnumerationImplCustom sarlEnumeration = new SarlEnumerationImplCustom(); @@ -243,6 +256,7 @@ public SarlEnumeration createSarlEnumeration() * * @generated */ + @Override public SarlAnnotationType createSarlAnnotationType() { SarlAnnotationTypeImplCustom sarlAnnotationType = new SarlAnnotationTypeImplCustom(); @@ -254,6 +268,7 @@ public SarlAnnotationType createSarlAnnotationType() * * @generated */ + @Override public SarlEnumLiteral createSarlEnumLiteral() { SarlEnumLiteralImpl sarlEnumLiteral = new SarlEnumLiteralImpl(); @@ -265,6 +280,7 @@ public SarlEnumLiteral createSarlEnumLiteral() * * @generated */ + @Override public SarlEvent createSarlEvent() { SarlEventImplCustom sarlEvent = new SarlEventImplCustom(); @@ -276,6 +292,7 @@ public SarlEvent createSarlEvent() * * @generated */ + @Override public SarlSpace createSarlSpace() { SarlSpaceImpl sarlSpace = new SarlSpaceImpl(); @@ -287,6 +304,7 @@ public SarlSpace createSarlSpace() * * @generated */ + @Override public SarlArtifact createSarlArtifact() { SarlArtifactImpl sarlArtifact = new SarlArtifactImpl(); @@ -298,6 +316,7 @@ public SarlArtifact createSarlArtifact() * * @generated */ + @Override public SarlAgent createSarlAgent() { SarlAgentImplCustom sarlAgent = new SarlAgentImplCustom(); @@ -309,6 +328,7 @@ public SarlAgent createSarlAgent() * * @generated */ + @Override public SarlCapacity createSarlCapacity() { SarlCapacityImpl sarlCapacity = new SarlCapacityImpl(); @@ -320,6 +340,7 @@ public SarlCapacity createSarlCapacity() * * @generated */ + @Override public SarlBehavior createSarlBehavior() { SarlBehaviorImplCustom sarlBehavior = new SarlBehaviorImplCustom(); @@ -331,6 +352,7 @@ public SarlBehavior createSarlBehavior() * * @generated */ + @Override public SarlSkill createSarlSkill() { SarlSkillImplCustom sarlSkill = new SarlSkillImplCustom(); @@ -342,6 +364,7 @@ public SarlSkill createSarlSkill() * * @generated */ + @Override public SarlFormalParameter createSarlFormalParameter() { SarlFormalParameterImpl sarlFormalParameter = new SarlFormalParameterImpl(); @@ -353,6 +376,7 @@ public SarlFormalParameter createSarlFormalParameter() * * @generated */ + @Override public SarlPackage getSarlPackage() { return (SarlPackage)getEPackage(); diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFormalParameterImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFormalParameterImpl.java index 27c5e1846c..4793be3a18 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFormalParameterImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlFormalParameterImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public XExpression getDefaultValue() { return defaultValue; @@ -95,6 +96,7 @@ public NotificationChain basicSetDefaultValue(XExpression newDefaultValue, Notif * * @generated */ + @Override public void setDefaultValue(XExpression newDefaultValue) { if (newDefaultValue != defaultValue) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlPackageImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlPackageImpl.java index 5fd2aa57a9..d73b311faf 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlPackageImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlPackageImpl.java @@ -292,6 +292,7 @@ public static SarlPackage init() * * @generated */ + @Override public EClass getSarlScript() { return sarlScriptEClass; @@ -302,6 +303,7 @@ public EClass getSarlScript() * * @generated */ + @Override public EClass getSarlField() { return sarlFieldEClass; @@ -313,6 +315,7 @@ public EClass getSarlField() * @since 0.5 * @generated */ + @Override public EClass getSarlBreakExpression() { return sarlBreakExpressionEClass; @@ -324,6 +327,7 @@ public EClass getSarlBreakExpression() * @since 0.7 * @generated */ + @Override public EClass getSarlContinueExpression() { return sarlContinueExpressionEClass; @@ -335,6 +339,7 @@ public EClass getSarlContinueExpression() * @since 0.6 * @generated */ + @Override public EClass getSarlAssertExpression() { return sarlAssertExpressionEClass; @@ -346,6 +351,7 @@ public EClass getSarlAssertExpression() * @since 0.6 * @generated */ + @Override public EReference getSarlAssertExpression_Condition() { return (EReference)sarlAssertExpressionEClass.getEStructuralFeatures().get(0); @@ -357,6 +363,7 @@ public EReference getSarlAssertExpression_Condition() * @since 0.6 * @generated */ + @Override public EAttribute getSarlAssertExpression_Message() { return (EAttribute)sarlAssertExpressionEClass.getEStructuralFeatures().get(1); @@ -368,6 +375,7 @@ public EAttribute getSarlAssertExpression_Message() * @since 0.6 * @generated */ + @Override public EAttribute getSarlAssertExpression_IsStatic() { return (EAttribute)sarlAssertExpressionEClass.getEStructuralFeatures().get(2); @@ -378,6 +386,7 @@ public EAttribute getSarlAssertExpression_IsStatic() * * @generated */ + @Override public EClass getSarlAction() { return sarlActionEClass; @@ -388,6 +397,7 @@ public EClass getSarlAction() * * @generated */ + @Override public EReference getSarlAction_FiredEvents() { return (EReference)sarlActionEClass.getEStructuralFeatures().get(0); @@ -398,6 +408,7 @@ public EReference getSarlAction_FiredEvents() * * @generated */ + @Override public EClass getSarlConstructor() { return sarlConstructorEClass; @@ -408,6 +419,7 @@ public EClass getSarlConstructor() * * @generated */ + @Override public EClass getSarlBehaviorUnit() { return sarlBehaviorUnitEClass; @@ -418,6 +430,7 @@ public EClass getSarlBehaviorUnit() * * @generated */ + @Override public EReference getSarlBehaviorUnit_Name() { return (EReference)sarlBehaviorUnitEClass.getEStructuralFeatures().get(0); @@ -428,6 +441,7 @@ public EReference getSarlBehaviorUnit_Name() * * @generated */ + @Override public EReference getSarlBehaviorUnit_Guard() { return (EReference)sarlBehaviorUnitEClass.getEStructuralFeatures().get(1); @@ -438,6 +452,7 @@ public EReference getSarlBehaviorUnit_Guard() * * @generated */ + @Override public EReference getSarlBehaviorUnit_Expression() { return (EReference)sarlBehaviorUnitEClass.getEStructuralFeatures().get(2); @@ -448,6 +463,7 @@ public EReference getSarlBehaviorUnit_Expression() * * @generated */ + @Override public EClass getSarlCapacityUses() { return sarlCapacityUsesEClass; @@ -458,6 +474,7 @@ public EClass getSarlCapacityUses() * * @generated */ + @Override public EReference getSarlCapacityUses_Capacities() { return (EReference)sarlCapacityUsesEClass.getEStructuralFeatures().get(0); @@ -468,6 +485,7 @@ public EReference getSarlCapacityUses_Capacities() * * @generated */ + @Override public EClass getSarlRequiredCapacity() { return sarlRequiredCapacityEClass; @@ -478,6 +496,7 @@ public EClass getSarlRequiredCapacity() * * @generated */ + @Override public EReference getSarlRequiredCapacity_Capacities() { return (EReference)sarlRequiredCapacityEClass.getEStructuralFeatures().get(0); @@ -488,6 +507,7 @@ public EReference getSarlRequiredCapacity_Capacities() * * @generated */ + @Override public EClass getSarlClass() { return sarlClassEClass; @@ -498,6 +518,7 @@ public EClass getSarlClass() * * @generated */ + @Override public EClass getSarlInterface() { return sarlInterfaceEClass; @@ -508,6 +529,7 @@ public EClass getSarlInterface() * * @generated */ + @Override public EClass getSarlEnumeration() { return sarlEnumerationEClass; @@ -518,6 +540,7 @@ public EClass getSarlEnumeration() * * @generated */ + @Override public EClass getSarlAnnotationType() { return sarlAnnotationTypeEClass; @@ -528,6 +551,7 @@ public EClass getSarlAnnotationType() * * @generated */ + @Override public EClass getSarlEnumLiteral() { return sarlEnumLiteralEClass; @@ -538,6 +562,7 @@ public EClass getSarlEnumLiteral() * * @generated */ + @Override public EClass getSarlEvent() { return sarlEventEClass; @@ -548,6 +573,7 @@ public EClass getSarlEvent() * * @generated */ + @Override public EReference getSarlEvent_Extends() { return (EReference)sarlEventEClass.getEStructuralFeatures().get(0); @@ -558,6 +584,7 @@ public EReference getSarlEvent_Extends() * * @generated */ + @Override public EClass getSarlSpace() { return sarlSpaceEClass; @@ -568,6 +595,7 @@ public EClass getSarlSpace() * * @generated */ + @Override public EReference getSarlSpace_Extends() { return (EReference)sarlSpaceEClass.getEStructuralFeatures().get(0); @@ -578,6 +606,7 @@ public EReference getSarlSpace_Extends() * * @generated */ + @Override public EClass getSarlArtifact() { return sarlArtifactEClass; @@ -588,6 +617,7 @@ public EClass getSarlArtifact() * * @generated */ + @Override public EReference getSarlArtifact_Extends() { return (EReference)sarlArtifactEClass.getEStructuralFeatures().get(0); @@ -598,6 +628,7 @@ public EReference getSarlArtifact_Extends() * * @generated */ + @Override public EClass getSarlAgent() { return sarlAgentEClass; @@ -608,6 +639,7 @@ public EClass getSarlAgent() * * @generated */ + @Override public EReference getSarlAgent_Extends() { return (EReference)sarlAgentEClass.getEStructuralFeatures().get(0); @@ -618,6 +650,7 @@ public EReference getSarlAgent_Extends() * * @generated */ + @Override public EClass getSarlCapacity() { return sarlCapacityEClass; @@ -628,6 +661,7 @@ public EClass getSarlCapacity() * * @generated */ + @Override public EReference getSarlCapacity_Extends() { return (EReference)sarlCapacityEClass.getEStructuralFeatures().get(0); @@ -638,6 +672,7 @@ public EReference getSarlCapacity_Extends() * * @generated */ + @Override public EClass getSarlBehavior() { return sarlBehaviorEClass; @@ -648,6 +683,7 @@ public EClass getSarlBehavior() * * @generated */ + @Override public EReference getSarlBehavior_Extends() { return (EReference)sarlBehaviorEClass.getEStructuralFeatures().get(0); @@ -658,6 +694,7 @@ public EReference getSarlBehavior_Extends() * * @generated */ + @Override public EClass getSarlSkill() { return sarlSkillEClass; @@ -668,6 +705,7 @@ public EClass getSarlSkill() * * @generated */ + @Override public EReference getSarlSkill_Extends() { return (EReference)sarlSkillEClass.getEStructuralFeatures().get(0); @@ -678,6 +716,7 @@ public EReference getSarlSkill_Extends() * * @generated */ + @Override public EReference getSarlSkill_Implements() { return (EReference)sarlSkillEClass.getEStructuralFeatures().get(1); @@ -688,6 +727,7 @@ public EReference getSarlSkill_Implements() * * @generated */ + @Override public EClass getSarlFormalParameter() { return sarlFormalParameterEClass; @@ -698,6 +738,7 @@ public EClass getSarlFormalParameter() * * @generated */ + @Override public EReference getSarlFormalParameter_DefaultValue() { return (EReference)sarlFormalParameterEClass.getEStructuralFeatures().get(0); @@ -708,6 +749,7 @@ public EReference getSarlFormalParameter_DefaultValue() * * @generated */ + @Override public SarlFactory getSarlFactory() { return (SarlFactory)getEFactoryInstance(); diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlRequiredCapacityImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlRequiredCapacityImpl.java index 5ce171ec9c..c890c04355 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlRequiredCapacityImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlRequiredCapacityImpl.java @@ -72,6 +72,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public EList getCapacities() { if (capacities == null) diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSkillImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSkillImpl.java index 54c27d0af2..2d2d508209 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSkillImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSkillImpl.java @@ -86,6 +86,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -113,6 +114,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -134,6 +136,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public EList getImplements() { if (implements_ == null) @@ -148,6 +151,7 @@ public EList getImplements() * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method @@ -160,6 +164,7 @@ public boolean isAbstract() * * @generated */ + @Override public boolean isStrictFloatingPoint() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSpaceImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSpaceImpl.java index d750280f75..449b2ff354 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSpaceImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/sarl/impl/SarlSpaceImpl.java @@ -68,6 +68,7 @@ protected EClass eStaticClass() * * @generated */ + @Override public JvmParameterizedTypeReference getExtends() { return extends_; @@ -95,6 +96,7 @@ public NotificationChain basicSetExtends(JvmParameterizedTypeReference newExtend * * @generated */ + @Override public void setExtends(JvmParameterizedTypeReference newExtends) { if (newExtends != extends_) @@ -116,6 +118,7 @@ else if (eNotificationRequired()) * * @generated */ + @Override public boolean isAbstract() { // TODO: implement this method diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/JavacBatchCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/JavacBatchCompiler.java index 44adbb32a3..d5b576b106 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/JavacBatchCompiler.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/JavacBatchCompiler.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.charset.Charset; import java.util.Deque; import java.util.Iterator; import java.util.LinkedList; @@ -173,7 +174,7 @@ public boolean compile(File classDirectory, Iterable sourcePathDirectories return false; } - final OutputStream stdout = new WriterOutputStream(outWriter); + final OutputStream stdout = new WriterOutputStream(outWriter, Charset.defaultCharset()); final OutputStream stderr = new JavacErrorStream(errWriter, logger); @@ -242,7 +243,7 @@ private static class JavacErrorStream extends WriterOutputStream { * @param logger the logger to use for printing out special messages. */ JavacErrorStream(PrintWriter writer, Logger logger) { - super(writer); + super(writer, Charset.defaultCharset()); this.logger = logger; } diff --git a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF index 76150482d1..87e6347f9b 100644 --- a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF +++ b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF @@ -9,19 +9,19 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Activator: io.sarl.m2e.SARLMavenEclipsePlugin Require-Bundle: io.sarl.eclipse;bundle-version="0.9.0", - org.eclipse.xtext.util;bundle-version="2.15.0", - org.eclipse.xtext.ui;bundle-version="2.15.0", + org.eclipse.xtext.util;bundle-version="2.17.0", + org.eclipse.xtext.ui;bundle-version="2.17.0", org.eclipse.emf.common;bundle-version="2.15.0", - org.eclipse.emf.ecore;bundle-version="2.15.0", - org.eclipse.core.runtime;bundle-version="3.15.0", - org.eclipse.core.resources;bundle-version="3.13.100", - org.eclipse.ui;bundle-version="3.110.0", - org.eclipse.jdt.core;bundle-version="3.15.0", - org.eclipse.ui.ide;bundle-version="3.14.100", - org.eclipse.m2e.core.ui;bundle-version="1.9.1", - org.eclipse.m2e.maven.runtime;bundle-version="1.9.1", - org.eclipse.m2e.core;bundle-version="1.9.1", - org.eclipse.m2e.jdt;bundle-version="1.9.1" + org.eclipse.emf.ecore;bundle-version="2.17.0", + org.eclipse.core.runtime;bundle-version="3.15.200", + org.eclipse.core.resources;bundle-version="3.13.300", + org.eclipse.ui;bundle-version="3.112.0", + org.eclipse.jdt.core;bundle-version="3.17.0", + org.eclipse.ui.ide;bundle-version="3.15.0", + org.eclipse.m2e.core.ui;bundle-version="1.11.0", + org.eclipse.m2e.maven.runtime;bundle-version="1.11.0", + org.eclipse.m2e.core;bundle-version="1.11.0", + org.eclipse.m2e.jdt;bundle-version="1.11.0" Export-Package: io.sarl.m2e, io.sarl.m2e.config, io.sarl.m2e.sre, diff --git a/main/features/io.sarl.baseplatform/feature.xml b/main/features/io.sarl.baseplatform/feature.xml index 750344cd14..2798314dbb 100644 --- a/main/features/io.sarl.baseplatform/feature.xml +++ b/main/features/io.sarl.baseplatform/feature.xml @@ -248,10 +248,6 @@ id="org.eclipse.xtext.redist" version="0.0.0"/> - - @@ -272,10 +268,6 @@ id="org.eclipse.wst.xml_core.feature" version="0.0.0"/> - - @@ -294,20 +286,21 @@ - + - + + - + - + @@ -340,7 +333,6 @@ - @@ -374,15 +366,7 @@ - - - - - - - - diff --git a/main/features/io.sarl.compiler/feature.xml b/main/features/io.sarl.compiler/feature.xml index ba30df97e4..79f907fae2 100644 --- a/main/features/io.sarl.compiler/feature.xml +++ b/main/features/io.sarl.compiler/feature.xml @@ -223,37 +223,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -262,24 +237,50 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - @@ -274,7 +245,36 @@ tools upon the Eclipse IDE. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - @@ -37,8 +36,8 @@ - - + + diff --git a/pom.xml b/pom.xml index f11bb59668..51637d8333 100644 --- a/pom.xml +++ b/pom.xml @@ -32,9 +32,9 @@ - 2.15.0 - 2.15.0 - 2.15.1 + 2.17.0 + 2.17.0 + 2.17.1 2.9.0 @@ -610,6 +610,7 @@ maven-compiler-plugin ${mavencompiler.version} + jdt ${compiler.level} ${compiler.level} ${compiler.level} @@ -618,6 +619,13 @@ false false + + + org.eclipse.tycho + tycho-compiler-jdt + 1.3.0 + + @@ -767,7 +775,7 @@ com.puppycrawl.tools checkstyle - 8.12 + 8.18 diff --git a/products/updatesite/io.sarl.lang.product b/products/updatesite/io.sarl.lang.product index 5207257069..960f698b5f 100644 --- a/products/updatesite/io.sarl.lang.product +++ b/products/updatesite/io.sarl.lang.product @@ -265,10 +265,8 @@ - - - - + + @@ -280,7 +278,6 @@ - @@ -302,7 +299,6 @@ - diff --git a/sre/io.janusproject/io.janusproject.eclipse/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.eclipse/META-INF/MANIFEST.MF index 2b05035a5c..7a3a45b70c 100644 --- a/sre/io.janusproject/io.janusproject.eclipse/META-INF/MANIFEST.MF +++ b/sre/io.janusproject/io.janusproject.eclipse/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Bundle-Version: 0.9.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: io.janusproject.plugin;bundle-version="0.9.0";visibility:=reexport, io.sarl.eclipse;bundle-version="0.9.0", - org.eclipse.jdt.core;bundle-version="3.15.0", - org.eclipse.core.runtime;bundle-version="3.15.0", - org.eclipse.ui.workbench;bundle-version="3.112.0", - org.eclipse.jdt.ui;bundle-version="3.15.0", - org.eclipse.jface;bundle-version="3.14.100", - org.eclipse.swt;bundle-version="3.108.0", - org.eclipse.jdt.launching;bundle-version="3.11.0" + org.eclipse.jdt.core;bundle-version="3.17.0", + org.eclipse.core.runtime;bundle-version="3.15.200", + org.eclipse.ui.workbench;bundle-version="3.113.0", + org.eclipse.jdt.ui;bundle-version="3.17.0", + org.eclipse.jface;bundle-version="3.15.100", + org.eclipse.swt;bundle-version="3.110.0", + org.eclipse.jdt.launching;bundle-version="3.13.0" Bundle-Activator: io.janusproject.eclipse.JanusEclipsePlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor diff --git a/sre/io.janusproject/io.janusproject.feature/feature.xml b/sre/io.janusproject/io.janusproject.feature/feature.xml index c3d17a6b51..9656f267c1 100644 --- a/sre/io.janusproject/io.janusproject.feature/feature.xml +++ b/sre/io.janusproject/io.janusproject.feature/feature.xml @@ -225,7 +225,8 @@ - + + @@ -235,15 +236,14 @@ - - - - - - - - - + + + + + + + + - + - + --> org.eclipse.ide.photon p2 - http://download.eclipse.org/releases/2018-09/ + http://download.eclipse.org/releases/2019-03/ org.jboss.m2e-jdt-compiler.update.lastest