diff --git a/contribs/io.sarl.examples/io.sarl.examples.tests/src/test/java/io/sarl/examples/tests/ExamplesTest.java b/contribs/io.sarl.examples/io.sarl.examples.tests/src/test/java/io/sarl/examples/tests/ExamplesTest.java index 563d23acfa..f4adef4518 100644 --- a/contribs/io.sarl.examples/io.sarl.examples.tests/src/test/java/io/sarl/examples/tests/ExamplesTest.java +++ b/contribs/io.sarl.examples/io.sarl.examples.tests/src/test/java/io/sarl/examples/tests/ExamplesTest.java @@ -53,7 +53,7 @@ import io.sarl.lang.SARLStandaloneSetup; import io.sarl.lang.SARLVersion; -import io.sarl.lang.compilation.compiler.batch.SarlBatchCompiler; +import io.sarl.lang.compiler.batch.SarlBatchCompiler; import io.sarl.tests.api.AbstractSarlTest; /** Class for testing the examples. diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyOutputConfigurationProvider.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyOutputConfigurationProvider.java index db0b22f382..df2a96a1d7 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyOutputConfigurationProvider.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyOutputConfigurationProvider.java @@ -29,7 +29,7 @@ import org.eclipse.xtext.generator.IOutputConfigurationProvider; import org.eclipse.xtext.generator.OutputConfiguration; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageOutputConfigurations; +import io.sarl.lang.compiler.extra.ExtraLanguageOutputConfigurations; import io.sarl.pythongenerator.PyGeneratorPlugin; import io.sarl.pythongenerator.generator.Messages; diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyPreferenceInitializer.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyPreferenceInitializer.java index 2ef8ea69d7..bf0da4b5c0 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyPreferenceInitializer.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/configuration/PyPreferenceInitializer.java @@ -26,8 +26,8 @@ import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess; import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; import io.sarl.pythongenerator.PyGeneratorPlugin; import io.sarl.pythongenerator.generator.PyInitializers; diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyAppendable.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyAppendable.java index dd649c3277..edc954441d 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyAppendable.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyAppendable.java @@ -21,9 +21,9 @@ package io.sarl.pythongenerator.generator; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageAppendable; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageImportManager; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageTypeConverter; +import io.sarl.lang.compiler.extra.ExtraLanguageAppendable; +import io.sarl.lang.compiler.extra.ExtraLanguageImportManager; +import io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter; /** Appendable dedicated to Python. * diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyExpressionGenerator.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyExpressionGenerator.java index 2e1fd103f1..cd074bfe2a 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyExpressionGenerator.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyExpressionGenerator.java @@ -70,10 +70,10 @@ import org.eclipse.xtext.xbase.typesystem.references.FunctionTypeReference; import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; -import io.sarl.lang.compilation.generator.extra.AbstractExpressionGenerator; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorContext; -import io.sarl.lang.compilation.generator.extra.IRootGenerator; +import io.sarl.lang.compiler.extra.AbstractExpressionGenerator; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorContext; +import io.sarl.lang.compiler.extra.IRootGenerator; import io.sarl.lang.sarl.SarlAssertExpression; import io.sarl.lang.sarl.SarlBreakExpression; import io.sarl.pythongenerator.PyGeneratorPlugin; @@ -992,7 +992,7 @@ private void appendCallPrefix(Collection elements, String postfix) { @Override protected void appendCall(JvmIdentifiableElement calledFeature, List leftOperand, List receiver, String name, - List args, Function0 beginOfBlock) { + List args, Function0 beginOfBlock) { if (beginOfBlock != null) { this.codeReceiver.append("if "); //$NON-NLS-1$ PyExpressionGenerator.this.generate(beginOfBlock.apply(), this.codeReceiver, this.context); diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGenerator.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGenerator.java index 973dfcd65b..8bfb1c7e2b 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGenerator.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGenerator.java @@ -53,10 +53,10 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure2; import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; -import io.sarl.lang.compilation.generator.extra.AbstractExtraLanguageGenerator; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageAppendable; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageTypeConverter; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorContext; +import io.sarl.lang.compiler.extra.AbstractExtraLanguageGenerator; +import io.sarl.lang.compiler.extra.ExtraLanguageAppendable; +import io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorContext; import io.sarl.lang.core.Agent; import io.sarl.lang.core.Behavior; import io.sarl.lang.core.Capacity; @@ -266,7 +266,7 @@ protected boolean generatePythonClassDeclaration(String typeName, boolean isAbst */ protected boolean generateTypeDeclaration(String name, boolean isAbstract, List superTypes, boolean ignoreObjectType, List members, PyAppendable it, - IExtraLanguageGeneratorContext context, Procedure2 memberGenerator) { + IExtraLanguageGeneratorContext context, Procedure2 memberGenerator) { if (!Strings.isEmpty(name)) { if (!generatePythonClassDeclaration(name, isAbstract, superTypes, ignoreObjectType, it, context) || context.getCancelIndicator().isCanceled()) { diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGeneratorProvider.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGeneratorProvider.java index 85d46d74de..9aeab57477 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGeneratorProvider.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyGeneratorProvider.java @@ -25,7 +25,7 @@ import com.google.inject.Injector; -import io.sarl.lang.ui.compilation.generator.extra.AbstractExtraLanguageGeneratorProvider; +import io.sarl.lang.ui.compiler.extra.AbstractExtraLanguageGeneratorProvider; import io.sarl.pythongenerator.PyGeneratorPlugin; /** Provider the Python generator if is it enabled. diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyInitializers.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyInitializers.java index e22c64394c..0c2392d899 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyInitializers.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/generator/PyInitializers.java @@ -36,7 +36,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.xtext.xbase.lib.Pair; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; import io.sarl.pythongenerator.PyGeneratorPlugin; /** Initializers for Python 3. diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/GeneratorConfigurationBlock.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/GeneratorConfigurationBlock.java index 89edaa1a27..82f3b44265 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/GeneratorConfigurationBlock.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/GeneratorConfigurationBlock.java @@ -24,7 +24,7 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.graphics.Image; -import io.sarl.lang.ui.compilation.generator.extra.properties.AbstractGeneratorConfigurationBlock; +import io.sarl.lang.ui.compiler.extra.properties.AbstractGeneratorConfigurationBlock; import io.sarl.pythongenerator.PyGeneratorPlugin; /** Configuration block for the Python generator. diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/PropertyPage.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/PropertyPage.java index c861ec85ca..e1c8e7a33f 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/PropertyPage.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/ui/PropertyPage.java @@ -23,7 +23,7 @@ import com.google.inject.Inject; -import io.sarl.lang.ui.compilation.generator.extra.properties.AbstractExtraLanguagePropertyPage; +import io.sarl.lang.ui.compiler.extra.properties.AbstractExtraLanguagePropertyPage; import io.sarl.pythongenerator.PyGeneratorPlugin; /** Property page for configuring the Python generator. diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java index 344b3f35e2..27c15d2040 100644 --- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java +++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/src/io/sarl/pythongenerator/validator/PyValidator.java @@ -43,7 +43,7 @@ import org.eclipse.xtext.xtype.XImportDeclaration; import org.eclipse.xtext.xtype.XtypePackage; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; import io.sarl.lang.validation.extra.AbstractExtraLanguageValidator; import io.sarl.pythongenerator.PyGeneratorPlugin; import io.sarl.pythongenerator.generator.PyInitializers; @@ -61,21 +61,21 @@ public class PyValidator extends AbstractExtraLanguageValidator { /** Error handler for the type conversions. */ - private final Procedure3 typeErrorHandler1 = (source, invalidType, name) -> { + private final Procedure3 typeErrorHandler1 = (source, invalidType, name) -> { error(MessageFormat.format(Messages.PyValidator_0, name), source, XtypePackage.eINSTANCE.getXImportDeclaration_ImportedType()); }; /** Error handler for the type conversions. */ - private final Procedure3 typeErrorHandler2 = (source, invalidType, name) -> { + private final Procedure3 typeErrorHandler2 = (source, invalidType, name) -> { error(MessageFormat.format(Messages.PyValidator_0, name), source, XbasePackage.eINSTANCE.getXAbstractFeatureCall_Feature()); }; /** Error handler for the feature conversions. */ - private final Function2 featureErrorHandler = (source, element) -> { + private final Function2 featureErrorHandler = (source, element) -> { final String message; if (element instanceof JvmConstructor) { message = MessageFormat.format(Messages.PyValidator_1, this.simpleNameProvider.getSimpleName(element)); diff --git a/docs/io.sarl.docs.markdown/src/main/documentation/tools/Sarlc.md b/docs/io.sarl.docs.markdown/src/main/documentation/tools/Sarlc.md index f30c494ee5..6ca81a1198 100644 --- a/docs/io.sarl.docs.markdown/src/main/documentation/tools/Sarlc.md +++ b/docs/io.sarl.docs.markdown/src/main/documentation/tools/Sarlc.md @@ -2,7 +2,7 @@ [:Outline:] -[:Fact:]{(io.sarl.lang.compilation.compiler.batch.Main)::getCompilerProgramName == '[:name](sarlc)'} +[:Fact:]{(io.sarl.lang.compiler.batch.Main)::getCompilerProgramName == '[:name](sarlc)'} A command-line compiler is a tool that could be invoked from the command-line shell in order to compiler a language source file. [:name:] is the command-line compiler for the SARL language. @@ -33,7 +33,7 @@ The complete list of the options is: | Option | Description | | ------ | ----------- | [:Dynamic:]{ - io.sarl.lang.compilation.compiler.batch.Main::getOptions.renderToMarkdown + io.sarl.lang.compiler.batch.Main::getOptions.renderToMarkdown } diff --git a/formatting-styles/latex/sarl-beamer-listing.sty b/formatting-styles/latex/sarl-beamer-listing.sty index 3d15a4d59a..7837bebf33 100644 --- a/formatting-styles/latex/sarl-beamer-listing.sty +++ b/formatting-styles/latex/sarl-beamer-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-beamer-listing}[2017/08/27] +\ProvidesPackage{sarl-beamer-listing}[2017/09/05] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} diff --git a/formatting-styles/latex/sarl-colorized-listing.sty b/formatting-styles/latex/sarl-colorized-listing.sty index 312a98524a..6b2adaa110 100644 --- a/formatting-styles/latex/sarl-colorized-listing.sty +++ b/formatting-styles/latex/sarl-colorized-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-colorized-listing}[2017/08/27] +\ProvidesPackage{sarl-colorized-listing}[2017/09/05] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} diff --git a/formatting-styles/latex/sarl-listing.sty b/formatting-styles/latex/sarl-listing.sty index 1fb517a347..beaa53c06f 100644 --- a/formatting-styles/latex/sarl-listing.sty +++ b/formatting-styles/latex/sarl-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-listing}[2017/08/27] +\ProvidesPackage{sarl-listing}[2017/09/05] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} diff --git a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/shortcuts/LaunchAgentShortcut.java b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/shortcuts/LaunchAgentShortcut.java index dd0052e142..5906cee90b 100644 --- a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/shortcuts/LaunchAgentShortcut.java +++ b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/shortcuts/LaunchAgentShortcut.java @@ -86,7 +86,7 @@ import io.sarl.lang.core.Agent; import io.sarl.lang.sarl.SarlAgent; import io.sarl.lang.sarl.SarlScript; -import io.sarl.lang.ui.info.images.SARLImages; +import io.sarl.lang.ui.labeling.SARLImages; /** Shortcut for launching a SARL agent. * diff --git a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/AbstractNewSarlElementWizardPage.java b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/AbstractNewSarlElementWizardPage.java index db459628ba..4ded77be02 100644 --- a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/AbstractNewSarlElementWizardPage.java +++ b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/AbstractNewSarlElementWizardPage.java @@ -1213,8 +1213,8 @@ private static void createInfoCall(IExpressionBuilder builder, String message) { * @since 0.5 */ protected boolean createStandardSARLEventTemplates(String elementTypeName, - Function1 behaviorUnitAdder, - Procedure1 usesAdder) { + Function1 behaviorUnitAdder, + Procedure1 usesAdder) { if (!isCreateStandardEventHandlers()) { return false; } @@ -1295,8 +1295,8 @@ protected boolean createStandardSARLEventTemplates(String elementTypeName, * @since 0.5 */ protected boolean createStandardSARLLifecycleFunctionTemplates(String elementTypeName, - Function1 actionAdder, - Procedure1 usesAdder) { + Function1 actionAdder, + Procedure1 usesAdder) { if (!isCreateStandardLifecycleFunctions()) { return false; } diff --git a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java index 33a6a2b714..463f237a17 100644 --- a/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java +++ b/main/coreplugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java @@ -32,7 +32,7 @@ import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.util.Strings; -import io.sarl.lang.ui.info.images.IQualifiedNameImageProvider; +import io.sarl.lang.ui.labeling.IQualifiedNameImageProvider; /** Extension for the type selector. * diff --git a/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/Agent.java b/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/Agent.java index c037a836bb..edf8f43293 100644 --- a/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/Agent.java +++ b/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/Agent.java @@ -191,7 +191,7 @@ protected final S setSkill(S skill, Class. return skill; } - private static void runOnImplementedCapacities(Skill skill, Procedure1> callback) { + private static void runOnImplementedCapacities(Skill skill, Procedure1> callback) { TypeToken.of(skill.getClass()).getTypes().interfaces().stream().parallel().forEach((it) -> { final Class type = it.getRawType(); if (Capacity.class.isAssignableFrom(type) && !Capacity.class.equals(type)) { diff --git a/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/BuiltinCapacitiesProvider.java b/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/BuiltinCapacitiesProvider.java index 9210ea410c..23f393018f 100644 --- a/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/BuiltinCapacitiesProvider.java +++ b/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/core/BuiltinCapacitiesProvider.java @@ -62,6 +62,6 @@ default Map, Skill> getBuiltinCapacities(Agent agent) * The first argument is the agent. The second * argument is the builtin capacity. The third argument is the skill instance. */ - void builtinCapacities(Agent agent, Procedure2, Skill> skillMappingCallback); + void builtinCapacities(Agent agent, Procedure2, ? super Skill> skillMappingCallback); } diff --git a/main/coreplugins/io.sarl.lang.mwe2/GenerateSARL2.mwe2 b/main/coreplugins/io.sarl.lang.mwe2/GenerateSARL2.mwe2 index 0b4d3f1cf7..f51f197a8a 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/GenerateSARL2.mwe2 +++ b/main/coreplugins/io.sarl.lang.mwe2/GenerateSARL2.mwe2 @@ -484,8 +484,8 @@ Workflow { overrideAll = true runtime = { - bind = "io.sarl.lang.actionprototype.IActionPrototypeProvider" - to = "io.sarl.lang.actionprototype.DefaultActionPrototypeProvider" + bind = "io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider" + to = "io.sarl.lang.sarl.actionprototype.DefaultActionPrototypeProvider" } runtime = { bind = "org.eclipse.xtext.validation.ConfigurableIssueCodesProvider" @@ -513,7 +513,7 @@ Workflow { } runtime = { bind = "org.eclipse.xtext.xbase.compiler.JvmModelGenerator" - to = "io.sarl.lang.generator.SARLJvmGenerator" + to = "io.sarl.lang.compiler.SARLJvmGenerator" } runtime = { bind = "org.eclipse.xtext.xbase.controlflow.IEarlyExitComputer" @@ -537,11 +537,11 @@ Workflow { } runtime = { bind = "org.eclipse.xtext.generator.IOutputConfigurationProvider" - to = "io.sarl.lang.generator.SarlOutputConfigurationProvider" + to = "io.sarl.lang.compiler.SarlOutputConfigurationProvider" } runtime = { bind = "org.eclipse.xtext.generator.IContextualOutputConfigurationProvider" - to = "io.sarl.lang.generator.SarlOutputConfigurationProvider" + to = "io.sarl.lang.compiler.SarlOutputConfigurationProvider" } runtime = { bind = "org.eclipse.xtext.xbase.jvmmodel.JvmModelAssociator" @@ -572,20 +572,20 @@ Workflow { } runtime = { bind = "org.eclipse.xtext.xbase.compiler.IGeneratorConfigProvider" - to = "io.sarl.lang.generator.SARLGeneratorConfigProvider" + to = "io.sarl.lang.compiler.SARLGeneratorConfigProvider" } runtime = { - bind = "io.sarl.lang.generator.IGeneratorConfigProvider2" - to = "io.sarl.lang.generator.GeneratorConfigProvider2" + bind = "io.sarl.lang.compiler.IGeneratorConfigProvider2" + to = "io.sarl.lang.compiler.GeneratorConfigProvider2" } ui = { bind = "org.eclipse.xtext.generator.IOutputConfigurationProvider" - to = "io.sarl.lang.ui.generator.extra.ExtensionPointExtraLanguageOutputConfigurationProvider" + to = "io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguageOutputConfigurationProvider" } ui = { bind = "org.eclipse.xtext.generator.IContextualOutputConfigurationProvider" - to = "io.sarl.lang.ui.generator.extra.ExtensionPointExtraLanguageOutputConfigurationProvider" + to = "io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguageOutputConfigurationProvider" } ui = { bind = "org.eclipse.xtend.ide.contentassist.javadoc.XtendJavaDocContentAssistProcessor" @@ -608,7 +608,7 @@ Workflow { singleton = true } ui = { - bind = "io.sarl.lang.ui.images.IQualifiedNameImageProvider" + bind = "io.sarl.lang.ui.labeling.IQualifiedNameImageProvider" to = "io.sarl.lang.ui.labeling.SARLLabelProvider" singleton = true } @@ -693,18 +693,18 @@ Workflow { } ui = { bind = "org.eclipse.xtext.ui.IImageHelper" - to = "io.sarl.lang.ui.images.QualifiedPluginImageHelper" + to = "io.sarl.lang.ui.labeling.QualifiedPluginImageHelper" override = true } ui = { bind = "org.eclipse.xtext.ui.IImageHelper$IImageDescriptorHelper" - to = "io.sarl.lang.ui.images.QualifiedPluginImageHelper" + to = "io.sarl.lang.ui.labeling.QualifiedPluginImageHelper" override = true functionName = "bindIImageDescriptorHelper" } ui = { - bind = "io.sarl.lang.generator.IGeneratorConfigProvider2" - to = "io.sarl.lang.ui.builder.EclipseGeneratorConfigProvider2" + bind = "io.sarl.lang.compiler.IGeneratorConfigProvider2" + to = "io.sarl.lang.ui.compiler.EclipseGeneratorConfigProvider2" } ui = { bind = "org.eclipse.xtext.builder.preferences.BuilderConfigurationBlock" @@ -729,12 +729,12 @@ Workflow { } ui = { bind = "org.eclipse.xtext.xbase.validation.UIStrings" - to = "io.sarl.lang.ui.labeling.SARLUIStrings" + to = "io.sarl.lang.ui.validation.SARLUIStrings" } ui = { bind = "org.eclipse.jface.viewers.ILabelProvider" annotatedWith = "org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkLabelProvider" - to = "io.sarl.lang.ui.hyperlinking.SARLHyperLinkingLabelProvider" + to = "io.sarl.lang.ui.labeling.SARLHyperLinkingLabelProvider" functionName = "configureHyperlinkLabelProvider" } ui = { @@ -759,23 +759,23 @@ Workflow { } ui = { bind = "org.eclipse.xtext.generator.IGenerator" - to = "io.sarl.lang.generator.extra.ExtraLanguageGeneratorSupport" + to = "io.sarl.lang.compiler.extra.ExtraLanguageGeneratorSupport" } ui = { - bind = "io.sarl.lang.generator.extra.IExtraLanguageGeneratorProvider" - to = "io.sarl.lang.ui.generator.extra.ExtensionPointExtraLanguageGeneratorProvider" + bind = "io.sarl.lang.compiler.extra.IExtraLanguageGeneratorProvider" + to = "io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguageGeneratorProvider" } ui = { bind = "io.sarl.lang.validation.extra.IExtraLanguageValidatorProvider" to = "io.sarl.lang.ui.validation.extra.ExtensionPointExtraLanguageValidatorProvider" } ui = { - bind = "io.sarl.lang.generator.extra.ExtraLanguageTypeConverter$TypeConverterRuleReader" - to = "io.sarl.lang.ui.generator.extra.preferences.PreferenceBasedTypeConverterRuleReader" + bind = "io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter$TypeConverterRuleReader" + to = "io.sarl.lang.ui.compiler.extra.preferences.PreferenceBasedTypeConverterRuleReader" } ui = { - bind = "io.sarl.lang.generator.extra.ExtraLanguageFeatureNameConverter$FeatureNameConverterRuleReader" - to = "io.sarl.lang.ui.generator.extra.preferences.PreferenceBasedFeatureNameConverterRuleReader" + bind = "io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter$FeatureNameConverterRuleReader" + to = "io.sarl.lang.ui.compiler.extra.preferences.PreferenceBasedFeatureNameConverterRuleReader" } } @@ -922,12 +922,12 @@ Workflow { } runtime = { bind = "org.eclipse.xtext.parser.antlr.ISyntaxErrorMessageProvider" - to = "io.sarl.lang.parser.SARLSyntaxErrorMessageProvider" + to = "io.sarl.lang.validation.SARLSyntaxErrorMessageProvider" singleton = true } runtime = { bind = "org.eclipse.xtext.parser.antlr.SyntaxErrorMessageProvider" - to = "io.sarl.lang.parser.SARLSyntaxErrorMessageProvider" + to = "io.sarl.lang.validation.SARLSyntaxErrorMessageProvider" singleton = true } @@ -937,7 +937,7 @@ Workflow { } ui = { bind = "org.eclipse.xtext.generator.AbstractFileSystemAccess2" - to = "io.sarl.lang.ui.builder.ProjectRelativeFileSystemAccess" + to = "io.sarl.lang.ui.compiler.ProjectRelativeFileSystemAccess" } ui = { bind = "org.eclipse.xtend.core.macro.AbstractFileSystemSupport" diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/CodeElementExtractor.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/CodeElementExtractor.java index 0620968ea4..0e9902c44f 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/CodeElementExtractor.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/CodeElementExtractor.java @@ -227,9 +227,10 @@ public interface CodeElementExtractor { T visitMemberElements( ElementDescription element, EObject grammarContainer, - Function4 constructorCallback, - Function4 namedMemberCallback, - Function4 typeReferencingMemberCallback); + Function4 constructorCallback, + Function4 namedMemberCallback, + Function4 typeReferencingMemberCallback); /** Construct an element description. * diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/NoBacktrackGrammarCodeElementExtractor.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/NoBacktrackGrammarCodeElementExtractor.java index 2ae61f0541..dc1844de28 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/NoBacktrackGrammarCodeElementExtractor.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/extractor/NoBacktrackGrammarCodeElementExtractor.java @@ -70,7 +70,7 @@ public Iterable getTopElements(Grammar grammar, CodeBuilderC } private T visitMembers(EObject grammarContainer, EObject container, - Function4 memberCallback) { + Function4 memberCallback) { final Set treatedMembers = new HashSet<>(); for (final Assignment nameAssignment : IterableExtensions.filter( GrammarUtil.containedAssignments(container), @@ -93,7 +93,7 @@ private T visitMembers(EObject grammarContainer, EObject container, } private T visitTypeReferencingMembers(EObject grammarContainer, EObject container, - Function4 memberCallback) { + Function4 memberCallback) { final Set treatedMembers = new HashSet<>(); for (final Assignment nameAssignment : IterableExtensions.filter( GrammarUtil.containedAssignments(container), @@ -116,7 +116,7 @@ private T visitTypeReferencingMembers(EObject grammarContainer, EObject cont } private T visitConstructors(EObject grammarContainer, EObject container, - Function4 callback) { + Function4 callback) { final Set treatedConstructors = new HashSet<>(); for (final Assignment expressionAssignment : IterableExtensions.filter( GrammarUtil.containedAssignments(container), @@ -145,9 +145,10 @@ private T visitConstructors(EObject grammarContainer, EObject container, public T visitMemberElements( ElementDescription element, EObject grammarContainer, - Function4 constructorCallback, - Function4 namedMemberCallback, - Function4 typeReferencingMemberCallback) { + Function4 constructorCallback, + Function4 namedMemberCallback, + Function4 typeReferencingMemberCallback) { // Treat the standard members if (namedMemberCallback != null) { final T retVal = visitMembers(grammarContainer, grammarContainer, namedMemberCallback); diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/ExpressionBuilderFragment.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/ExpressionBuilderFragment.java index 37a7f19b35..e17b9a277c 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/ExpressionBuilderFragment.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/ExpressionBuilderFragment.java @@ -222,7 +222,7 @@ protected void appendTo(TargetStringConcatenation it) { it.newLine(); it.append("\tprivate "); //$NON-NLS-1$ it.append(Procedures.Procedure1.class); - it.append("<"); //$NON-NLS-1$ + it.append(" setter;"); //$NON-NLS-1$ it.newLineIfNotEmpty(); @@ -327,7 +327,7 @@ protected void appendTo(TargetStringConcatenation it) { it.append(EObject.class); it.append(" context, "); //$NON-NLS-1$ it.append(Procedures.Procedure1.class); - it.append("<"); //$NON-NLS-1$ + it.append(" setter, "); //$NON-NLS-1$ it.append(IJvmTypeProvider.class); diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/AbstractExternalHighlightingFragment2.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/AbstractExternalHighlightingFragment2.java index 8a9a740f88..48de708950 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/AbstractExternalHighlightingFragment2.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/AbstractExternalHighlightingFragment2.java @@ -108,14 +108,14 @@ public abstract class AbstractExternalHighlightingFragment2 mimeTypes = new ArrayList<>(); - private Function2 outputDirectoryFilter; + private Function2 outputDirectoryFilter; /** Replies the default output directory filter. * * @return the filter, or {@code null}. * @since 0.6 */ - public Function2 getOutputDirectoryFilter() { + public Function2 getOutputDirectoryFilter() { return this.outputDirectoryFilter; } @@ -124,7 +124,7 @@ public Function2 getOutputDirectoryFilter() { * @param filter the filter, or {@code null} for avoiding default filtering. * @since 0.6 */ - public void setOutputDirectoryFilter(Function2 filter) { + public void setOutputDirectoryFilter(Function2 filter) { this.outputDirectoryFilter = filter; } @@ -616,7 +616,8 @@ protected void writeFile(String basename, T content) { * @param content the content of the style file. * @param outputDirectoryFilter the output directory. */ - protected void writeFile(String basename, T content, Function2 outputDirectoryFilter) { + protected void writeFile(String basename, T content, + Function2 outputDirectoryFilter) { // Create the file. // Encode final byte[] bytes = content.toString().getBytes(Charset.forName(getCodeConfig().getEncoding())); @@ -640,7 +641,8 @@ protected void writeFile(String basename, byte[] content) { * @param outputDirectoryFilter the output directory. * @since 0.6 */ - protected void writeFile(String basename, byte[] content, Function2 outputDirectoryFilter) { + protected void writeFile(String basename, byte[] content, + Function2 outputDirectoryFilter) { for (final String output : getOutputs()) { File directory = new File(output).getAbsoluteFile(); if (outputDirectoryFilter != null) { diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/textmate/TextMateGenerator2.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/textmate/TextMateGenerator2.java index b0be7f5a33..326faa7eef 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/textmate/TextMateGenerator2.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/externalspec/textmate/TextMateGenerator2.java @@ -493,7 +493,7 @@ protected List createPatterns(Set literals, Set expressionKey * @param proc the initializer. * @return the definition. */ - protected Map pattern(Procedure1 proc) { + protected Map pattern(Procedure1 proc) { final Pattern patternDefinition = new Pattern(); proc.apply(patternDefinition); return patternDefinition.getDefinition(); @@ -568,7 +568,7 @@ public Map getDefinition() { * @param proc the initializer. * @see TextMateGenerator2#pattern(Procedure1) */ - public void pattern(Procedure1 proc) { + public void pattern(Procedure1 proc) { final Map pattern = TextMateGenerator2.this.pattern(proc); this.patterns.add(pattern); } diff --git a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF index c8aaf25c39..10b2a085e4 100644 --- a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF +++ b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF @@ -30,31 +30,27 @@ Export-Package: io.sarl.lang.ide, io.sarl.lang.ide.contentassist.antlr.internal, io.sarl.lang.ui, io.sarl.lang.ui.bugfixes.pending.xtexteclipse282, - io.sarl.lang.ui.compilation.builder, - io.sarl.lang.ui.compilation.codebuilder, - io.sarl.lang.ui.compilation.generator, - io.sarl.lang.ui.compilation.generator.extra, - io.sarl.lang.ui.compilation.generator.extra.preferences, - io.sarl.lang.ui.compilation.generator.extra.properties, - io.sarl.lang.ui.compilation.highlighting, + io.sarl.lang.ui.codebuilder, + io.sarl.lang.ui.compiler, + io.sarl.lang.ui.compiler.extra, + io.sarl.lang.ui.compiler.extra.preferences, + io.sarl.lang.ui.compiler.extra.properties, io.sarl.lang.ui.contentassist, - io.sarl.lang.ui.info.hover, - io.sarl.lang.ui.info.hyperlinking, - io.sarl.lang.ui.info.images, - io.sarl.lang.ui.info.labeling, + io.sarl.lang.ui.contentassist.general, + io.sarl.lang.ui.contentassist.imports, + io.sarl.lang.ui.contentassist.javadoc, + io.sarl.lang.ui.contentassist.templates, + io.sarl.lang.ui.editor, + io.sarl.lang.ui.highlighting, + io.sarl.lang.ui.hover, io.sarl.lang.ui.internal, + io.sarl.lang.ui.labeling, io.sarl.lang.ui.outline, io.sarl.lang.ui.preferences, + io.sarl.lang.ui.quickfix, + io.sarl.lang.ui.quickfix.acceptors, + io.sarl.lang.ui.refactoring.rename, io.sarl.lang.ui.tasks, - io.sarl.lang.ui.uihelpers.contentassist, - io.sarl.lang.ui.uihelpers.contentassist.general, - io.sarl.lang.ui.uihelpers.contentassist.imports, - io.sarl.lang.ui.uihelpers.contentassist.javadoc, - io.sarl.lang.ui.uihelpers.contentassist.templates, - io.sarl.lang.ui.uihelpers.editor, - io.sarl.lang.ui.uihelpers.quickfix, - io.sarl.lang.ui.uihelpers.quickfix.acceptors, - io.sarl.lang.ui.uihelpers.refactoring.rename, io.sarl.lang.ui.validation, io.sarl.lang.ui.validation.extra Import-Package: org.apache.log4j diff --git a/main/coreplugins/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/AbstractSARLUiModule.java b/main/coreplugins/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/AbstractSARLUiModule.java index 45b7493708..f72e2365f9 100644 --- a/main/coreplugins/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/AbstractSARLUiModule.java +++ b/main/coreplugins/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/AbstractSARLUiModule.java @@ -26,37 +26,43 @@ import com.google.inject.Binder; import com.google.inject.Provider; import com.google.inject.name.Names; - -import io.sarl.lang.compilation.generator.IGeneratorConfigProvider2; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageGeneratorSupport; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageTypeConverter; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorProvider; +import io.sarl.lang.compiler.IGeneratorConfigProvider2; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter; +import io.sarl.lang.compiler.extra.ExtraLanguageGeneratorSupport; +import io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorProvider; import io.sarl.lang.ide.contentassist.antlr.PartialSARLContentAssistParser; import io.sarl.lang.ide.contentassist.antlr.SARLParser; import io.sarl.lang.ide.contentassist.antlr.internal.InternalSARLLexer; -import io.sarl.lang.ui.compilation.builder.ProjectRelativeFileSystemAccess; -import io.sarl.lang.ui.compilation.codebuilder.SarlCodeBuilderFactory; -import io.sarl.lang.ui.compilation.codebuilder.SarlConstructorBuilder; -import io.sarl.lang.ui.compilation.codebuilder.SarlFieldBuilder; -import io.sarl.lang.ui.compilation.codebuilder.SarlMethodBuilder; -import io.sarl.lang.ui.compilation.codebuilder.SarlParameterBuilder; -import io.sarl.lang.ui.compilation.generator.EclipseGeneratorConfigProvider2; -import io.sarl.lang.ui.compilation.generator.extra.ExtensionPointExtraLanguageGeneratorProvider; -import io.sarl.lang.ui.compilation.generator.extra.ExtensionPointExtraLanguageOutputConfigurationProvider; -import io.sarl.lang.ui.compilation.generator.extra.preferences.PreferenceBasedFeatureNameConverterRuleReader; -import io.sarl.lang.ui.compilation.generator.extra.preferences.PreferenceBasedTypeConverterRuleReader; -import io.sarl.lang.ui.compilation.highlighting.SARLHighlightingCalculator; -import io.sarl.lang.ui.info.hover.SARLHoverSerializer; -import io.sarl.lang.ui.info.hover.SARLHoverSignatureProvider; -import io.sarl.lang.ui.info.hover.SARLHoverUIStrings; -import io.sarl.lang.ui.info.hyperlinking.SARLHyperLinkingLabelProvider; -import io.sarl.lang.ui.info.images.IQualifiedNameImageProvider; -import io.sarl.lang.ui.info.images.QualifiedPluginImageHelper; -import io.sarl.lang.ui.info.labeling.SARLDescriptionLabelProvider; -import io.sarl.lang.ui.info.labeling.SARLDiagnosticLabelDecorator; -import io.sarl.lang.ui.info.labeling.SARLLabelProvider; -import io.sarl.lang.ui.info.labeling.SARLUIStrings; +import io.sarl.lang.ui.codebuilder.SarlCodeBuilderFactory; +import io.sarl.lang.ui.codebuilder.SarlConstructorBuilder; +import io.sarl.lang.ui.codebuilder.SarlFieldBuilder; +import io.sarl.lang.ui.codebuilder.SarlMethodBuilder; +import io.sarl.lang.ui.codebuilder.SarlParameterBuilder; +import io.sarl.lang.ui.compiler.EclipseGeneratorConfigProvider2; +import io.sarl.lang.ui.compiler.ProjectRelativeFileSystemAccess; +import io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguageGeneratorProvider; +import io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguageOutputConfigurationProvider; +import io.sarl.lang.ui.compiler.extra.preferences.PreferenceBasedFeatureNameConverterRuleReader; +import io.sarl.lang.ui.compiler.extra.preferences.PreferenceBasedTypeConverterRuleReader; +import io.sarl.lang.ui.contentassist.SARLContentAssistFactory; +import io.sarl.lang.ui.contentassist.SARLProposalProvider; +import io.sarl.lang.ui.contentassist.general.SARLContentProposalPriorities; +import io.sarl.lang.ui.contentassist.imports.SARLImportingTypesProposalProvider; +import io.sarl.lang.ui.contentassist.javadoc.SARLJavaDocContentAssistProcessor; +import io.sarl.lang.ui.contentassist.templates.SARLTemplateContextType; +import io.sarl.lang.ui.contentassist.templates.SARLTemplateProposalProvider; +import io.sarl.lang.ui.editor.SARLSourceViewer; +import io.sarl.lang.ui.highlighting.SARLHighlightingCalculator; +import io.sarl.lang.ui.hover.SARLHoverSerializer; +import io.sarl.lang.ui.hover.SARLHoverSignatureProvider; +import io.sarl.lang.ui.hover.SARLHoverUIStrings; +import io.sarl.lang.ui.labeling.IQualifiedNameImageProvider; +import io.sarl.lang.ui.labeling.QualifiedPluginImageHelper; +import io.sarl.lang.ui.labeling.SARLDescriptionLabelProvider; +import io.sarl.lang.ui.labeling.SARLDiagnosticLabelDecorator; +import io.sarl.lang.ui.labeling.SARLHyperLinkingLabelProvider; +import io.sarl.lang.ui.labeling.SARLLabelProvider; import io.sarl.lang.ui.outline.SARLBehaviorUnitOutlineFilter; import io.sarl.lang.ui.outline.SARLFieldOutlineFilter; import io.sarl.lang.ui.outline.SARLOperationOutlineFilter; @@ -67,17 +73,10 @@ import io.sarl.lang.ui.preferences.SARLBuilderPreferenceAccess; import io.sarl.lang.ui.preferences.SARLPreferenceStoreInitializer; import io.sarl.lang.ui.preferences.SARLValidatorConfigurationBlock; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.refactoring.rename.SARLRenameStrategyProvider; import io.sarl.lang.ui.tasks.SarlTaskTagProvider; -import io.sarl.lang.ui.uihelpers.contentassist.SARLContentAssistFactory; -import io.sarl.lang.ui.uihelpers.contentassist.SARLProposalProvider; -import io.sarl.lang.ui.uihelpers.contentassist.general.SARLContentProposalPriorities; -import io.sarl.lang.ui.uihelpers.contentassist.imports.SARLImportingTypesProposalProvider; -import io.sarl.lang.ui.uihelpers.contentassist.javadoc.SARLJavaDocContentAssistProcessor; -import io.sarl.lang.ui.uihelpers.contentassist.templates.SARLTemplateContextType; -import io.sarl.lang.ui.uihelpers.contentassist.templates.SARLTemplateProposalProvider; -import io.sarl.lang.ui.uihelpers.editor.SARLSourceViewer; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; -import io.sarl.lang.ui.uihelpers.refactoring.rename.SARLRenameStrategyProvider; +import io.sarl.lang.ui.validation.SARLUIStrings; import io.sarl.lang.ui.validation.SARLUIValidator; import io.sarl.lang.ui.validation.extra.ExtensionPointExtraLanguageValidatorProvider; import io.sarl.lang.validation.extra.IExtraLanguageValidatorProvider; @@ -527,6 +526,11 @@ public Class bindIImageDescriptor return QualifiedPluginImageHelper.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindExtraLanguageTypeConverter$TypeConverterRuleReader() { + return PreferenceBasedTypeConverterRuleReader.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindXtendJavaDocContentAssistProcessor() { return SARLJavaDocContentAssistProcessor.class; @@ -537,6 +541,11 @@ public Class bindIResourceForEditorInp return XbaseResourceForEditorInputFactory.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindIExtraLanguageGeneratorProvider() { + return ExtensionPointExtraLanguageGeneratorProvider.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindXbaseDeclarativeHoverSignatureProvider() { return SARLHoverSignatureProvider.class; @@ -563,14 +572,13 @@ public Class bindIContextualOu } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindIdeSemanticHighlightingCalculator() { - return SARLHighlightingCalculator.class; + public Class bindIGeneratorConfigProvider2() { + return EclipseGeneratorConfigProvider2.class; } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - @SingletonBinding - public Class bindIQualifiedNameImageProvider() { - return SARLLabelProvider.class; + public Class bindIdeSemanticHighlightingCalculator() { + return SARLHighlightingCalculator.class; } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] @@ -583,11 +591,6 @@ public Class bindIImageHelper() { return QualifiedPluginImageHelper.class; } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindIGeneratorConfigProvider2() { - return EclipseGeneratorConfigProvider2.class; - } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindCodeBuilderFactory() { return SarlCodeBuilderFactory.class; @@ -649,6 +652,11 @@ public Class bindITaskTagProvider() { return SarlTaskTagProvider.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindExtraLanguageFeatureNameConverter$FeatureNameConverterRuleReader() { + return PreferenceBasedFeatureNameConverterRuleReader.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindITemplateProposalProvider() { return SARLTemplateProposalProvider.class; @@ -665,13 +673,14 @@ public Class bindIShouldGenerate() { } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindXtendFieldBuilder() { - return SarlFieldBuilder.class; + @SingletonBinding + public Class bindIQualifiedNameImageProvider() { + return SARLLabelProvider.class; } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindExtraLanguageTypeConverter$TypeConverterRuleReader() { - return PreferenceBasedTypeConverterRuleReader.class; + public Class bindXtendFieldBuilder() { + return SarlFieldBuilder.class; } // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] @@ -689,16 +698,6 @@ public Class bindXtendHoverSerializer() { return SARLHoverSerializer.class; } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindExtraLanguageFeatureNameConverter$FeatureNameConverterRuleReader() { - return PreferenceBasedFeatureNameConverterRuleReader.class; - } - - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindIExtraLanguageGeneratorProvider() { - return ExtensionPointExtraLanguageGeneratorProvider.class; - } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindOutlineFilterAndSorter$IComparator() { return SARLOutlineNodeComparator.class; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/SARLUiModule.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/SARLUiModule.java index 6840fff2d5..b932fb2224 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/SARLUiModule.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/SARLUiModule.java @@ -34,7 +34,7 @@ import org.eclipse.xtext.ui.editor.autoedit.AbstractEditStrategy; import org.eclipse.xtext.validation.IssueSeveritiesProvider; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageGeneratorSupport; +import io.sarl.lang.compiler.extra.ExtraLanguageGeneratorSupport; import io.sarl.lang.ui.bugfixes.pending.xtexteclipse282.Issue282BuilderConfigurationBlock; import io.sarl.lang.ui.validation.UIConfigurableIssueSeveritiesProvider; import io.sarl.lang.validation.IConfigurableIssueSeveritiesProvider; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlCodeBuilderFactory.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlCodeBuilderFactory.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlCodeBuilderFactory.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlCodeBuilderFactory.java index 563a4053e7..3ef93cb0e4 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlCodeBuilderFactory.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlCodeBuilderFactory.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import org.eclipse.xtend.ide.codebuilder.CodeBuilderFactory; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlConstructorBuilder.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlConstructorBuilder.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlConstructorBuilder.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlConstructorBuilder.java index 060f174264..4551d6d0cb 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlConstructorBuilder.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlConstructorBuilder.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import javax.inject.Inject; @@ -28,7 +28,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; import org.eclipse.xtext.xbase.compiler.ISourceAppender; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; import io.sarl.lang.services.SARLGrammarKeywordAccess; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlFieldBuilder.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlFieldBuilder.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlFieldBuilder.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlFieldBuilder.java index 73076cd11c..5d306bc51d 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlFieldBuilder.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlFieldBuilder.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import javax.inject.Inject; @@ -28,7 +28,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; import org.eclipse.xtext.xbase.compiler.ISourceAppender; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; import io.sarl.lang.services.SARLGrammarKeywordAccess; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlMethodBuilder.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlMethodBuilder.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlMethodBuilder.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlMethodBuilder.java index 42c723de13..9ec3456225 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlMethodBuilder.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlMethodBuilder.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import java.util.Collections; import java.util.Iterator; @@ -39,7 +39,7 @@ import org.eclipse.xtext.xbase.typesystem.references.StandardTypeReferenceOwner; import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; import io.sarl.lang.services.SARLGrammarKeywordAccess; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlParameterBuilder.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlParameterBuilder.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlParameterBuilder.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlParameterBuilder.java index 705351112d..c21cf98dcd 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SarlParameterBuilder.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SarlParameterBuilder.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import javax.inject.Inject; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SourceAppenderWithTypeMapping.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SourceAppenderWithTypeMapping.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SourceAppenderWithTypeMapping.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SourceAppenderWithTypeMapping.java index 7d7635ae31..e1e712ddab 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/codebuilder/SourceAppenderWithTypeMapping.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/codebuilder/SourceAppenderWithTypeMapping.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.codebuilder; +package io.sarl.lang.ui.codebuilder; import org.eclipse.xtext.common.types.JvmType; import org.eclipse.xtext.xbase.compiler.ISourceAppender; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/EclipseGeneratorConfigProvider2.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/EclipseGeneratorConfigProvider2.java similarity index 91% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/EclipseGeneratorConfigProvider2.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/EclipseGeneratorConfigProvider2.java index 8156f609d5..08a4448ad7 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/EclipseGeneratorConfigProvider2.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/EclipseGeneratorConfigProvider2.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator; +package io.sarl.lang.ui.compiler; import com.google.common.collect.Iterables; import com.google.inject.Inject; @@ -29,8 +29,8 @@ import org.eclipse.xtext.ui.resource.IStorage2UriMapper; import org.eclipse.xtext.util.Pair; -import io.sarl.lang.compilation.generator.GeneratorConfig2; -import io.sarl.lang.compilation.generator.IGeneratorConfigProvider2; +import io.sarl.lang.compiler.GeneratorConfig2; +import io.sarl.lang.compiler.IGeneratorConfigProvider2; import io.sarl.lang.ui.preferences.SARLBuilderPreferenceAccess; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/builder/ProjectRelativeFileSystemAccess.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/ProjectRelativeFileSystemAccess.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/builder/ProjectRelativeFileSystemAccess.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/ProjectRelativeFileSystemAccess.java index 354b94f9de..257c3b3352 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/builder/ProjectRelativeFileSystemAccess.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/ProjectRelativeFileSystemAccess.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.builder; +package io.sarl.lang.ui.compiler; import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.CoreException; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/AbstractExtraLanguageGeneratorProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/AbstractExtraLanguageGeneratorProvider.java similarity index 89% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/AbstractExtraLanguageGeneratorProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/AbstractExtraLanguageGeneratorProvider.java index 4071548895..d90fc6a646 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/AbstractExtraLanguageGeneratorProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/AbstractExtraLanguageGeneratorProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra; +package io.sarl.lang.ui.compiler.extra; import java.lang.ref.SoftReference; import java.util.Collections; @@ -33,9 +33,9 @@ import org.eclipse.xtext.generator.IGenerator2; import org.eclipse.xtext.generator.IGeneratorContext; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorProvider; -import io.sarl.lang.compilation.generator.extra.IRootGenerator; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorProvider; +import io.sarl.lang.compiler.extra.IRootGenerator; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; /** Abstract implementation of a generator provider. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageGeneratorProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageGeneratorProvider.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageGeneratorProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageGeneratorProvider.java index 2fc5ca0ec8..6707a6230f 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageGeneratorProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageGeneratorProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra; +package io.sarl.lang.ui.compiler.extra; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,7 @@ import org.eclipse.xtext.generator.IGenerator2; import org.eclipse.xtext.generator.IGeneratorContext; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorProvider; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorProvider; import io.sarl.lang.ui.SARLUiConfig; import io.sarl.lang.ui.internal.LangActivator; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java index 3c9718cfa9..b9f2dc4c9a 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguageOutputConfigurationProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra; +package io.sarl.lang.ui.compiler.extra; import java.util.ArrayList; import java.util.List; @@ -35,7 +35,7 @@ import org.eclipse.xtext.generator.IOutputConfigurationProvider; import org.eclipse.xtext.generator.OutputConfiguration; -import io.sarl.lang.compilation.generator.SarlOutputConfigurationProvider; +import io.sarl.lang.compiler.SarlOutputConfigurationProvider; import io.sarl.lang.ui.SARLUiConfig; import io.sarl.lang.ui.internal.LangActivator; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguagePreferenceInitializer.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguagePreferenceInitializer.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguagePreferenceInitializer.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguagePreferenceInitializer.java index 357cb6a0e6..13f1f69d4c 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ExtensionPointExtraLanguagePreferenceInitializer.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ExtensionPointExtraLanguagePreferenceInitializer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra; +package io.sarl.lang.ui.compiler.extra; import java.util.ArrayList; import java.util.List; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ProjectAdapter.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ProjectAdapter.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ProjectAdapter.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ProjectAdapter.java index 965924d306..62419f0dc3 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/ProjectAdapter.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/ProjectAdapter.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra; +package io.sarl.lang.ui.compiler.extra; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/ExtraLanguagePreferenceAccess.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/ExtraLanguagePreferenceAccess.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/ExtraLanguagePreferenceAccess.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/ExtraLanguagePreferenceAccess.java index 7459530fd4..e96a398ded 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/ExtraLanguagePreferenceAccess.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/ExtraLanguagePreferenceAccess.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.preferences; +package io.sarl.lang.ui.compiler.extra.preferences; import java.util.Iterator; import java.util.Map; @@ -35,8 +35,8 @@ import org.eclipse.xtext.ui.editor.preferences.PreferenceStoreAccessImpl; import org.eclipse.xtext.xbase.lib.Procedures.Procedure2; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; -import io.sarl.lang.ui.compilation.generator.extra.properties.AbstractGeneratorConfigurationBlock; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.ui.compiler.extra.properties.AbstractGeneratorConfigurationBlock; /** Preferences for the extra language generators. * @@ -233,7 +233,7 @@ public boolean isGeneratorEnabled(String pluginID, IProject project) { * converted. The second parameter is the target string. * @return {@code true} if a data was parsed. {@code false} if no value was parsed. */ - public static boolean parseConverterPreferenceValue(String input, Procedure2 output) { + public static boolean parseConverterPreferenceValue(String input, Procedure2 output) { final StringTokenizer tokenizer = new StringTokenizer(input, PREFERENCE_SEPARATOR); String key = null; boolean foundValue = false; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java similarity index 80% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java index c753ddbdb5..b2d68c48c1 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedFeatureNameConverterRuleReader.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.preferences; +package io.sarl.lang.ui.compiler.extra.preferences; import java.util.ArrayList; import java.util.List; @@ -31,12 +31,12 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.xtext.xbase.lib.Pair; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter.FeatureNameConverterRuleReader; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter.FeaturePattern; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter.FeatureReplacement; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorContext; -import io.sarl.lang.ui.compilation.generator.extra.ProjectAdapter; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter.FeatureNameConverterRuleReader; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter.FeaturePattern; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter.FeatureReplacement; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorContext; +import io.sarl.lang.ui.compiler.extra.ProjectAdapter; /** Reader of the feature name conversion rules from the preferences. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedTypeConverterRuleReader.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedTypeConverterRuleReader.java similarity index 85% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedTypeConverterRuleReader.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedTypeConverterRuleReader.java index 08f5efab2f..6547102ac6 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/preferences/PreferenceBasedTypeConverterRuleReader.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/preferences/PreferenceBasedTypeConverterRuleReader.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.preferences; +package io.sarl.lang.ui.compiler.extra.preferences; import java.util.Map; @@ -28,9 +28,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jface.preference.IPreferenceStore; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageTypeConverter.TypeConverterRuleReader; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorContext; -import io.sarl.lang.ui.compilation.generator.extra.ProjectAdapter; +import io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter.TypeConverterRuleReader; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorContext; +import io.sarl.lang.ui.compiler.extra.ProjectAdapter; /** Reader of the type conversion rules from the preferences. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractConversionTable.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractConversionTable.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractConversionTable.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractConversionTable.java index 02015e361b..f75ebfdcae 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractConversionTable.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractConversionTable.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -69,7 +69,7 @@ import org.eclipse.xtext.util.Strings; import org.eclipse.xtext.xbase.lib.Pair; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; /** Abstract implementation of a table for conversion definition. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraControl.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraControl.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraControl.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraControl.java index 51dfe6d6cc..0be20e0ab7 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraControl.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraControl.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import java.lang.ref.WeakReference; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraLanguagePropertyPage.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraLanguagePropertyPage.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraLanguagePropertyPage.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraLanguagePropertyPage.java index 8c0ac73990..742404ec7c 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractExtraLanguagePropertyPage.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractExtraLanguagePropertyPage.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import com.google.inject.Inject; import com.google.inject.name.Named; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractGeneratorConfigurationBlock.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractGeneratorConfigurationBlock.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractGeneratorConfigurationBlock.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractGeneratorConfigurationBlock.java index cc24a4b468..a916c634ba 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/AbstractGeneratorConfigurationBlock.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/AbstractGeneratorConfigurationBlock.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import java.util.List; import java.util.Set; @@ -65,8 +65,8 @@ import org.eclipse.xtext.ui.preferences.OptionsConfigurationBlock; import org.eclipse.xtext.ui.preferences.ScrolledPageContent; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageOutputConfigurations; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.compiler.extra.ExtraLanguageOutputConfigurations; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; import io.sarl.lang.ui.internal.LangActivator; /** Abstract implementation for the configuration block dedicated to an extra language generator. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/FeatureNameConversionTable.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/FeatureNameConversionTable.java similarity index 94% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/FeatureNameConversionTable.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/FeatureNameConversionTable.java index 506e8ae0ed..186d3f4017 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/FeatureNameConversionTable.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/FeatureNameConversionTable.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.swt.graphics.Image; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; /** Table for feature name conversion definition. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControl.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControl.java similarity index 94% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControl.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControl.java index ed3109883a..a448faf66b 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControl.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControl.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; /** Control wrapper that may be automatically considered in the optiona dialog. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControlController.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControlController.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControlController.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControlController.java index bf9af0f884..ce062fec7b 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/IExtraControlController.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/IExtraControlController.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/Messages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/Messages.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/Messages.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/Messages.java index dfa7d77e07..98d7a52e9d 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/Messages.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/TypeConversionTable.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/TypeConversionTable.java similarity index 94% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/TypeConversionTable.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/TypeConversionTable.java index d9a13b7b22..a9efc9652a 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/TypeConversionTable.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/TypeConversionTable.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.generator.extra.properties; +package io.sarl.lang.ui.compiler.extra.properties; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.swt.graphics.Image; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; /** Table for type conversion definition. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/generator/extra/properties/messages.properties rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compiler/extra/properties/messages.properties diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLContentAssistFactory.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLContentAssistFactory.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLContentAssistFactory.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLContentAssistFactory.java index 379b218701..cafccb3dc2 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLContentAssistFactory.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLContentAssistFactory.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist; +package io.sarl.lang.ui.contentassist; import javax.inject.Inject; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLProposalProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLProposalProvider.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLProposalProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLProposalProvider.java index 19db082a54..2e732b6122 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/SARLProposalProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/SARLProposalProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist; +package io.sarl.lang.ui.contentassist; import java.util.Objects; @@ -82,9 +82,8 @@ import io.sarl.lang.sarl.SarlRequiredCapacity; import io.sarl.lang.sarl.SarlSkill; import io.sarl.lang.services.SARLGrammarKeywordAccess; -import io.sarl.lang.ui.contentassist.AbstractSARLProposalProvider; -import io.sarl.lang.ui.info.images.SARLImages; -import io.sarl.lang.ui.uihelpers.contentassist.general.SARLContentProposalPriorities; +import io.sarl.lang.ui.contentassist.general.SARLContentProposalPriorities; +import io.sarl.lang.ui.labeling.SARLImages; import io.sarl.lang.util.Utils; /** Provides proposal for the content assist mechanism. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/general/SARLContentProposalPriorities.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/general/SARLContentProposalPriorities.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/general/SARLContentProposalPriorities.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/general/SARLContentProposalPriorities.java index 5ff8d09445..a2a59f5835 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/general/SARLContentProposalPriorities.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/general/SARLContentProposalPriorities.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist.general; +package io.sarl.lang.ui.contentassist.general; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.xtext.xbase.ui.contentassist.XbaseContentProposalPriorities; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/imports/SARLImportingTypesProposalProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/imports/SARLImportingTypesProposalProvider.java similarity index 92% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/imports/SARLImportingTypesProposalProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/imports/SARLImportingTypesProposalProvider.java index 01757239cd..5d2373ed24 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/imports/SARLImportingTypesProposalProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/imports/SARLImportingTypesProposalProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist.imports; +package io.sarl.lang.ui.contentassist.imports; import javax.inject.Inject; @@ -31,8 +31,8 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalFactory; import org.eclipse.xtext.xbase.ui.contentassist.ImportingTypesProposalProvider; -import io.sarl.lang.compilation.typesystem.InheritanceHelper; -import io.sarl.lang.ui.info.images.IQualifiedNameImageProvider; +import io.sarl.lang.typesystem.InheritanceHelper; +import io.sarl.lang.ui.labeling.IQualifiedNameImageProvider; /** Provider of proposals for the types to be imported. * This provider is part of the content assist mechanism. Its goal is not to provide diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java index 356b1d9160..6b582db69d 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/javadoc/SARLJavaDocContentAssistProcessor.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist.javadoc; +package io.sarl.lang.ui.contentassist.javadoc; import org.eclipse.xtend.ide.contentassist.javadoc.XtendJavaDocContentAssistProcessor; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateContextType.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateContextType.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateContextType.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateContextType.java index 625c0fb24a..bd14fcc585 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateContextType.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateContextType.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist.templates; +package io.sarl.lang.ui.contentassist.templates; import org.eclipse.xtext.ui.editor.templates.CrossReferenceTemplateVariableResolver; import org.eclipse.xtext.xbase.ui.templates.XbaseTemplateContextType; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateProposalProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateProposalProvider.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateProposalProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateProposalProvider.java index 8be3ba535c..4687dd0f88 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/contentassist/templates/SARLTemplateProposalProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/contentassist/templates/SARLTemplateProposalProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.contentassist.templates; +package io.sarl.lang.ui.contentassist.templates; import javax.inject.Inject; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/DocumentAutoFormatter.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/DocumentAutoFormatter.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/DocumentAutoFormatter.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/DocumentAutoFormatter.java index 96bb9f2daf..37fa42574d 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/DocumentAutoFormatter.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/DocumentAutoFormatter.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.editor; +package io.sarl.lang.ui.editor; import java.util.ArrayList; import java.util.Collection; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/IDocumentAutoFormatter.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/IDocumentAutoFormatter.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java index 8f96933991..4fe8f10bd1 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/IDocumentAutoFormatter.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/IDocumentAutoFormatter.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.editor; +package io.sarl.lang.ui.editor; import com.google.inject.ImplementedBy; import org.eclipse.jface.text.formatter.IContentFormatter; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/SARLSourceViewer.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/SARLSourceViewer.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/SARLSourceViewer.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/SARLSourceViewer.java index 99d15e6c55..33948e366f 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/editor/SARLSourceViewer.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/editor/SARLSourceViewer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.editor; +package io.sarl.lang.ui.editor; import java.lang.reflect.Field; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/highlighting/SARLHighlightingCalculator.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/highlighting/SARLHighlightingCalculator.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/highlighting/SARLHighlightingCalculator.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/highlighting/SARLHighlightingCalculator.java index b9e85391de..628d7d1135 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/compilation/highlighting/SARLHighlightingCalculator.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/highlighting/SARLHighlightingCalculator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.compilation.highlighting; +package io.sarl.lang.ui.highlighting; import java.util.Map; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSerializer.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSerializer.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSerializer.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSerializer.java index 6c943cac5b..28e5862850 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSerializer.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSerializer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.hover; +package io.sarl.lang.ui.hover; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtend.ide.hover.XtendHoverSerializer; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSignatureProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSignatureProvider.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSignatureProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSignatureProvider.java index bf326d0b56..197dfc9577 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverSignatureProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverSignatureProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.hover; +package io.sarl.lang.ui.hover; import javax.inject.Inject; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverUIStrings.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverUIStrings.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverUIStrings.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverUIStrings.java index cf14f3ce20..9995ad56a0 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hover/SARLHoverUIStrings.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/hover/SARLHoverUIStrings.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.hover; +package io.sarl.lang.ui.hover; import javax.inject.Inject; @@ -28,7 +28,7 @@ import org.eclipse.xtext.xbase.ui.hover.HoverUiStrings; import io.sarl.lang.services.SARLGrammarKeywordAccess; -import io.sarl.lang.ui.info.labeling.SARLUIStrings; +import io.sarl.lang.ui.validation.SARLUIStrings; /** * UI Strings for hovers. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/Messages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/Messages.java deleted file mode 100644 index 4e92c1233a..0000000000 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/Messages.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * $Id$ - * - * SARL is an general-purpose agent programming language. - * More details on http://www.sarl.io - * - * Copyright (C) 2014-2017 the original authors or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.sarl.lang.ui.info.hyperlinking; - -import org.eclipse.osgi.util.NLS; - -/** Localized Messages. - * @author $Author: sgalland$ - * @version $FullVersion$ - * @mavengroupid $GroupId$ - * @mavenartifactid $ArtifactId$ - */ -@SuppressWarnings("all") -public class Messages extends NLS { - private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$ - public static String SARLHyperLinkingLabelProvider_0; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/messages.properties deleted file mode 100644 index 60e25a2042..0000000000 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/messages.properties +++ /dev/null @@ -1 +0,0 @@ -SARLHyperLinkingLabelProvider_0=Open Declaration - {0} diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/messages.properties deleted file mode 100644 index 5cee87abb6..0000000000 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/messages.properties +++ /dev/null @@ -1,3 +0,0 @@ -SARLLabelProvider_0=capacity uses -SARLLabelProvider_1=required capacities -SARLLabelProvider_2=guarded \ No newline at end of file diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/IQualifiedNameImageProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/IQualifiedNameImageProvider.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/IQualifiedNameImageProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/IQualifiedNameImageProvider.java index 7c0b1511a2..cb6229da4a 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/IQualifiedNameImageProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/IQualifiedNameImageProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.images; +package io.sarl.lang.ui.labeling; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/Messages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/Messages.java similarity index 93% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/Messages.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/Messages.java index 568a133e4a..a2e08308fd 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/Messages.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.labeling; +package io.sarl.lang.ui.labeling; import org.eclipse.osgi.util.NLS; @@ -35,6 +35,7 @@ public class Messages extends NLS { public static String SARLLabelProvider_0; public static String SARLLabelProvider_1; public static String SARLLabelProvider_2; + public static String SARLHyperLinkingLabelProvider_0; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/QualifiedPluginImageHelper.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/QualifiedPluginImageHelper.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/QualifiedPluginImageHelper.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/QualifiedPluginImageHelper.java index 25c7bdfab3..82ca01730f 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/QualifiedPluginImageHelper.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/QualifiedPluginImageHelper.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.images; +package io.sarl.lang.ui.labeling; import javax.inject.Singleton; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDescriptionLabelProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDescriptionLabelProvider.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDescriptionLabelProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDescriptionLabelProvider.java index a44fddef80..4ea954c1db 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDescriptionLabelProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDescriptionLabelProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.labeling; +package io.sarl.lang.ui.labeling; import javax.inject.Singleton; @@ -45,7 +45,6 @@ import io.sarl.lang.sarl.SarlRequiredCapacity; import io.sarl.lang.sarl.SarlScript; import io.sarl.lang.sarl.SarlSkill; -import io.sarl.lang.ui.info.images.SARLImages; /** * Provides labels for a IEObjectDescriptions and IResourceDescriptions. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDiagnosticLabelDecorator.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDiagnosticLabelDecorator.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDiagnosticLabelDecorator.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDiagnosticLabelDecorator.java index d2a20b05e3..d5f6506e6c 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLDiagnosticLabelDecorator.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLDiagnosticLabelDecorator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.labeling; +package io.sarl.lang.ui.labeling; import java.lang.reflect.Method; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/SARLHyperLinkingLabelProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLHyperLinkingLabelProvider.java similarity index 93% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/SARLHyperLinkingLabelProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLHyperLinkingLabelProvider.java index 19759c0d4c..2fcfbca4df 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/hyperlinking/SARLHyperLinkingLabelProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLHyperLinkingLabelProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.hyperlinking; +package io.sarl.lang.ui.labeling; import java.text.MessageFormat; @@ -27,8 +27,6 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; -import io.sarl.lang.ui.info.labeling.SARLLabelProvider; - /** * Label provider for hyperlinks. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/SARLImages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLImages.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/SARLImages.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLImages.java index 4017a860e9..dc731d0b06 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/images/SARLImages.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLImages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.images; +package io.sarl.lang.ui.labeling; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLLabelProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLLabelProvider.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLLabelProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLLabelProvider.java index 84ed29950b..88ee6778b3 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLLabelProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/SARLLabelProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.labeling; +package io.sarl.lang.ui.labeling; import java.util.Collections; import java.util.concurrent.locks.ReentrantLock; @@ -63,7 +63,6 @@ import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; import org.eclipse.xtext.xbase.ui.labeling.XbaseImageAdornments; -import io.sarl.lang.compilation.typesystem.InheritanceHelper; import io.sarl.lang.sarl.SarlAction; import io.sarl.lang.sarl.SarlAgent; import io.sarl.lang.sarl.SarlBehavior; @@ -78,8 +77,8 @@ import io.sarl.lang.sarl.SarlScript; import io.sarl.lang.sarl.SarlSkill; import io.sarl.lang.services.SARLGrammarKeywordAccess; -import io.sarl.lang.ui.info.images.IQualifiedNameImageProvider; -import io.sarl.lang.ui.info.images.SARLImages; +import io.sarl.lang.typesystem.InheritanceHelper; +import io.sarl.lang.ui.validation.SARLUIStrings; /** * Provides labels for a EObjects. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/messages.properties new file mode 100644 index 0000000000..3aab5fb093 --- /dev/null +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/labeling/messages.properties @@ -0,0 +1,4 @@ +SARLLabelProvider_0=capacity uses +SARLLabelProvider_1=required capacities +SARLLabelProvider_2=guarded +SARLHyperLinkingLabelProvider_0=Open Declaration - {0} diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/outline/SARLOutlineTreeProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/outline/SARLOutlineTreeProvider.java index 6ebb5800dd..d0880746eb 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/outline/SARLOutlineTreeProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/outline/SARLOutlineTreeProvider.java @@ -49,7 +49,7 @@ import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlAction; import io.sarl.lang.sarl.SarlBehaviorUnit; import io.sarl.lang.sarl.SarlCapacityUses; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderConfigurationBlock.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderConfigurationBlock.java index 9606b04921..4398ac980b 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderConfigurationBlock.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderConfigurationBlock.java @@ -38,7 +38,7 @@ import org.eclipse.xtext.generator.OutputConfiguration; import org.eclipse.xtext.xbase.ui.builder.XbaseBuilderConfigurationBlock; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageOutputConfigurations; +import io.sarl.lang.compiler.extra.ExtraLanguageOutputConfigurations; /** Preference page that permits to configure the SARL builder. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderPreferenceAccess.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderPreferenceAccess.java index 8412a964eb..96276be77e 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderPreferenceAccess.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLBuilderPreferenceAccess.java @@ -26,7 +26,7 @@ import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess; import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer; -import io.sarl.lang.compilation.generator.GeneratorConfig2; +import io.sarl.lang.compiler.GeneratorConfig2; /** Accessors to the preferences for the SARL builder. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLPreferenceStoreInitializer.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLPreferenceStoreInitializer.java index 5703f47d30..cb1df4d9d5 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLPreferenceStoreInitializer.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/preferences/SARLPreferenceStoreInitializer.java @@ -32,7 +32,7 @@ import org.eclipse.xtext.ui.editor.preferences.PreferenceConstants; import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider; -import io.sarl.lang.ui.compilation.generator.extra.ExtensionPointExtraLanguagePreferenceInitializer; +import io.sarl.lang.ui.compiler.extra.ExtensionPointExtraLanguagePreferenceInitializer; /** Initialize the preference store with SARL specific information. * diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/SARLQuickfixProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/SARLQuickfixProvider.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/SARLQuickfixProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/SARLQuickfixProvider.java index d79c9c0961..9c75e29348 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/SARLQuickfixProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/SARLQuickfixProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix; +package io.sarl.lang.ui.quickfix; import java.lang.reflect.Method; import java.util.ArrayList; @@ -75,24 +75,24 @@ import io.sarl.lang.sarl.SarlSkill; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; import io.sarl.lang.services.SARLGrammarKeywordAccess; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ActionAddModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.AnnotationRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.BehaviorUnitGuardRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.CapacityReferenceRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ExtendedTypeRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.FiredEventRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ImplementedTypeRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ImplementedTypeRemoveModification.RemovalType; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.MemberRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.MemberRenameModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.Messages; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.MissedMethodAddModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.MultiModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ProtectKeywordModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ReturnTypeAddModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.ReturnTypeReplaceModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.SuperTypeRemoveModification; -import io.sarl.lang.ui.uihelpers.quickfix.acceptors.SuppressWarningsAddModification; +import io.sarl.lang.ui.quickfix.acceptors.ActionAddModification; +import io.sarl.lang.ui.quickfix.acceptors.AnnotationRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.BehaviorUnitGuardRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.CapacityReferenceRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.ExtendedTypeRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.FiredEventRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.ImplementedTypeRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.ImplementedTypeRemoveModification.RemovalType; +import io.sarl.lang.ui.quickfix.acceptors.MemberRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.MemberRenameModification; +import io.sarl.lang.ui.quickfix.acceptors.Messages; +import io.sarl.lang.ui.quickfix.acceptors.MissedMethodAddModification; +import io.sarl.lang.ui.quickfix.acceptors.MultiModification; +import io.sarl.lang.ui.quickfix.acceptors.ProtectKeywordModification; +import io.sarl.lang.ui.quickfix.acceptors.ReturnTypeAddModification; +import io.sarl.lang.ui.quickfix.acceptors.ReturnTypeReplaceModification; +import io.sarl.lang.ui.quickfix.acceptors.SuperTypeRemoveModification; +import io.sarl.lang.ui.quickfix.acceptors.SuppressWarningsAddModification; import io.sarl.lang.validation.SyntaxIssueCodes; /** diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ActionAddModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ActionAddModification.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ActionAddModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ActionAddModification.java index 712fa39dff..41134616e6 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ActionAddModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ActionAddModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -35,7 +35,7 @@ import org.eclipse.xtext.validation.Issue; import org.eclipse.xtext.xbase.ui.contentassist.ReplacingAppendable; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Add an action. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/AnnotationRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/AnnotationRemoveModification.java similarity index 94% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/AnnotationRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/AnnotationRemoveModification.java index 7684ad2334..b45b7911b8 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/AnnotationRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/AnnotationRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.validation.Issue; import org.eclipse.xtext.xbase.annotations.xAnnotations.XAnnotation; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove an annotation. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java index edd7067a71..ff98326508 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/BehaviorUnitGuardRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove behavior unit guard. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/CapacityReferenceRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/CapacityReferenceRemoveModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/CapacityReferenceRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/CapacityReferenceRemoveModification.java index c9aa6123f2..4f0b3f300c 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/CapacityReferenceRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/CapacityReferenceRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove a super type. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ExtendedTypeRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ExtendedTypeRemoveModification.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ExtendedTypeRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ExtendedTypeRemoveModification.java index 80ca2b6e8b..3a4ea44463 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ExtendedTypeRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ExtendedTypeRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -32,7 +32,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove an extended type. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/FiredEventRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/FiredEventRemoveModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/FiredEventRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/FiredEventRemoveModification.java index 2c87a97ba4..a336695786 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/FiredEventRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/FiredEventRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove a fired event. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ImplementedTypeRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ImplementedTypeRemoveModification.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ImplementedTypeRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ImplementedTypeRemoveModification.java index 99f334b76f..d46380f8f4 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ImplementedTypeRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ImplementedTypeRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -31,7 +31,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove an implemented type. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRemoveModification.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRemoveModification.java index 0a56c91db9..49dda09e1b 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove a member. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRenameModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRenameModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRenameModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRenameModification.java index c158d8646d..e2e830d0d7 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MemberRenameModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MemberRenameModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -30,7 +30,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Rename a member. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/Messages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/Messages.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/Messages.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/Messages.java index 43d5e15225..f98558e66d 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/Messages.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MissedMethodAddModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MissedMethodAddModification.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MissedMethodAddModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MissedMethodAddModification.java index 3a0160e44e..cf9a256e32 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MissedMethodAddModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MissedMethodAddModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.util.ArrayList; import java.util.LinkedList; @@ -62,15 +62,15 @@ import io.sarl.lang.annotation.FiredEvent; import io.sarl.lang.annotation.SyntheticMember; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; -import io.sarl.lang.compilation.typesystem.SARLAnnotationUtil; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.actionprototype.FormalParameterProvider; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; import io.sarl.lang.sarl.actionprototype.InferredPrototype; import io.sarl.lang.sarl.actionprototype.QualifiedActionName; -import io.sarl.lang.ui.compilation.codebuilder.SarlMethodBuilder; -import io.sarl.lang.ui.compilation.codebuilder.SarlParameterBuilder; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.typesystem.SARLAnnotationUtil; +import io.sarl.lang.ui.codebuilder.SarlMethodBuilder; +import io.sarl.lang.ui.codebuilder.SarlParameterBuilder; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; import io.sarl.lang.util.Utils; /** diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MultiModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MultiModification.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MultiModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MultiModification.java index 2c13d2a62a..e31c646a91 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/MultiModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/MultiModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * A Semantic modificaton that contains multiple modifications that are selecting diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ProtectKeywordModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ProtectKeywordModification.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ProtectKeywordModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ProtectKeywordModification.java index db9294dacb..7572c55a7e 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ProtectKeywordModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ProtectKeywordModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; import java.util.regex.Pattern; @@ -33,7 +33,7 @@ import org.eclipse.xtext.util.Strings; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Add the ^ character before a keywword. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeAddModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeAddModification.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeAddModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeAddModification.java index c38f7a2b9a..7b320cf7f1 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeAddModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeAddModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -36,7 +36,7 @@ import org.eclipse.xtext.validation.Issue; import org.eclipse.xtext.xbase.ui.contentassist.ReplacingAppendable; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Replace the return type of an action. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeReplaceModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeReplaceModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeReplaceModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeReplaceModification.java index 8f7da0c248..abb9503f3f 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/ReturnTypeReplaceModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/ReturnTypeReplaceModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; @@ -31,7 +31,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Replace the return type of an action. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SARLSemanticModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SARLSemanticModification.java similarity index 94% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SARLSemanticModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SARLSemanticModification.java index 2ac349f2ac..4910830c3f 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SARLSemanticModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SARLSemanticModification.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.lang.ref.WeakReference; import org.eclipse.xtext.ui.editor.model.edit.ISemanticModification; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Custom quickfixes. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuperTypeRemoveModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuperTypeRemoveModification.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuperTypeRemoveModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuperTypeRemoveModification.java index 52829bb930..3d3869e55a 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuperTypeRemoveModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuperTypeRemoveModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -29,7 +29,7 @@ import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor; import org.eclipse.xtext.validation.Issue; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Remove a super type. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuppressWarningsAddModification.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuppressWarningsAddModification.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuppressWarningsAddModification.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuppressWarningsAddModification.java index f9d20eda76..ed89fdf558 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/SuppressWarningsAddModification.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/SuppressWarningsAddModification.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.quickfix.acceptors; +package io.sarl.lang.ui.quickfix.acceptors; import java.text.MessageFormat; import java.util.Objects; @@ -45,7 +45,7 @@ import org.eclipse.xtext.xbase.annotations.xAnnotations.XAnnotation; import org.eclipse.xtext.xbase.ui.contentassist.ReplacingAppendable; -import io.sarl.lang.ui.uihelpers.quickfix.SARLQuickfixProvider; +import io.sarl.lang.ui.quickfix.SARLQuickfixProvider; /** * Add a suppress-warning annotation. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/quickfix/acceptors/messages.properties rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/quickfix/acceptors/messages.properties diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/EcorePackageRenameStrategy.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/EcorePackageRenameStrategy.java similarity index 97% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/EcorePackageRenameStrategy.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/EcorePackageRenameStrategy.java index 54e6a1f8f1..c27e9b430e 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/EcorePackageRenameStrategy.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/EcorePackageRenameStrategy.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.refactoring.rename; +package io.sarl.lang.ui.refactoring.rename; import java.text.MessageFormat; import java.util.regex.Pattern; @@ -62,7 +62,7 @@ public class EcorePackageRenameStrategy implements DefaultRenameStrategyProvider private String currentPackageName; - private Function1 uriProvider; + private Function1 uriProvider; /** * Validate the package name. diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/Messages.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/Messages.java similarity index 95% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/Messages.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/Messages.java index 34de533290..38884407b3 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/Messages.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.refactoring.rename; +package io.sarl.lang.ui.refactoring.rename; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLFileRenameParticipant.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLFileRenameParticipant.java similarity index 98% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLFileRenameParticipant.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLFileRenameParticipant.java index 470e92d993..78088c5285 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLFileRenameParticipant.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLFileRenameParticipant.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.refactoring.rename; +package io.sarl.lang.ui.refactoring.rename; import static java.util.Collections.singletonList; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLJdtPackageRenameParticipant.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLJdtPackageRenameParticipant.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLJdtPackageRenameParticipant.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLJdtPackageRenameParticipant.java index d9a88bf2d5..f396a40bb7 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLJdtPackageRenameParticipant.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLJdtPackageRenameParticipant.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.refactoring.rename; +package io.sarl.lang.ui.refactoring.rename; import java.util.ArrayList; import java.util.Arrays; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLRenameStrategyProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLRenameStrategyProvider.java similarity index 96% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLRenameStrategyProvider.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLRenameStrategyProvider.java index fbe7fe6781..5e17f50489 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/SARLRenameStrategyProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLRenameStrategyProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.uihelpers.refactoring.rename; +package io.sarl.lang.ui.refactoring.rename; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/messages.properties b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/uihelpers/refactoring/rename/messages.properties rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/messages.properties diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLUIStrings.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/SARLUIStrings.java similarity index 99% rename from main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLUIStrings.java rename to main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/SARLUIStrings.java index 8137178fff..a024b0f80b 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/info/labeling/SARLUIStrings.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/SARLUIStrings.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.ui.info.labeling; +package io.sarl.lang.ui.validation; import java.util.Iterator; diff --git a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/extra/AbstractExtraLanguageValidatorProvider.java b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/extra/AbstractExtraLanguageValidatorProvider.java index b40d8f7246..d65893c7ca 100644 --- a/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/extra/AbstractExtraLanguageValidatorProvider.java +++ b/main/coreplugins/io.sarl.lang.ui/src/io/sarl/lang/ui/validation/extra/AbstractExtraLanguageValidatorProvider.java @@ -32,8 +32,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.emf.ecore.resource.Resource; -import io.sarl.lang.ui.compilation.generator.extra.ProjectAdapter; -import io.sarl.lang.ui.compilation.generator.extra.preferences.ExtraLanguagePreferenceAccess; +import io.sarl.lang.ui.compiler.extra.ProjectAdapter; +import io.sarl.lang.ui.compiler.extra.preferences.ExtraLanguagePreferenceAccess; import io.sarl.lang.validation.extra.AbstractExtraLanguageValidator; import io.sarl.lang.validation.extra.IExtraLanguageValidatorProvider; diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF index af7e06eec1..23f3986b66 100644 --- a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF +++ b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF @@ -1,52 +1,50 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 0.6.0.qualifier -Bundle-SymbolicName: io.sarl.lang; singleton:=true -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport, - org.eclipse.xtend.core;bundle-version="2.12.0", - org.eclipse.xtext;bundle-version="2.12.0", - org.eclipse.xtext.xbase;bundle-version="2.12.0", - org.eclipse.xtext.xbase.lib;bundle-version="2.12.0", - org.eclipse.xtext.common.types;bundle-version="2.12.0", - org.eclipse.xtext.util;bundle-version="2.12.0", - org.eclipse.osgi;bundle-version="3.12.0", - org.eclipse.emf.codegen;bundle-version="2.12.0", - org.antlr.runtime;bundle-version="3.2.0", - org.objectweb.asm;bundle-version="5.0.1";resolution:=optional, - org.eclipse.jdt.core;bundle-version="3.13.0" -Bundle-Activator: io.sarl.lang.SARLLangActivator -Export-Package: io.sarl.lang, - io.sarl.lang.bugfixes.pending.bug621, - io.sarl.lang.bugfixes.refused.bug623, - io.sarl.lang.bugfixes.unpublished, - io.sarl.lang.bugfixes.unpublished.bug356, - io.sarl.lang.codebuilder, - io.sarl.lang.codebuilder.appenders, - io.sarl.lang.codebuilder.builders, - io.sarl.lang.compilation.compiler, - io.sarl.lang.compilation.compiler.batch, - io.sarl.lang.compilation.controlflow, - io.sarl.lang.compilation.generator, - io.sarl.lang.compilation.generator.extra, - io.sarl.lang.compilation.jvmmodel, - io.sarl.lang.compilation.scoping, - io.sarl.lang.compilation.typesystem, - io.sarl.lang.documentation, - io.sarl.lang.formatting2, - io.sarl.lang.parser.antlr, - io.sarl.lang.parser.antlr.internal, - io.sarl.lang.sarl, - io.sarl.lang.sarl.actionprototype, - io.sarl.lang.sarl.impl, - io.sarl.lang.sarl.util, - io.sarl.lang.scoping, - io.sarl.lang.serializer, - io.sarl.lang.services, - io.sarl.lang.util, - io.sarl.lang.validation, - io.sarl.lang.validation.extra -Import-Package: org.apache.log4j +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 0.6.0.qualifier +Bundle-SymbolicName: io.sarl.lang; singleton:=true +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport, + org.eclipse.xtend.core;bundle-version="2.12.0", + org.eclipse.xtext;bundle-version="2.12.0", + org.eclipse.xtext.xbase;bundle-version="2.12.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.12.0", + org.eclipse.xtext.common.types;bundle-version="2.12.0", + org.eclipse.xtext.util;bundle-version="2.12.0", + org.eclipse.osgi;bundle-version="3.12.0", + org.eclipse.emf.codegen;bundle-version="2.12.0", + org.antlr.runtime;bundle-version="3.2.0", + org.objectweb.asm;bundle-version="5.0.1";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.13.0" +Bundle-Activator: io.sarl.lang.SARLLangActivator +Export-Package: io.sarl.lang, + io.sarl.lang.bugfixes.pending.bug621, + io.sarl.lang.bugfixes.refused.bug623, + io.sarl.lang.bugfixes.unpublished, + io.sarl.lang.bugfixes.unpublished.bug356, + io.sarl.lang.codebuilder, + io.sarl.lang.codebuilder.appenders, + io.sarl.lang.codebuilder.builders, + io.sarl.lang.compiler, + io.sarl.lang.compiler.batch, + io.sarl.lang.compiler.extra, + io.sarl.lang.controlflow, + io.sarl.lang.documentation, + io.sarl.lang.formatting2, + io.sarl.lang.jvmmodel, + io.sarl.lang.parser.antlr, + io.sarl.lang.parser.antlr.internal, + io.sarl.lang.sarl, + io.sarl.lang.sarl.actionprototype, + io.sarl.lang.sarl.impl, + io.sarl.lang.sarl.util, + io.sarl.lang.scoping, + io.sarl.lang.serializer, + io.sarl.lang.services, + io.sarl.lang.typesystem, + io.sarl.lang.util, + io.sarl.lang.validation, + io.sarl.lang.validation.extra +Import-Package: org.apache.log4j diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/AbstractSARLRuntimeModule.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/AbstractSARLRuntimeModule.java index bec58d7803..bf6aab606c 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/AbstractSARLRuntimeModule.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/AbstractSARLRuntimeModule.java @@ -26,7 +26,6 @@ import com.google.inject.Binder; import com.google.inject.Provider; import com.google.inject.name.Names; - import io.sarl.lang.codebuilder.CodeBuilderFactory; import io.sarl.lang.codebuilder.builders.BlockExpressionBuilderImpl; import io.sarl.lang.codebuilder.builders.ExpressionBuilderImpl; @@ -70,23 +69,15 @@ import io.sarl.lang.codebuilder.builders.SarlSpaceBuilderImpl; import io.sarl.lang.codebuilder.builders.ScriptBuilderImpl; import io.sarl.lang.codebuilder.builders.TypeParameterBuilderImpl; -import io.sarl.lang.compilation.compiler.SarlCompiler; -import io.sarl.lang.compilation.controlflow.ExtendedSARLEarlyExitComputer; -import io.sarl.lang.compilation.controlflow.ISarlEarlyExitComputer; -import io.sarl.lang.compilation.controlflow.SARLEarlyExitComputer; -import io.sarl.lang.compilation.generator.GeneratorConfigProvider2; -import io.sarl.lang.compilation.generator.IGeneratorConfigProvider2; -import io.sarl.lang.compilation.generator.SARLGeneratorConfigProvider; -import io.sarl.lang.compilation.generator.SARLJvmGenerator; -import io.sarl.lang.compilation.generator.SarlOutputConfigurationProvider; -import io.sarl.lang.compilation.jvmmodel.SARLJvmModelInferrer; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; -import io.sarl.lang.compilation.scoping.SARLImplicitlyImportedFeatures; -import io.sarl.lang.compilation.scoping.SARLScopeProvider; -import io.sarl.lang.compilation.scoping.SARLSerializerScopeProvider; -import io.sarl.lang.compilation.typesystem.SARLExpressionHelper; -import io.sarl.lang.compilation.typesystem.SARLReentrantTypeResolver; -import io.sarl.lang.compilation.typesystem.SARLTypeComputer; +import io.sarl.lang.compiler.GeneratorConfigProvider2; +import io.sarl.lang.compiler.IGeneratorConfigProvider2; +import io.sarl.lang.compiler.SARLGeneratorConfigProvider; +import io.sarl.lang.compiler.SARLJvmGenerator; +import io.sarl.lang.compiler.SarlCompiler; +import io.sarl.lang.compiler.SarlOutputConfigurationProvider; +import io.sarl.lang.controlflow.ExtendedSARLEarlyExitComputer; +import io.sarl.lang.controlflow.ISarlEarlyExitComputer; +import io.sarl.lang.controlflow.SARLEarlyExitComputer; import io.sarl.lang.documentation.DocumentationFormatter; import io.sarl.lang.documentation.EcoreDocumentationBuilder; import io.sarl.lang.documentation.IDocumentationFormatter; @@ -94,15 +85,23 @@ import io.sarl.lang.documentation.SarlDocumentationProvider; import io.sarl.lang.formatting2.SARLFormatter; import io.sarl.lang.formatting2.SARLFormatterPreferenceKeys; +import io.sarl.lang.jvmmodel.SARLJvmModelInferrer; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.parser.antlr.SARLAntlrTokenFileProvider; import io.sarl.lang.parser.antlr.SARLParser; import io.sarl.lang.parser.antlr.internal.InternalSARLLexer; import io.sarl.lang.sarl.SarlFactory; import io.sarl.lang.sarl.actionprototype.DefaultActionPrototypeProvider; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; +import io.sarl.lang.scoping.SARLImplicitlyImportedFeatures; +import io.sarl.lang.scoping.SARLScopeProvider; +import io.sarl.lang.scoping.SARLSerializerScopeProvider; import io.sarl.lang.serializer.SARLEcoreDocumentationSyntacticSequencer; import io.sarl.lang.serializer.SARLSemanticSequencer; import io.sarl.lang.services.SARLGrammarAccess; +import io.sarl.lang.typesystem.SARLExpressionHelper; +import io.sarl.lang.typesystem.SARLReentrantTypeResolver; +import io.sarl.lang.typesystem.SARLTypeComputer; import io.sarl.lang.validation.DefaultFeatureCallValidator; import io.sarl.lang.validation.IFeatureCallValidator; import io.sarl.lang.validation.SARLConfigurableIssueCodesProvider; @@ -526,11 +525,6 @@ public Class bindSARLExpressionHelper() { return SARLExpressionHelper.class; } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindIGeneratorConfigProvider2() { - return GeneratorConfigProvider2.class; - } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindEarlyExitValidator() { return SARLEarlyExitValidator.class; @@ -546,6 +540,11 @@ public Class bindExtendedEarlyExitComputer( return ExtendedSARLEarlyExitComputer.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindIActionPrototypeProvider() { + return DefaultActionPrototypeProvider.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindIJvmModelInferrer() { return SARLJvmModelInferrer.class; @@ -571,11 +570,6 @@ public Class bindJvmModelAssociator() { return SarlJvmModelAssociations.Impl.class; } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] - public Class bindIActionPrototypeProvider() { - return DefaultActionPrototypeProvider.class; - } - // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] public Class bindFeatureNameValidator() { return SARLFeatureNameValidator.class; @@ -621,6 +615,11 @@ public Class bindIGeneratorConfigProvider() return SARLGeneratorConfigProvider.class; } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings provided by SARL API] + public Class bindIGeneratorConfigProvider2() { + return GeneratorConfigProvider2.class; + } + // contributed by io.sarl.lang.mwe2.binding.InjectionFragment2 [Bindings required by extended Xtend API] public Class bindIFileHeaderProvider() { return XtendFileHeaderProvider.class; diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/appenders/ExpressionSourceAppender.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/appenders/ExpressionSourceAppender.java index 2e18e34fe7..f1b5590eba 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/appenders/ExpressionSourceAppender.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/appenders/ExpressionSourceAppender.java @@ -76,7 +76,7 @@ public IJvmTypeProvider getTypeResolutionContext() { * @param context - the context of the expressions. * @param setter - the object that permits to assign the expression to the context. */ - public void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext) { + public void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext) { this.builder.eInit(context, setter, typeContext); } diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/ExpressionBuilderImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/ExpressionBuilderImpl.java index 4d04f351a8..4692a7adfa 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/ExpressionBuilderImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/ExpressionBuilderImpl.java @@ -62,7 +62,7 @@ public class ExpressionBuilderImpl extends AbstractBuilder implements IExpressio private EObject context; - private Procedure1 setter; + private Procedure1 setter; private XExpression expr; @@ -70,7 +70,7 @@ public class ExpressionBuilderImpl extends AbstractBuilder implements IExpressio * @param context - the context of the expressions. * @param setter - the object that permits to assign the expression to the context. */ - public void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext) { + public void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext) { setTypeResolutionContext(typeContext); this.context = context; this.setter = setter; diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/IExpressionBuilder.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/IExpressionBuilder.java index ed4aee7c5c..7e3319a5de 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/IExpressionBuilder.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/IExpressionBuilder.java @@ -60,7 +60,7 @@ public interface IExpressionBuilder { * @param context - the context of the expressions. * @param setter - the object that permits to assign the expression to the context. */ - void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext); + void eInit(EObject context, Procedure1 setter, IJvmTypeProvider typeContext); /** Replies the last created expression. * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/bugfixes/refused/bug623/Bug623SARLReentrantTypeResolver.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/bugfixes/refused/bug623/Bug623SARLReentrantTypeResolver.java index 7e9c50f8a5..ef5d233f9c 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/bugfixes/refused/bug623/Bug623SARLReentrantTypeResolver.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/bugfixes/refused/bug623/Bug623SARLReentrantTypeResolver.java @@ -38,7 +38,7 @@ import org.eclipse.xtext.xbase.typesystem.IResolvedTypes; import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; -import io.sarl.lang.compilation.typesystem.SARLReentrantTypeResolver; +import io.sarl.lang.typesystem.SARLReentrantTypeResolver; /** * Fixing the SARL issue 623: Generate real lambda. diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfig2.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfig2.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfig2.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfig2.java index f1dd0a175e..318cefc5a1 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfig2.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfig2.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import org.eclipse.xtext.xbase.lib.Pure; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfigProvider2.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfigProvider2.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfigProvider2.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfigProvider2.java index d212b3106f..4ca186b24e 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/GeneratorConfigProvider2.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/GeneratorConfigProvider2.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import java.util.HashMap; import java.util.Iterator; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/IGeneratorConfigProvider2.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IGeneratorConfigProvider2.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/IGeneratorConfigProvider2.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IGeneratorConfigProvider2.java index 136b58b5b9..20785ad55e 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/IGeneratorConfigProvider2.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IGeneratorConfigProvider2.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import org.eclipse.emf.ecore.EObject; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/IInlineExpressionCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IInlineExpressionCompiler.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/IInlineExpressionCompiler.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IInlineExpressionCompiler.java index aab4fcd6e0..92a281e468 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/IInlineExpressionCompiler.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/IInlineExpressionCompiler.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler; +package io.sarl.lang.compiler; import com.google.inject.ImplementedBy; import org.eclipse.emf.ecore.resource.ResourceSet; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/JavaInlineExpressionCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/JavaInlineExpressionCompiler.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/JavaInlineExpressionCompiler.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/JavaInlineExpressionCompiler.java index 70984e33c2..b92f97f791 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/JavaInlineExpressionCompiler.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/JavaInlineExpressionCompiler.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler; +package io.sarl.lang.compiler; import java.util.Collections; import java.util.Iterator; @@ -62,9 +62,6 @@ import org.eclipse.xtext.xbase.lib.Inline; import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; -import io.sarl.lang.compilation.generator.GeneratorConfig2; -import io.sarl.lang.compilation.generator.GeneratorConfigProvider2; - /** Compiler for creating inline expressions with Java syntax. * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/Messages.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/Messages.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/Messages.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/Messages.java index 7ee9215015..30870f007b 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/Messages.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLGeneratorConfigProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLGeneratorConfigProvider.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLGeneratorConfigProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLGeneratorConfigProvider.java index 4b28ceb4bb..2344bff8d7 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLGeneratorConfigProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLGeneratorConfigProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import com.google.inject.Inject; import com.google.inject.name.Named; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLJvmGenerator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLJvmGenerator.java similarity index 91% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLJvmGenerator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLJvmGenerator.java index 5ed2c72677..05f86269c2 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SARLJvmGenerator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SARLJvmGenerator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import javax.inject.Inject; @@ -31,9 +31,8 @@ import org.eclipse.xtext.xbase.compiler.GeneratorConfig; import org.eclipse.xtext.xbase.compiler.output.ITreeAppendable; -import io.sarl.lang.compilation.compiler.SarlCompiler; -import io.sarl.lang.compilation.jvmmodel.SARLJvmModelInferrer; -import io.sarl.lang.compilation.typesystem.IOperationHelper; +import io.sarl.lang.jvmmodel.SARLJvmModelInferrer; +import io.sarl.lang.typesystem.IOperationHelper; /** SARL-specific generator. This generator forces the JvmOperation to be annotated with @Pure diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/SarlCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlCompiler.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/SarlCompiler.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlCompiler.java index d10061a0e2..388f9a1652 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/SarlCompiler.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlCompiler.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler; +package io.sarl.lang.compiler; import java.util.Collection; import java.util.Collections; @@ -76,12 +76,11 @@ import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; import org.eclipse.xtext.xbase.util.XExpressionHelper; -import io.sarl.lang.compilation.generator.SARLJvmGenerator; -import io.sarl.lang.compilation.jvmmodel.Messages; -import io.sarl.lang.compilation.jvmmodel.SARLJvmModelInferrer; -import io.sarl.lang.compilation.typesystem.SARLExpressionHelper; +import io.sarl.lang.jvmmodel.Messages; +import io.sarl.lang.jvmmodel.SARLJvmModelInferrer; import io.sarl.lang.sarl.SarlAssertExpression; import io.sarl.lang.sarl.SarlBreakExpression; +import io.sarl.lang.typesystem.SARLExpressionHelper; /** The compiler from SARL to the target language. diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SarlOutputConfigurationProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlOutputConfigurationProvider.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SarlOutputConfigurationProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlOutputConfigurationProvider.java index ccff168e27..7b5647208d 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/SarlOutputConfigurationProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/SarlOutputConfigurationProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator; +package io.sarl.lang.compiler; import static com.google.common.collect.Sets.newHashSet; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/ICompilatedResourceReceiver.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/ICompilatedResourceReceiver.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/ICompilatedResourceReceiver.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/ICompilatedResourceReceiver.java index d0801ae420..4cf00ce400 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/ICompilatedResourceReceiver.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/ICompilatedResourceReceiver.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler.batch; +package io.sarl.lang.compiler.batch; import org.eclipse.emf.ecore.resource.Resource; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Main.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Main.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Main.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Main.java index 5207506ebd..ce33422ed2 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Main.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Main.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler.batch; +package io.sarl.lang.compiler.batch; import java.io.PrintWriter; import java.text.MessageFormat; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Messages.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Messages.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Messages.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Messages.java index 6c006fe82f..e46cbe8fa3 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/Messages.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler.batch; +package io.sarl.lang.compiler.batch; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/SarlBatchCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/SarlBatchCompiler.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java index 987287c765..4651db929e 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/SarlBatchCompiler.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.compiler.batch; +package io.sarl.lang.compiler.batch; import java.io.Closeable; import java.io.File; @@ -101,9 +101,9 @@ import org.eclipse.xtext.xbase.resource.BatchLinkableResource; import io.sarl.lang.SARLConfig; -import io.sarl.lang.compilation.generator.GeneratorConfig2; -import io.sarl.lang.compilation.generator.GeneratorConfigProvider2; -import io.sarl.lang.compilation.generator.IGeneratorConfigProvider2; +import io.sarl.lang.compiler.GeneratorConfig2; +import io.sarl.lang.compiler.GeneratorConfigProvider2; +import io.sarl.lang.compiler.IGeneratorConfigProvider2; import io.sarl.lang.util.Utils; import io.sarl.lang.validation.IConfigurableIssueSeveritiesProvider; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/messages.properties b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/compiler/batch/messages.properties rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/messages.properties diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExpressionGenerator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExpressionGenerator.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExpressionGenerator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExpressionGenerator.java index 4b1099d829..54d617bbc3 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExpressionGenerator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExpressionGenerator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.ArrayList; import java.util.Collections; @@ -60,7 +60,7 @@ import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; import org.eclipse.xtext.xbase.util.XExpressionHelper; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter.ConversionResult; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter.ConversionResult; import io.sarl.lang.services.SARLGrammarKeywordAccess; /** Abstract Generator of XExpression. @@ -387,7 +387,7 @@ public static String getCallSimpleName(XAbstractFeatureCall featureCall, SARLGra ILogicalContainerProvider logicalContainerProvider, IdentifiableSimpleNameProvider featureNameProvider, String nullKeyword, - Function1 referenceNameLambda) { + Function1 referenceNameLambda) { String name = null; final JvmIdentifiableElement calledFeature = featureCall.getFeature(); if (calledFeature instanceof JvmConstructor) { @@ -423,8 +423,8 @@ public static String getCallSimpleName(XAbstractFeatureCall featureCall, SARLGra * @param referenceNameDefinition replies the name of the expression, if defined. * @return {@code true} if a receiver was found; otherwise {@code false}. */ - public static boolean buildCallReceiver(XAbstractFeatureCall call, Function0 thisKeyword, - Function1 referenceNameDefinition, List output) { + public static boolean buildCallReceiver(XAbstractFeatureCall call, Function0 thisKeyword, + Function1 referenceNameDefinition, List output) { if (call.isStatic()) { if (call instanceof XMemberFeatureCall) { final XMemberFeatureCall memberFeatureCall = (XMemberFeatureCall) call; @@ -485,11 +485,11 @@ protected abstract class FeatureCallGenerator { */ protected final IAppendable codeReceiver; - private final Function0 thisKeyworkLambda = () -> getKeywordAccessor().getThisKeyword(); + private final Function0 thisKeyworkLambda = () -> getKeywordAccessor().getThisKeyword(); - private final Function1 referenceNameLambda; + private final Function1 referenceNameLambda; - private final Function1 referenceNameLambda2; + private final Function1 referenceNameLambda2; /** Constructor. * @@ -594,7 +594,7 @@ private void buildLeftOperand(XAbstractFeatureCall expr, List output) { } @SuppressWarnings("checkstyle:npathcomplexity") - private void featureCalltoJavaExpression(XAbstractFeatureCall call, Function0 beginOfBlock) { + private void featureCalltoJavaExpression(XAbstractFeatureCall call, Function0 beginOfBlock) { final List leftOperand = new ArrayList<>(); if (needMultiAssignment(call)) { buildLeftOperand(call, leftOperand); @@ -618,7 +618,7 @@ private void featureCalltoJavaExpression(XAbstractFeatureCall call, Function0 leftOperand, List receiver, String name, List args, - Function0 beginOfBlock) { + Function0 beginOfBlock) { final ExtraLanguageFeatureNameConverter converter = getFeatureNameConverter(this.context); final ConversionResult result = converter.convertFeatureCall(name, calledFeature, leftOperand, receiver, args); if (result != null) { @@ -654,7 +654,7 @@ private void internalAppendCall(JvmIdentifiableElement calledFeature, List leftOperand, List receiver, String name, List args, - Function0 beginOfBlock); + Function0 beginOfBlock); /** Replies the null keyword. * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExtraLanguageGenerator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExtraLanguageGenerator.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExtraLanguageGenerator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExtraLanguageGenerator.java index bec3fde500..e1fe9be4ef 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/AbstractExtraLanguageGenerator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/AbstractExtraLanguageGenerator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.ArrayList; import java.util.Collections; @@ -58,7 +58,7 @@ import org.eclipse.xtext.xbase.typesystem.IResolvedTypes; import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlConstructor; import io.sarl.lang.sarl.SarlScript; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageAppendable.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageAppendable.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageAppendable.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageAppendable.java index 232bb3ce1d..991b906043 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageAppendable.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageAppendable.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.List; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageFeatureNameConverter.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageFeatureNameConverter.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageFeatureNameConverter.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageFeatureNameConverter.java index 636a044a97..186f4a3652 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageFeatureNameConverter.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageFeatureNameConverter.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.ArrayList; import java.util.Collections; @@ -49,7 +49,7 @@ import org.eclipse.xtext.xbase.lib.Pair; import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlAction; import io.sarl.lang.services.SARLGrammarKeywordAccess; @@ -86,11 +86,11 @@ public class ExtraLanguageFeatureNameConverter { private Map>> conversions; - private final Function0 thisKeyworkLambda = () -> this.keywords.getThisKeyword(); + private final Function0 thisKeyworkLambda = () -> this.keywords.getThisKeyword(); - private final Function1 referenceNameLambda; + private final Function1 referenceNameLambda; - private final Function1 referenceNameLambda2; + private final Function1 referenceNameLambda2; /** Constructor. * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorContext.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorContext.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorContext.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorContext.java index 053964af41..749c03acac 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorContext.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorContext.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorSupport.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorSupport.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorSupport.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorSupport.java index f4fae30164..877621964c 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageGeneratorSupport.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageGeneratorSupport.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageImportManager.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageImportManager.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageImportManager.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageImportManager.java index 46ba65bfb0..25d2a357c9 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageImportManager.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageImportManager.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.lang.reflect.Field; import java.util.Map; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageOutputConfigurations.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageOutputConfigurations.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageOutputConfigurations.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageOutputConfigurations.java index 5c47af71d8..2d8fd77d40 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageOutputConfigurations.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageOutputConfigurations.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import com.google.common.base.Strings; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageTypeConverter.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageTypeConverter.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageTypeConverter.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageTypeConverter.java index b014da01a6..ac9be7b2b2 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/ExtraLanguageTypeConverter.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/ExtraLanguageTypeConverter.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.Collections; import java.util.Map; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExpressionGenerator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExpressionGenerator.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExpressionGenerator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExpressionGenerator.java index 0bb2f20446..559cfdcf50 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExpressionGenerator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExpressionGenerator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import org.eclipse.xtext.xbase.XExpression; import org.eclipse.xtext.xbase.compiler.IAppendable; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageConversionInitializer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageConversionInitializer.java similarity index 91% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageConversionInitializer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageConversionInitializer.java index a944fe57e3..5b636481d3 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageConversionInitializer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageConversionInitializer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import org.eclipse.xtext.xbase.lib.Procedures.Procedure3; @@ -41,6 +41,6 @@ public interface IExtraLanguageConversionInitializer { * The second formal parameter is the full name of source of the conversion. * The third formal parameter is the target of the conversion. */ - void initializeConversions(Procedure3 result); + void initializeConversions(Procedure3 result); } diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorContext.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorContext.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorContext.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorContext.java index d1c05081b5..187a49530a 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorContext.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorContext.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.Date; import java.util.List; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorProvider.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorProvider.java index c03ee2ae5c..a38469d490 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IExtraLanguageGeneratorProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IExtraLanguageGeneratorProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import com.google.inject.ImplementedBy; import org.eclipse.emf.ecore.resource.Resource; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IRootGenerator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IRootGenerator.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IRootGenerator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IRootGenerator.java index 3f8dbee092..c53b591bd8 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/IRootGenerator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/IRootGenerator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.generator.IGenerator2; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/NullExtraLanguageGeneratorProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/NullExtraLanguageGeneratorProvider.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/NullExtraLanguageGeneratorProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/NullExtraLanguageGeneratorProvider.java index e45722a28a..b67989a26f 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/extra/NullExtraLanguageGeneratorProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/extra/NullExtraLanguageGeneratorProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.generator.extra; +package io.sarl.lang.compiler.extra; import java.util.Collections; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/messages.properties b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/generator/messages.properties rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/messages.properties diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ExtendedSARLEarlyExitComputer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ExtendedSARLEarlyExitComputer.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ExtendedSARLEarlyExitComputer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ExtendedSARLEarlyExitComputer.java index 8b05bfdbfb..94d351935b 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ExtendedSARLEarlyExitComputer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ExtendedSARLEarlyExitComputer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.controlflow; +package io.sarl.lang.controlflow; import javax.inject.Inject; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ISarlEarlyExitComputer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ISarlEarlyExitComputer.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ISarlEarlyExitComputer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ISarlEarlyExitComputer.java index 2b26860110..93bf10f898 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/ISarlEarlyExitComputer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/ISarlEarlyExitComputer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.controlflow; +package io.sarl.lang.controlflow; import org.eclipse.xtext.common.types.JvmTypeReference; import org.eclipse.xtext.xbase.XExpression; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/SARLEarlyExitComputer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/SARLEarlyExitComputer.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/SARLEarlyExitComputer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/SARLEarlyExitComputer.java index bcaca828d4..fe1526cf3f 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/controlflow/SARLEarlyExitComputer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/controlflow/SARLEarlyExitComputer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.controlflow; +package io.sarl.lang.controlflow; import java.util.Collection; import java.util.Collections; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/formatting2/SARLFormatter.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/formatting2/SARLFormatter.java index c7d3f8186c..fa029bb66c 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/formatting2/SARLFormatter.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/formatting2/SARLFormatter.java @@ -98,32 +98,20 @@ public class SARLFormatter extends XtendFormatter { */ public static final String COMMENT_PREFIX_NAME = "io.sarl.lang.formatting2.COMMENT_PREFIX"; //$NON-NLS-1$ - private static final Procedure1 ONE_SPACE = new Procedure1() { - @Override - public void apply(IHiddenRegionFormatter it) { - it.oneSpace(); - } + private static final Procedure1 ONE_SPACE = (it) -> { + it.oneSpace(); }; - private static final Procedure1 NO_SPACE = new Procedure1() { - @Override - public void apply(IHiddenRegionFormatter it) { - it.noSpace(); - } + private static final Procedure1 NO_SPACE = (it) -> { + it.noSpace(); }; - private static final Procedure1 NEW_LINE = new Procedure1() { - @Override - public void apply(IHiddenRegionFormatter it) { - it.newLine(); - } + private static final Procedure1 NEW_LINE = (it) -> { + it.newLine(); }; - private static final Procedure1 INDENT = new Procedure1() { - @Override - public void apply(IHiddenRegionFormatter it) { - it.indent(); - } + private static final Procedure1 INDENT = (it) -> { + it.indent(); }; @Inject diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/DefaultVisibilityProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/DefaultVisibilityProvider.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/DefaultVisibilityProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/DefaultVisibilityProvider.java index 23d97b70fa..2c3f1f2588 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/DefaultVisibilityProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/DefaultVisibilityProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/GenerationContext.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/GenerationContext.java similarity index 95% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/GenerationContext.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/GenerationContext.java index 30830b143a..2bf19bad23 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/GenerationContext.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/GenerationContext.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import java.util.ArrayList; import java.util.Collection; @@ -42,8 +42,8 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import io.sarl.lang.SARLVersion; -import io.sarl.lang.compilation.generator.GeneratorConfig2; -import io.sarl.lang.compilation.generator.IGeneratorConfigProvider2; +import io.sarl.lang.compiler.GeneratorConfig2; +import io.sarl.lang.compiler.IGeneratorConfigProvider2; import io.sarl.lang.sarl.SarlBehaviorUnit; import io.sarl.lang.sarl.actionprototype.ActionParameterTypes; import io.sarl.lang.sarl.actionprototype.ActionPrototype; @@ -111,7 +111,7 @@ abstract class GenerationContext { * evaluating guards and returning the event handler runnables. */ @SuppressWarnings("unchecked") - private final Map>>> guardEvaluators + private final Map>>> guardEvaluators = CollectionLiterals.newHashMap(); /** The context object. @@ -209,7 +209,7 @@ public GeneratorConfig2 getGeneratorConfig2() { * * @return the guard evaluators. */ - public Collection>>> + public Collection>>> getGuardEvaluationCodes() { return this.guardEvaluators.values(); } @@ -219,11 +219,11 @@ public GeneratorConfig2 getGeneratorConfig2() { * @param source the source of the guard evaluation. * @return the guard evaluators. */ - public Collection> getGuardEvalationCodeFor(SarlBehaviorUnit source) { + public Collection> getGuardEvalationCodeFor(SarlBehaviorUnit source) { assert source != null; final String id = source.getName().getIdentifier(); - final Collection> evaluators; - final Pair>> pair = this.guardEvaluators.get(id); + final Collection> evaluators; + final Pair>> pair = this.guardEvaluators.get(id); if (pair == null) { evaluators = new ArrayList<>(); this.guardEvaluators.put(id, new Pair<>(source, evaluators)); diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/IDefaultVisibilityProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/IDefaultVisibilityProvider.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/IDefaultVisibilityProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/IDefaultVisibilityProvider.java index 9afcfba6f6..795475e757 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/IDefaultVisibilityProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/IDefaultVisibilityProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import java.util.Objects; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/Messages.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/Messages.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/Messages.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/Messages.java index 1ff83ccea9..868cc28fff 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/Messages.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/Messages.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import org.eclipse.osgi.util.NLS; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SARLJvmModelInferrer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SARLJvmModelInferrer.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SARLJvmModelInferrer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SARLJvmModelInferrer.java index cbe64218c9..9c3f390bbd 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SARLJvmModelInferrer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SARLJvmModelInferrer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import java.io.Serializable; import java.lang.annotation.Annotation; @@ -146,14 +146,10 @@ import io.sarl.lang.annotation.SarlSourceCode; import io.sarl.lang.annotation.SarlSpecification; import io.sarl.lang.annotation.SyntheticMember; -import io.sarl.lang.compilation.compiler.IInlineExpressionCompiler; -import io.sarl.lang.compilation.compiler.SarlCompiler; -import io.sarl.lang.compilation.controlflow.ISarlEarlyExitComputer; -import io.sarl.lang.compilation.generator.SARLJvmGenerator; -import io.sarl.lang.compilation.typesystem.IOperationHelper; -import io.sarl.lang.compilation.typesystem.InheritanceHelper; -import io.sarl.lang.compilation.typesystem.SARLAnnotationUtil; -import io.sarl.lang.compilation.typesystem.SARLReentrantTypeResolver; +import io.sarl.lang.compiler.IInlineExpressionCompiler; +import io.sarl.lang.compiler.SARLJvmGenerator; +import io.sarl.lang.compiler.SarlCompiler; +import io.sarl.lang.controlflow.ISarlEarlyExitComputer; import io.sarl.lang.core.Agent; import io.sarl.lang.core.AgentTrait; import io.sarl.lang.core.Behavior; @@ -185,6 +181,10 @@ import io.sarl.lang.sarl.actionprototype.InferredValuedParameter; import io.sarl.lang.sarl.actionprototype.QualifiedActionName; import io.sarl.lang.services.SARLGrammarKeywordAccess; +import io.sarl.lang.typesystem.IOperationHelper; +import io.sarl.lang.typesystem.InheritanceHelper; +import io.sarl.lang.typesystem.SARLAnnotationUtil; +import io.sarl.lang.typesystem.SARLReentrantTypeResolver; import io.sarl.lang.util.ClearableReference; import io.sarl.lang.util.JvmVisibilityComparator; import io.sarl.lang.util.Utils; @@ -2005,7 +2005,7 @@ protected void transform(final SarlBehaviorUnit source, JvmGenericType container addAnnotationSafe(bodyOperation, Pure.class); } - final Collection> evaluators = context.getGuardEvalationCodeFor(source); + final Collection> evaluators = context.getGuardEvalationCodeFor(source); assert evaluators != null; if (isTrueGuard) { @@ -2519,7 +2519,7 @@ protected void appendGeneratedAnnotation(JvmAnnotationTarget target, GenerationC protected void appendEventGuardEvaluators(JvmGenericType container) { final GenerationContext context = getContext(container); if (context != null) { - final Collection>>> allEvaluators + final Collection>>> allEvaluators = context.getGuardEvaluationCodes(); if (allEvaluators == null || allEvaluators.isEmpty()) { return; @@ -2528,7 +2528,7 @@ protected void appendEventGuardEvaluators(JvmGenericType container) { final JvmTypeReference voidType = this._typeReferenceBuilder.typeRef(Void.TYPE); final JvmTypeReference runnableType = this._typeReferenceBuilder.typeRef(Runnable.class); final JvmTypeReference collectionType = this._typeReferenceBuilder.typeRef(Collection.class, runnableType); - for (final Pair>> evaluators : allEvaluators) { + for (final Pair>> evaluators : allEvaluators) { final SarlBehaviorUnit source = evaluators.getKey(); // Determine the name of the operation for the behavior output final String behName = Utils.createNameForHiddenGuardGeneralEvaluatorMethod(source.getName().getSimpleName()); @@ -2573,7 +2573,7 @@ protected void appendEventGuardEvaluators(JvmGenericType container) { it.append("assert "); //$NON-NLS-1$ it.append(RUNNABLE_COLLECTION); it.append(" != null;"); //$NON-NLS-1$ - for (final Procedure1 code : evaluators.getValue()) { + for (final Procedure1 code : evaluators.getValue()) { it.newLine(); code.apply(it); } @@ -3503,7 +3503,7 @@ protected void copyTypeParametersFromJvmOperation(JvmOperation fromOperation, Jv */ @SuppressWarnings("checkstyle:npathcomplexity") protected void copyNonStaticPublicJvmOperations(JvmGenericType source, JvmGenericType target, - Set createdActions, Procedure2 bodyBuilder) { + Set createdActions, Procedure2 bodyBuilder) { final Iterable operations = Iterables.transform(Iterables.filter(source.getMembers(), (it) -> { if (it instanceof JvmOperation) { final JvmOperation op = (JvmOperation) it; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SarlJvmModelAssociations.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SarlJvmModelAssociations.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SarlJvmModelAssociations.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SarlJvmModelAssociations.java index af3f742630..79f137ec45 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/SarlJvmModelAssociations.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SarlJvmModelAssociations.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.jvmmodel; +package io.sarl.lang.jvmmodel; import com.google.inject.ImplementedBy; import com.google.inject.Singleton; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/messages.properties b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/messages.properties similarity index 100% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/jvmmodel/messages.properties rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/messages.properties diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/actionprototype/DefaultActionPrototypeProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/actionprototype/DefaultActionPrototypeProvider.java index fd11682040..9ff3442c77 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/actionprototype/DefaultActionPrototypeProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/actionprototype/DefaultActionPrototypeProvider.java @@ -47,9 +47,9 @@ import io.sarl.lang.annotation.DefaultValue; import io.sarl.lang.annotation.SarlSourceCode; -import io.sarl.lang.compilation.typesystem.SARLAnnotationUtil; import io.sarl.lang.sarl.SarlFormalParameter; import io.sarl.lang.services.SARLGrammarKeywordAccess; +import io.sarl.lang.typesystem.SARLAnnotationUtil; import io.sarl.lang.util.Utils; /** diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlActionImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlActionImplCustom.java index 8eb6edef45..53bd70a2c6 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlActionImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlActionImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlAnnotationTypeImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlAnnotationTypeImplCustom.java index b65baa6bcb..e60d01df51 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlAnnotationTypeImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlAnnotationTypeImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlClassImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlClassImplCustom.java index 5fb93a007e..4b665d53bf 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlClassImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlClassImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlEnumerationImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlEnumerationImplCustom.java index 97d0af4cd7..edbcf6b6da 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlEnumerationImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlEnumerationImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlFieldImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlFieldImplCustom.java index f29a0a555a..d3cc4ea624 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlFieldImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlFieldImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlInterfaceImplCustom.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlInterfaceImplCustom.java index b894e36331..8c25154445 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlInterfaceImplCustom.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/sarl/impl/SarlInterfaceImplCustom.java @@ -23,7 +23,7 @@ import org.eclipse.xtext.common.types.JvmVisibility; -import io.sarl.lang.compilation.jvmmodel.IDefaultVisibilityProvider; +import io.sarl.lang.jvmmodel.IDefaultVisibilityProvider; /** * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLImplicitlyImportedFeatures.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLImplicitlyImportedFeatures.java similarity index 97% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLImplicitlyImportedFeatures.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLImplicitlyImportedFeatures.java index 9126c5ea51..f2fdb70d8f 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLImplicitlyImportedFeatures.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLImplicitlyImportedFeatures.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.scoping; +package io.sarl.lang.scoping; import java.util.List; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLScopeProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLScopeProvider.java similarity index 91% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLScopeProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLScopeProvider.java index 03b54264d2..086504424e 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLScopeProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLScopeProvider.java @@ -19,9 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.scoping; - -import io.sarl.lang.scoping.AbstractSARLScopeProvider; +package io.sarl.lang.scoping; /** * Custom scoping description. diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLSerializerScopeProvider.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLSerializerScopeProvider.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLSerializerScopeProvider.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLSerializerScopeProvider.java index 201733622c..500965e7e8 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/scoping/SARLSerializerScopeProvider.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLSerializerScopeProvider.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.scoping; +package io.sarl.lang.scoping; import org.eclipse.xtend.core.serializer.XtendSerializerScopeProvider; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IOperationHelper.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IOperationHelper.java similarity index 96% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IOperationHelper.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IOperationHelper.java index 3b5d86fca9..394269100c 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IOperationHelper.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IOperationHelper.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import com.google.inject.ImplementedBy; import org.eclipse.xtend.core.xtend.XtendFunction; @@ -100,6 +100,6 @@ public interface IOperationHelper { * @see Pure * @see #adaptIfPossible(JvmOperation) */ - void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback); + void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback); } diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IPureOperationNameValidator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IPureOperationNameValidator.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IPureOperationNameValidator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IPureOperationNameValidator.java index 4347ed4f18..965ca563ce 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/IPureOperationNameValidator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/IPureOperationNameValidator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import com.google.inject.ImplementedBy; import org.eclipse.xtend.core.xtend.XtendFunction; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/ISideEffectContext.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/ISideEffectContext.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/ISideEffectContext.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/ISideEffectContext.java index 47fcc819d0..4c135198be 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/ISideEffectContext.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/ISideEffectContext.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.util.List; import java.util.Map; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/InheritanceHelper.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/InheritanceHelper.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/InheritanceHelper.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/InheritanceHelper.java index d3471706d0..effd923e74 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/InheritanceHelper.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/InheritanceHelper.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -33,7 +33,7 @@ import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; import io.sarl.lang.annotation.SarlElementType; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlPackage; import io.sarl.lang.util.Utils; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/PureOperationNameValidator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/PureOperationNameValidator.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/PureOperationNameValidator.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/PureOperationNameValidator.java index b3f80544a0..a04eaf0a91 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/PureOperationNameValidator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/PureOperationNameValidator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.util.regex.Pattern; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLAnnotationUtil.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLAnnotationUtil.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLAnnotationUtil.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLAnnotationUtil.java index 38baa4e644..1e7fc5860b 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLAnnotationUtil.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLAnnotationUtil.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.lang.annotation.Annotation; import java.util.ArrayList; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLExpressionHelper.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLExpressionHelper.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLExpressionHelper.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLExpressionHelper.java index fd30be6003..b036ca424c 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLExpressionHelper.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLExpressionHelper.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLOperationHelper.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLOperationHelper.java similarity index 98% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLOperationHelper.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLOperationHelper.java index 40a5b1e5d6..d3131c9113 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLOperationHelper.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLOperationHelper.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -83,7 +83,7 @@ import org.eclipse.xtext.xbase.scoping.featurecalls.OperatorMapping; import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlCapacity; import io.sarl.lang.sarl.actionprototype.ActionParameterTypes; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; @@ -763,7 +763,7 @@ void adaptIfPossible(JvmOperation operation, ISideEffectContext context) { } @Override - public void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback) { + public void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback) { if (operation != null && dynamicCallback != null) { AnnotationJavaGenerationAdapter adapter = (AnnotationJavaGenerationAdapter) EcoreUtil.getAdapter( operation.eAdapters(), AnnotationJavaGenerationAdapter.class); @@ -1087,13 +1087,13 @@ public List getVariableValues(String id) { */ public static class AnnotationJavaGenerationAdapter extends AdapterImpl { - private List> runnable; + private List> runnable; /** Add a dynamic generator. * * @param generator the generator. */ - public void addGenerator(Procedure1 generator) { + public void addGenerator(Procedure1 generator) { if (generator != null) { synchronized (this) { if (this.runnable == null) { @@ -1126,7 +1126,7 @@ public boolean isAdapterForType(Object type) { public void attachDynamicAnnotations(IOperationHelper helper, JvmOperation operation, ISideEffectContext context) { synchronized (this) { if (this.runnable != null) { - for (final Procedure1 generator : this.runnable) { + for (final Procedure1 generator : this.runnable) { final IOperationHelper hlp; if (context == null || !(helper instanceof SARLOperationHelper)) { hlp = helper; @@ -1186,7 +1186,7 @@ public void adaptIfPossible(JvmOperation operation) { } @Override - public void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback) { + public void attachAdapter(JvmOperation operation, Procedure1 dynamicCallback) { this.delegate.attachAdapter(operation, dynamicCallback); } diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLReentrantTypeResolver.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLReentrantTypeResolver.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLReentrantTypeResolver.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLReentrantTypeResolver.java index e7c8485e30..65ffd2d88d 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLReentrantTypeResolver.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLReentrantTypeResolver.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.util.Map; import java.util.Set; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLTypeComputer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLTypeComputer.java similarity index 99% rename from main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLTypeComputer.java rename to main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLTypeComputer.java index ce9fd50097..cbcc4be188 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compilation/typesystem/SARLTypeComputer.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/typesystem/SARLTypeComputer.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package io.sarl.lang.compilation.typesystem; +package io.sarl.lang.typesystem; import java.util.List; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java index d58b8a8c9a..94ca98b56b 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java @@ -1243,7 +1243,7 @@ public static boolean getContainerNotOfType(EObject element, Class predicate) { + public static EObject getFirstContainerForPredicate(EObject element, Function1 predicate) { if (predicate == null || element == null) { return null; } diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLEarlyExitValidator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLEarlyExitValidator.java index 579388b864..a3fa75d6b1 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLEarlyExitValidator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLEarlyExitValidator.java @@ -38,7 +38,7 @@ import org.eclipse.xtext.xbase.validation.IssueCodes; import io.sarl.lang.annotation.EarlyExit; -import io.sarl.lang.compilation.controlflow.ISarlEarlyExitComputer; +import io.sarl.lang.controlflow.ISarlEarlyExitComputer; /** Validation of the early-exit control flow. * diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLValidator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLValidator.java index 2052548c50..2960b3f06e 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLValidator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/SARLValidator.java @@ -164,14 +164,12 @@ import io.sarl.lang.SARLVersion; import io.sarl.lang.annotation.EarlyExit; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; -import io.sarl.lang.compilation.typesystem.IOperationHelper; -import io.sarl.lang.compilation.typesystem.SARLExpressionHelper; import io.sarl.lang.core.Agent; import io.sarl.lang.core.Behavior; import io.sarl.lang.core.Capacity; import io.sarl.lang.core.Event; import io.sarl.lang.core.Skill; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlAction; import io.sarl.lang.sarl.SarlAgent; import io.sarl.lang.sarl.SarlAnnotationType; @@ -196,6 +194,8 @@ import io.sarl.lang.sarl.actionprototype.ActionParameterTypes; import io.sarl.lang.sarl.actionprototype.IActionPrototypeProvider; import io.sarl.lang.services.SARLGrammarKeywordAccess; +import io.sarl.lang.typesystem.IOperationHelper; +import io.sarl.lang.typesystem.SARLExpressionHelper; import io.sarl.lang.util.OutParameter; import io.sarl.lang.util.Utils; import io.sarl.lang.util.Utils.SarlLibraryErrorCode; diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/extra/AbstractExtraLanguageValidator.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/extra/AbstractExtraLanguageValidator.java index 5d8f9023f7..13f763d716 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/extra/AbstractExtraLanguageValidator.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/validation/extra/AbstractExtraLanguageValidator.java @@ -58,11 +58,11 @@ import org.eclipse.xtext.xbase.lib.Functions.Function2; import org.eclipse.xtext.xbase.lib.Procedures.Procedure3; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageFeatureNameConverter.ConversionType; -import io.sarl.lang.compilation.generator.extra.ExtraLanguageTypeConverter; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageConversionInitializer; -import io.sarl.lang.compilation.generator.extra.IExtraLanguageGeneratorContext; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter; +import io.sarl.lang.compiler.extra.ExtraLanguageFeatureNameConverter.ConversionType; +import io.sarl.lang.compiler.extra.ExtraLanguageTypeConverter; +import io.sarl.lang.compiler.extra.IExtraLanguageConversionInitializer; +import io.sarl.lang.compiler.extra.IExtraLanguageGeneratorContext; import io.sarl.lang.util.Utils; import io.sarl.lang.validation.IssueCodes; @@ -365,7 +365,7 @@ protected ExtraLanguageFeatureNameConverter createFeatureNameConverterInstance( * @param errorHandler the error handler. * @return {@code true} if a type mapping is defined. */ - protected boolean doTypeMappingCheck(EObject source, JvmType type, Procedure3 errorHandler) { + protected boolean doTypeMappingCheck(EObject source, JvmType type, Procedure3 errorHandler) { if (source != null && type != null) { final ExtraLanguageTypeConverter converter = getTypeConverter(); final String qn = type.getQualifiedName(); @@ -408,8 +408,8 @@ private static void setCheckedFeatureCall(Map context, EObject e * @param featureErrorHandler the error handler for the feature call conversion. */ protected void doCheckMemberFeatureCallMapping(XAbstractFeatureCall featureCall, - Procedure3 typeErrorHandler, - Function2 featureErrorHandler) { + Procedure3 typeErrorHandler, + Function2 featureErrorHandler) { final XAbstractFeatureCall rootFeatureCall = getRootFeatureCall(featureCall); final Map context = getContext().getContext(); if (isCheckedFeatureCall(context, rootFeatureCall)) { @@ -435,8 +435,8 @@ private static XAbstractFeatureCall getRootFeatureCall(XAbstractFeatureCall feat } private boolean internalCheckMemberFeaturCallMapping(XAbstractFeatureCall featureCall, - Procedure3 typeErrorHandler, - Function2 featureErrorHandler) { + Procedure3 typeErrorHandler, + Function2 featureErrorHandler) { final ExtraLanguageFeatureNameConverter converter = getFeatureNameConverter(); if (converter != null) { final ConversionType conversionType = converter.getConversionTypeFor(featureCall); diff --git a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/DocumentationImplicitlyImportedFeatures.java b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/DocumentationImplicitlyImportedFeatures.java index 43ec55ed5b..1f13a5d83a 100644 --- a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/DocumentationImplicitlyImportedFeatures.java +++ b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/DocumentationImplicitlyImportedFeatures.java @@ -23,7 +23,7 @@ import java.util.List; -import io.sarl.lang.compilation.scoping.SARLImplicitlyImportedFeatures; +import io.sarl.lang.scoping.SARLImplicitlyImportedFeatures; /** Implicitly imported extensions for the testing of the documentation. * diff --git a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/SarlScriptExecutor.java b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/SarlScriptExecutor.java index 2030b35d39..e6029497c2 100644 --- a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/SarlScriptExecutor.java +++ b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/SarlScriptExecutor.java @@ -42,8 +42,8 @@ import org.eclipse.xtext.xbase.interpreter.IExpressionInterpreter; import org.junit.ComparisonFailure; -import io.sarl.lang.compilation.compiler.batch.ICompilatedResourceReceiver; -import io.sarl.lang.compilation.compiler.batch.SarlBatchCompiler; +import io.sarl.lang.compiler.batch.ICompilatedResourceReceiver; +import io.sarl.lang.compiler.batch.SarlBatchCompiler; import io.sarl.lang.sarl.SarlClass; import io.sarl.lang.sarl.SarlField; import io.sarl.lang.sarl.SarlScript; diff --git a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/ScriptExecutor.java b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/ScriptExecutor.java index a3543e6ef9..3fa1798d9f 100644 --- a/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/ScriptExecutor.java +++ b/main/externalmaven/io.sarl.maven.docs.testing/src/main/java/io/sarl/maven/docs/testing/ScriptExecutor.java @@ -26,7 +26,7 @@ import com.google.inject.ImplementedBy; -import io.sarl.lang.compilation.compiler.batch.ICompilatedResourceReceiver; +import io.sarl.lang.compiler.batch.ICompilatedResourceReceiver; /** Represents an code executor. * diff --git a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java index c0692412c3..20537d2638 100644 --- a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java +++ b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java @@ -56,7 +56,7 @@ import org.eclipse.xtext.xbase.lib.util.ReflectExtensions; import io.sarl.lang.SARLStandaloneSetup; -import io.sarl.lang.compilation.compiler.batch.SarlBatchCompiler; +import io.sarl.lang.compiler.batch.SarlBatchCompiler; import io.sarl.maven.compiler.MavenLogger.MavenLoggerFactory; /** Abstract mojo that is able to use the SARL batch compiler. diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/StandardBuiltinCapacitiesProvider.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/StandardBuiltinCapacitiesProvider.java index 9e6324cc2a..093a322e0f 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/StandardBuiltinCapacitiesProvider.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/StandardBuiltinCapacitiesProvider.java @@ -100,7 +100,7 @@ public class StandardBuiltinCapacitiesProvider implements BuiltinCapacitiesProvi private ContextSpaceService contextRepository; @Override - public void builtinCapacities(Agent agent, Procedure2, Skill> skillMappingCallback) { + public void builtinCapacities(Agent agent, Procedure2, ? super Skill> skillMappingCallback) { if (skillMappingCallback != null) { final UUID innerContextID = agent.getID(); final SpaceID innerSpaceID = new SpaceID(innerContextID, UUID.randomUUID(), OpenEventSpaceSpecification.class); diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java index 9153c1d981..f0bab8de2d 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java @@ -116,7 +116,7 @@ public int getRegisteredEventListeners(Class type, Collection * @param filter - the filter function. It could be {@code null}. * @param callback function which is invoked just after the first registration of the object. It could be {@code null}. */ - public void register(Object object, Function1 filter, Procedure1 callback) { + public void register(Object object, Function1 filter, Procedure1 callback) { synchronized (this.behaviorGuardEvaluatorRegistry) { this.behaviorGuardEvaluatorRegistry.register(object, filter, callback); } @@ -129,7 +129,7 @@ public void register(Object object, Function1 * @param callback function which is invoked just before the object is unregistered. * @throws IllegalArgumentException if the object was not previously registered. */ - public void unregister(Object object, Procedure1 callback) { + public void unregister(Object object, Procedure1 callback) { synchronized (this.behaviorGuardEvaluatorRegistry) { this.behaviorGuardEvaluatorRegistry.unregister(object, callback); } @@ -141,7 +141,7 @@ public void unregister(Object object, Procedure1 callback) { * @param callback function which is invoked just before the object is unregistered. * @throws IllegalArgumentException if the object was not previously registered. */ - public void unregisterAll(Procedure1 callback) { + public void unregisterAll(Procedure1 callback) { synchronized (this.behaviorGuardEvaluatorRegistry) { this.behaviorGuardEvaluatorRegistry.unregisterAll(callback); } diff --git a/tests/io.sarl.lang.tests/pom.xml b/tests/io.sarl.lang.tests/pom.xml index 7de72d12c3..a9e9b46bdb 100644 --- a/tests/io.sarl.lang.tests/pom.xml +++ b/tests/io.sarl.lang.tests/pom.xml @@ -19,6 +19,11 @@ io.sarl.tests.api test + + io.sarl + io.sarl.core + test + io.sarl io.sarl.util diff --git a/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/bugs/to00999/Bug739.java b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/bugs/to00999/Bug739.java new file mode 100644 index 0000000000..52721f2cca --- /dev/null +++ b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/bugs/to00999/Bug739.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2014-2017 the original authors or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.sarl.lang.tests.bugs.to00999; + +import com.google.inject.Inject; +import org.eclipse.xtext.xbase.testing.CompilationTestHelper; +import org.junit.Test; + +import io.sarl.lang.sarl.SarlScript; +import io.sarl.tests.api.AbstractSarlTest; + +/** Testing class for issue: Invalid overriding detection. + * + *

https://github.com/sarl/sarl/issues/739 + * + * @author $Author: sgalland$ + * @version $Name$ $Revision$ $Date$ + * @mavengroupid $GroupId$ + * @mavenartifactid $ArtifactId$ + */ +@SuppressWarnings("all") +public class Bug739 extends AbstractSarlTest { + + private static final String SNIPSET1 = multilineString( + "package io.sarl.lang.tests.bug739", + "import io.sarl.lang.core.Agent", + "import io.sarl.lang.core.BuiltinCapacitiesProvider", + "import io.sarl.lang.core.Capacity", + "import io.sarl.lang.core.Skill", + "class XXX implements BuiltinCapacitiesProvider {", + " override builtinCapacities(^agent : Agent, skillMappingCallback : (Class, Skill)=>void) {", + " }", + "}"); + + private static final String SNIPSET2 = multilineString( + "package io.sarl.lang.tests.bug739", + "interface YYY {", + " def myfct(a : (int, boolean) => void)", + "}", + "class ZZZ implements YYY {", + " override myfct(a : (int, boolean) => void) {", + " }", + "}"); + + private static final String SNIPSET3 = multilineString( + "package io.sarl.lang.tests.bug739", + "import io.sarl.core.Behaviors", + "import io.sarl.lang.core.Behavior", + "import io.sarl.lang.core.Event", + "import io.sarl.lang.core.EventListener", + "import io.sarl.lang.core.Scope", + "import io.sarl.lang.core.Address", + "import io.sarl.lang.util.SynchronizedIterable", + "skill BehaviorsSkill implements Behaviors {", + " def asEventListener : EventListener {", + " null", + " }", + " def registerBehavior(attitude : Behavior, filter : (Event)=>boolean = null) : Behavior {", + " null", + " }", + " def unregisterBehavior(attitude : Behavior) : Behavior {", + " null", + " }", + " def wake(^event : Event, scope : Scope

= null) {", + " }", + " def getRegisteredBehaviors : SynchronizedIterable {", + " null", + " }", + " def hasRegisteredBehavior : boolean {", + " false", + " }", + "}", + ""); + + @Inject + private CompilationTestHelper compiler; + + @Test + public void snipset1() throws Exception { + SarlScript mas = file(SNIPSET1); + final Validator validator = validate(mas); + validator.assertNoErrors(); + } + + @Test + public void snipset2() throws Exception { + SarlScript mas = file(SNIPSET2); + final Validator validator = validate(mas); + validator.assertNoErrors(); + } + + @Test + public void snipset3() throws Exception { + SarlScript mas = file(SNIPSET3); + final Validator validator = validate(mas); + validator.assertNoErrors(); + } + +} + diff --git a/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/MainTest.java b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/MainTest.java index d9378f053a..7be994cec9 100644 --- a/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/MainTest.java +++ b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/MainTest.java @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; -import io.sarl.lang.compilation.compiler.batch.Main; +import io.sarl.lang.compiler.batch.Main; import io.sarl.lang.sarl.actionprototype.ActionParameterTypes; import io.sarl.lang.sarl.actionprototype.ActionPrototype; diff --git a/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/SarlBatchCompilerTest.java b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/SarlBatchCompilerTest.java index aef97cb701..5561cc04f3 100644 --- a/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/SarlBatchCompilerTest.java +++ b/tests/io.sarl.lang.tests/src/test/java/io/sarl/lang/tests/modules/compiler/batch/SarlBatchCompilerTest.java @@ -27,7 +27,7 @@ import org.apache.log4j.Level; -import io.sarl.lang.compilation.compiler.batch.SarlBatchCompiler; +import io.sarl.lang.compiler.batch.SarlBatchCompiler; /** diff --git a/tests/io.sarl.tests.api/src/main/java/io/sarl/tests/api/AbstractSarlTest.java b/tests/io.sarl.tests.api/src/main/java/io/sarl/tests/api/AbstractSarlTest.java index 04f8ecf5da..983538ed10 100644 --- a/tests/io.sarl.tests.api/src/main/java/io/sarl/tests/api/AbstractSarlTest.java +++ b/tests/io.sarl.tests.api/src/main/java/io/sarl/tests/api/AbstractSarlTest.java @@ -104,7 +104,7 @@ import org.osgi.framework.Version; import io.sarl.lang.SARLVersion; -import io.sarl.lang.compilation.jvmmodel.SarlJvmModelAssociations; +import io.sarl.lang.jvmmodel.SarlJvmModelAssociations; import io.sarl.lang.sarl.SarlAction; import io.sarl.lang.sarl.SarlAgent; import io.sarl.lang.sarl.SarlAnnotationType;