From 0ce64943afb94cfcbf20706191d013a36d16198b Mon Sep 17 00:00:00 2001 From: dr6817 Date: Fri, 9 Feb 2024 11:34:12 +0100 Subject: [PATCH] JaMoPP version update. The dependencies and especially the package names have been updated to our latest version of JaMoPP: https://github.com/MDSD-Tools/JaMoPP --- .project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../builder/ComponentAndTypeNaming.java | 5 +- .../builder/ComponentBuilder.java | 5 +- .../builder/InterfaceBuilder.java | 20 +- .../builder/OperationBuilder.java | 25 +- .../builder/Seff2JavaASTBuilder.java | 19 +- .../builder/util/PcmModelCreationHelper.java | 29 +- .../AbstractInitializationStrategy.java | 5 +- .../ComponentDetectionByClustering.java | 5 +- .../detection/ComponentInterfaceStrategy.java | 11 +- ...mitiveComponentInitializationStrategy.java | 6 +- .../IComponentInterfaceStrategy.java | 2 +- ...mitiveComponentInitializationStrategy.java | 6 +- .../detection/util/AccessFilter.java | 7 +- .../detection/util/ComponentPrinter.java | 3 +- .../metricvalues/MetricValuesWriter.java | 2 +- bundles/org.somox.core/META-INF/MANIFEST.MF | 3 +- .../AbstractMoxConfiguration.java | 3 +- .../configuration/SoMoXConfiguration.java | 3 +- bundles/org.somox.filter/META-INF/MANIFEST.MF | 4 +- .../filter/AccessedTargetBlacklistFilter.java | 7 +- .../src/org/somox/filter/BlacklistFilter.java | 15 +- .../org/somox/filter/DataObjectFilter.java | 13 +- .../src/org/somox/filter/SubstractFilter.java | 4 +- .../somox/filter/tests/TestFileFilter.java | 5 +- .../org.somox.gast2seff/META-INF/MANIFEST.MF | 4 +- .../somox/gast2seff/jobs/GAST2SEFFJob.java | 2 +- ...bstractFunctionClassificationStrategy.java | 5 +- .../AbstractJaMoPPStatementVisitor.java | 43 +- ...aryCallFunctionClassificationStrategy.java | 5 +- .../BasicFunctionClassificationStrategy.java | 3 +- .../DefaultInterfaceOfExternalCallFinder.java | 9 +- ...emandingBehaviourForClassMethodFinder.java | 3 +- .../FunctionCallClassificationVisitor.java | 39 +- .../IFunctionClassificationStrategy.java | 2 +- .../InterfaceOfExternalCallFinding.java | 5 +- .../visitors/JaMoPPStatementVisitor.java | 16 +- .../gast2seff/visitors/MethodCallFinder.java | 13 +- ...mandingBehaviourForClassMethodFinding.java | 3 +- .../visitors/SwitchStatementHelper.java | 9 +- .../gast2seff/visitors/VisitorUtils.java | 5 +- .../org.somox.kdmhelper/META-INF/MANIFEST.MF | 10 +- .../org/somox/kdmhelper/EqualityChecker.java | 16 +- .../org/somox/kdmhelper/GetAccessedType.java | 16 +- .../src/org/somox/kdmhelper/KDMHelper.java | 81 +- .../src/org/somox/kdmhelper/KDMReader.java | 3 +- .../src/org/somox/kdmhelper/SoMoXUtil.java | 11 +- .../kdmhelper/metamodeladdition/Root.java | 11 +- .../JaMoPPSoftwareModelExtractor.java | 6 +- .../extraction/cache/ReferenceCache.java | 3 +- .../JavaSourceOrClassFileCachingResource.java | 2 +- .../dsl/ui/AbstractMetricDSLUiModule.java | 63 +- .../MetricDSLExecutableExtensionFactory.java | 3 +- .../AbstractMetricDSLProposalProvider.java | 38 +- .../contentassist/antlr/MetricDSLParser.java | 111 +- .../PartialMetricDSLContentAssistParser.java | 8 +- .../internal/InternalMetricDSLLexer.java | 654 ++- .../internal/InternalMetricDSLParser.java | 3895 ++++++++--------- .../dsl/ui/internal/MetricDSLActivator.java | 19 +- .../dsl/AbstractMetricDSLRuntimeModule.java | 28 +- .../MetricDSLStandaloneSetupGenerated.java | 4 +- .../metrics/dsl/metricDSL/BoundAndWeight.java | 40 +- .../somox/metrics/dsl/metricDSL/Constant.java | 22 +- .../metrics/dsl/metricDSL/ExternalMetric.java | 4 +- .../metrics/dsl/metricDSL/InternalMetric.java | 75 +- .../somox/metrics/dsl/metricDSL/Metric.java | 18 +- .../dsl/metricDSL/MetricAndWeight.java | 36 +- .../dsl/metricDSL/MetricDSLFactory.java | 62 +- .../dsl/metricDSL/MetricDSLPackage.java | 515 ++- .../dsl/metricDSL/MetricDefinition.java | 4 +- .../metrics/dsl/metricDSL/MetricModel.java | 27 +- .../somox/metrics/dsl/metricDSL/Number.java | 18 +- .../metrics/dsl/metricDSL/Parameter.java | 57 +- .../metrics/dsl/metricDSL/RatioMetric.java | 35 +- .../metrics/dsl/metricDSL/StepwiseMetric.java | 38 +- .../metrics/dsl/metricDSL/WeightedMetric.java | 18 +- .../metricDSL/impl/BoundAndWeightImpl.java | 93 +- .../dsl/metricDSL/impl/ConstantImpl.java | 41 +- .../metricDSL/impl/ExternalMetricImpl.java | 5 +- .../metricDSL/impl/InternalMetricImpl.java | 128 +- .../metricDSL/impl/MetricAndWeightImpl.java | 97 +- .../metricDSL/impl/MetricDSLFactoryImpl.java | 97 +- .../metricDSL/impl/MetricDSLPackageImpl.java | 309 +- .../metricDSL/impl/MetricDefinitionImpl.java | 5 +- .../dsl/metricDSL/impl/MetricImpl.java | 41 +- .../dsl/metricDSL/impl/MetricModelImpl.java | 61 +- .../dsl/metricDSL/impl/NumberImpl.java | 41 +- .../dsl/metricDSL/impl/ParameterImpl.java | 108 +- .../dsl/metricDSL/impl/RatioMetricImpl.java | 90 +- .../metricDSL/impl/StepwiseMetricImpl.java | 73 +- .../metricDSL/impl/WeightedMetricImpl.java | 31 +- .../util/MetricDSLAdapterFactory.java | 139 +- .../dsl/metricDSL/util/MetricDSLSwitch.java | 194 +- .../dsl/parser/antlr/MetricDSLParser.java | 4 +- .../internal/InternalMetricDSLLexer.java | 653 ++- .../internal/InternalMetricDSLParser.java | 1122 ++--- .../MetricDSLSemanticSequencer.java | 178 +- .../MetricDSLSyntacticSequencer.java | 23 +- .../dsl/services/MetricDSLGrammarAccess.java | 719 ++- .../AbstractMetricDSLValidator.java | 2 +- .../org.somox.metrics/META-INF/MANIFEST.MF | 4 +- .../src/org/somox/metrics/IMetric.java | 3 +- .../AbstractComposedMetric.java | 3 +- .../abstractmetrics/AbstractMetric.java | 3 +- .../metrics/basic/AbstractTypesCount.java | 3 +- .../somox/metrics/basic/AfferentCoupling.java | 3 +- .../somox/metrics/basic/EfferentCoupling.java | 3 +- .../metrics/basic/InterfaceAccessesCount.java | 3 +- .../metrics/basic/InternalAccessesCount.java | 3 +- .../somox/metrics/basic/TotalTypesCount.java | 3 +- .../helper/Class2ClassAccessGraphHelper.java | 7 +- .../metrics/helper/ClassAccessGraphEdge.java | 3 +- .../ComponentToImplementingClassesHelper.java | 5 +- .../metrics/helper/SourceClassEdgeFilter.java | 3 +- .../metrics/helper/TargetClassEdgeFilter.java | 3 +- .../hierarchy/AbstractHierarchyMapping.java | 5 +- .../metrics/hierarchy/DirectoryMapping.java | 9 +- .../metrics/hierarchy/PackageMapping.java | 9 +- .../somox/metrics/naming/NameResemblance.java | 5 +- .../SliceLayerArchitectureQuality.java | 25 +- .../metrics/structure/SubsystemComponent.java | 7 +- .../org/somox/metrics/tabs/BlacklistTab.java | 17 +- .../metrics/tabs/CheckboxContentProvider.java | 8 +- .../metrics/tabs/CheckboxLabelProvider.java | 3 +- .../somox/metrics/util/AccessCacheGraph.java | 3 +- .../org/somox/metrics/util/GraphPrinter.java | 5 +- .../META-INF/MANIFEST.MF | 4 +- .../{ => model}/MetricValues2.ecore | 144 +- .../{ => model}/MetricValues2.ecorediag | 472 +- .../{ => model}/MetricValues2.genmodel | 123 +- .../src/metricvalues/Component.java | 5 +- .../src/metricvalues/impl/ComponentImpl.java | 2 +- .../impl/MetricvaluesPackageImpl.java | 36 +- .../META-INF/MANIFEST.MF | 6 +- .../provider/SEFF2JavaASTItemProvider.java | 64 +- .../SEFF2MethodMappingItemProvider.java | 81 +- .../provider/Seff2java_astEditPlugin.java | 20 +- ...eff2javaastItemProviderAdapterFactory.java | 109 +- .../META-INF/MANIFEST.MF | 5 +- .../Seff2java_astEditorPlugin.java | 20 +- .../Seff2javaastActionBarContributor.java | 200 +- .../presentation/Seff2javaastEditor.java | 1115 +++-- .../presentation/Seff2javaastModelWizard.java | 228 +- .../META-INF/MANIFEST.MF | 2 +- .../model/seff2java_ast.ecore | 2 +- .../model/seff2java_ast.genmodel | 15 +- .../seff2javaast/SEFF2MethodMapping.java | 3 +- .../impl/SEFF2MethodMappingImpl.java | 3 +- .../impl/Seff2javaastPackageImpl.java | 37 +- .../META-INF/MANIFEST.MF | 2 - ...ractActionClassMethodLinkItemProvider.java | 193 +- ...MethodLevelSourceCodeLinkItemProvider.java | 125 +- ...ntImplementingClassesLinkItemProvider.java | 390 +- ...olFlowLevelSourceCodeLinkItemProvider.java | 174 +- .../DataTypeSourceCodeLinkItemProvider.java | 209 +- .../provider/FEditPlugin.java | 104 +- .../FileLevelSourceCodeLinkItemProvider.java | 192 +- ...nerDatatypeSourceCodeLinkItemProvider.java | 193 +- .../InterfaceSourceCodeLinkItemProvider.java | 192 +- ...ndingInternalBehaviorLinkItemProvider.java | 139 +- ...MethodLevelSourceCodeLinkItemProvider.java | 142 +- ...ImplementatingClassesLinkItemProvider.java | 144 +- .../SEFF2MethodMappingItemProvider.java | 209 +- ...SeffElementSourceCodeLinkItemProvider.java | 212 +- ...ceCodeDecoratorRepositoryItemProvider.java | 402 +- ...dedecoratorItemProviderAdapterFactory.java | 600 +-- .../META-INF/MANIFEST.MF | 4 +- .../presentation/FEditorPlugin.java | 104 +- ...urcecodedecoratorActionBarContributor.java | 597 +-- .../SourcecodedecoratorEditor.java | 2968 +++++++------ .../SourcecodedecoratorModelWizard.java | 829 ++-- .../META-INF/MANIFEST.MF | 6 +- .../model/sourcecodedecorator.aird | 10 +- .../model/sourcecodedecorator.ecore | 20 +- .../model/sourcecodedecorator.genmodel | 15 +- .../AbstractActionClassMethodLink.java | 3 +- .../AbstractMethodLevelSourceCodeLink.java | 2 +- .../ComponentImplementingClassesLink.java | 5 +- .../ControlFlowLevelSourceCodeLink.java | 3 +- .../DataTypeSourceCodeLink.java | 3 +- .../FileLevelSourceCodeLink.java | 3 +- .../InnerDatatypeSourceCodeLink.java | 3 +- .../InterfaceSourceCodeLink.java | 3 +- .../SEFF2MethodMapping.java | 3 +- .../SeffElementSourceCodeLink.java | 7 +- .../AbstractActionClassMethodLinkImpl.java | 3 +- ...AbstractMethodLevelSourceCodeLinkImpl.java | 3 +- .../ComponentImplementingClassesLinkImpl.java | 3 +- .../ControlFlowLevelSourceCodeLinkImpl.java | 3 +- .../impl/DataTypeSourceCodeLinkImpl.java | 3 +- .../impl/FileLevelSourceCodeLinkImpl.java | 3 +- .../impl/InnerDatatypeSourceCodeLinkImpl.java | 3 +- .../impl/InterfaceSourceCodeLinkImpl.java | 3 +- .../impl/SEFF2MethodMappingImpl.java | 3 +- .../impl/SeffElementSourceCodeLinkImpl.java | 2 +- .../impl/SourcecodedecoratorPackageImpl.java | 36 +- bundles/org.somox.util/.classpath | 1 - bundles/org.somox.util/META-INF/MANIFEST.MF | 5 +- .../somox/util/SourceCodeDecoratorHelper.java | 9 +- .../org.somox.jamopp.core.feature/feature.xml | 16 +- .../org.somox.jamopp.seff.feature/feature.xml | 2 +- .../feature.xml | 4 +- .../org.somox.targetplatform.target | 2 +- .../SoMoXConfigurationAttributeMapTest.java | 125 +- .../util/TestDefaultResourceEnvironment.java | 1 - 206 files changed, 10750 insertions(+), 11118 deletions(-) rename bundles/org.somox.metricvaluesstorage/{ => model}/MetricValues2.ecore (97%) mode change 100755 => 100644 rename bundles/org.somox.metricvaluesstorage/{ => model}/MetricValues2.ecorediag (98%) mode change 100755 => 100644 rename bundles/org.somox.metricvaluesstorage/{ => model}/MetricValues2.genmodel (89%) mode change 100755 => 100644 diff --git a/.project b/.project index 69053bb..87b235e 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - Palladio-ReverseEngineering-SoMoX-JaMoPP + Palladio-ReverseEngineering-SoMoX diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/META-INF/MANIFEST.MF b/bundles/org.somox.analyzer.simplemodelanalyzer/META-INF/MANIFEST.MF index c3c2e52..de1925c 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/META-INF/MANIFEST.MF +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/META-INF/MANIFEST.MF @@ -17,13 +17,13 @@ Require-Bundle: org.somox.core, org.somox.sourcecodedecorator, org.palladiosimulator.pcm, org.palladiosimulator.pcm.resources, - org.emftext.language.java, org.eclipse.emf.common, org.somox.metricvaluesstorage, org.somox.metrics, org.somox.util, org.somox.gast2seff, - org.jgrapht.core + org.jgrapht.core, + tools.mdsd.jamopp.model.java Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.somox.analyzer.simplemodelanalyzer, diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentAndTypeNaming.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentAndTypeNaming.java index 7c2d303..ee40649 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentAndTypeNaming.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentAndTypeNaming.java @@ -6,8 +6,6 @@ import org.apache.log4j.Category; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.palladiosimulator.pcm.core.composition.ProvidedDelegationConnector; import org.palladiosimulator.pcm.core.composition.RequiredDelegationConnector; import org.palladiosimulator.pcm.repository.Interface; @@ -16,6 +14,9 @@ import org.somox.kdmhelper.metamodeladdition.Root; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Component, package, interface, and port naming facility. * diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentBuilder.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentBuilder.java index 772e7a5..9165456 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentBuilder.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/ComponentBuilder.java @@ -8,8 +8,6 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.jgrapht.Graph; import org.palladiosimulator.pcm.core.composition.AssemblyContext; import org.palladiosimulator.pcm.core.composition.ComposedStructure; @@ -28,6 +26,9 @@ import org.somox.sourcecodedecorator.FileLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorFactory; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Builder for SAMM structures. Takes care of updating the source code * decorator. The core builder facility. diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/InterfaceBuilder.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/InterfaceBuilder.java index 90766da..49b6270 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/InterfaceBuilder.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/InterfaceBuilder.java @@ -8,13 +8,6 @@ import org.apache.log4j.Logger; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.emftext.language.java.classifiers.Classifier; -//import org.eclipse.gmt.modisco.java.ASTNode; -//Commentable statt AstNode -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.ClassifierReference; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.types.TypeReference; import org.palladiosimulator.pcm.core.entity.ComposedProvidingRequiringEntity; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.repository.Interface; @@ -26,13 +19,6 @@ import org.palladiosimulator.pcm.repository.RepositoryFactory; import org.palladiosimulator.pcm.repository.RequiredRole; import org.palladiosimulator.pcm.repository.Role; -//import de.fzi.gast.accesses.Access; -//import de.fzi.gast.accesses.InheritanceTypeAccess; -//import de.fzi.gast.accesses.accessesPackage; -//import de.fzi.gast.core.Root; -//import de.fzi.gast.types.GASTClass; -//import org.eclipse.gmt.modisco.java.TypeReference; -//import org.eclipse.gmt.modisco.java.emf.JavaPackage; import org.somox.analyzer.AnalysisResult; import org.somox.analyzer.simplemodelanalyzer.builder.util.InterfacePortBuilderHelper; import org.somox.analyzer.simplemodelanalyzer.detection.ComponentInterfaceStrategy; @@ -46,6 +32,12 @@ import org.somox.sourcecodedecorator.InterfaceSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorFactory; +import tools.mdsd.jamopp.model.java.classifiers.Classifier; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.ClassifierReference; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; + /** * Builder used to create {@link Interface}s in the SAMM instance based on * reverse engineered code diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/OperationBuilder.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/OperationBuilder.java index 2f5b17c..c9b4c49 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/OperationBuilder.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/OperationBuilder.java @@ -4,15 +4,6 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.arrays.ArrayTypeable; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.containers.CompilationUnit; -import org.emftext.language.java.generics.QualifiedTypeArgument; -import org.emftext.language.java.members.Field; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.variables.Variable; import org.palladiosimulator.pcm.core.entity.NamedElement; import org.palladiosimulator.pcm.repository.CollectionDataType; import org.palladiosimulator.pcm.repository.CompositeDataType; @@ -36,6 +27,16 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorFactory; import org.somox.util.DefaultResourceEnvironment; +import tools.mdsd.jamopp.model.java.arrays.ArrayTypeable; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; +import tools.mdsd.jamopp.model.java.generics.QualifiedTypeArgument; +import tools.mdsd.jamopp.model.java.members.Field; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.variables.Variable; + /** * Builder for operations, parameters, message types, and data types. Keeps the * source code decorator updated. @@ -109,7 +110,7 @@ private Method getRealMethod(final ConcreteClassifier implementationClass, final } for (final ConcreteClassifier superClass : KDMHelper.getSuperTypes(implementationClass)) { if (!KDMHelper.isAbstract(superClass) && !KDMHelper.isInterface(superClass) - && (superClass instanceof org.emftext.language.java.classifiers.Class)) { + && (superClass instanceof tools.mdsd.jamopp.model.java.classifiers.Class)) { final Method real = getRealMethod(superClass, inputMethod); if (real != null) { return real; @@ -163,12 +164,12 @@ private OperationSignature createOperationSignature(final Method method, final O } if ((null != method.getTypeReference()) && (null != GetAccessedType.getAccessedType(method.getTypeReference())) - && !(method.getTypeReference() instanceof org.emftext.language.java.types.Void)) { + && !(method.getTypeReference() instanceof tools.mdsd.jamopp.model.java.types.Void)) { final DataType returnType = getType(GetAccessedType.getAccessedType(method.getTypeReference()), analysisResult.getInternalArchitectureModel(), (ArrayTypeable) method.getTypeReference()); operation.setReturnType__OperationSignature(returnType); } else if ((null != method.getTypeReference()) - && !(method.getTypeReference() instanceof org.emftext.language.java.types.Void)) { + && !(method.getTypeReference() instanceof tools.mdsd.jamopp.model.java.types.Void)) { final Type accessedType = GetAccessedType.getAccessedType(method.getTypeReference()); final DataType type = getType(accessedType, analysisResult.getInternalArchitectureModel(), (ArrayTypeable) method.getTypeReference()); diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/Seff2JavaASTBuilder.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/Seff2JavaASTBuilder.java index 4f91a38..aed671f 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/Seff2JavaASTBuilder.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/Seff2JavaASTBuilder.java @@ -8,15 +8,6 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.containers.CompilationUnit; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.Constructor; -import org.emftext.language.java.members.InterfaceMethod; -import org.emftext.language.java.members.Member; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.StatementListContainer; -import org.emftext.language.java.types.Type; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.repository.EventGroup; import org.palladiosimulator.pcm.repository.EventType; @@ -42,6 +33,16 @@ import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; import org.somox.sourcecodedecorator.SourcecodedecoratorFactory; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.Constructor; +import tools.mdsd.jamopp.model.java.members.InterfaceMethod; +import tools.mdsd.jamopp.model.java.members.Member; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Builder used to add GAST behaviour to methods detected as provided operations * of components diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/util/PcmModelCreationHelper.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/util/PcmModelCreationHelper.java index c393223..71773dc 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/util/PcmModelCreationHelper.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/builder/util/PcmModelCreationHelper.java @@ -1,12 +1,6 @@ package org.somox.analyzer.simplemodelanalyzer.builder.util; import org.apache.log4j.Logger; -import org.emftext.language.java.arrays.ArrayTypeable; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.Constructor; -import org.emftext.language.java.members.Member; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.types.Type; import org.palladiosimulator.pcm.repository.DataType; import org.palladiosimulator.pcm.repository.EventGroup; import org.palladiosimulator.pcm.repository.EventType; @@ -20,6 +14,13 @@ import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; import org.somox.util.SourceCodeDecoratorHelper; +import tools.mdsd.jamopp.model.java.arrays.ArrayTypeable; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.Constructor; +import tools.mdsd.jamopp.model.java.members.Member; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.types.Type; + public class PcmModelCreationHelper { private static final Logger logger = Logger.getLogger(PcmModelCreationHelper.class.getSimpleName()); @@ -51,7 +52,7 @@ public OperationSignature createOperationSignatureInInterfaceForJaMoPPMemberAndU } final OperationSignature opSignature = RepositoryFactory.eINSTANCE.createOperationSignature(); opSignature.setEntityName(jaMoPPMember.getName()); - if (jaMoPPMember instanceof final org.emftext.language.java.members.Method jaMoPPMethod) { + if (jaMoPPMember instanceof final tools.mdsd.jamopp.model.java.members.Method jaMoPPMethod) { if ((null != jaMoPPMethod.getTypeReference()) && (null != jaMoPPMethod.getTypeReference().getTarget())) { final DataType returnType = getDataTypeAndUpdateSourceCodeDecorator(repo, jaMoPPMethod.getTypeReference().getTarget(), (ArrayTypeable) jaMoPPMethod.getTypeReference()); @@ -65,11 +66,11 @@ public OperationSignature createOperationSignatureInInterfaceForJaMoPPMemberAndU opSignature.setReturnType__OperationSignature(defaultDataType); } - for (final org.emftext.language.java.parameters.Parameter jaMoPPParam : jaMoPPMethod.getParameters()) { + for (final tools.mdsd.jamopp.model.java.parameters.Parameter jaMoPPParam : jaMoPPMethod.getParameters()) { createParameterAndAddParameter(repo, opSignature, jaMoPPParam); } } else if (jaMoPPMember instanceof final Constructor ctor) { - for (final org.emftext.language.java.parameters.Parameter ctorParam : ctor.getParameters()) { + for (final tools.mdsd.jamopp.model.java.parameters.Parameter ctorParam : ctor.getParameters()) { createParameterAndAddParameter(repo, opSignature, ctorParam); } } @@ -86,7 +87,8 @@ public OperationSignature createOperationSignatureInInterfaceForJaMoPPMemberAndU public EventGroup createEventGroupAndEventTypeAndUpdateSourceCodeDecorator( final ConcreteClassifier observedEventDataType, final Repository repository, - final org.emftext.language.java.parameters.Parameter observedJaMoPPParameter, final Member jaMoPPMember) { + final tools.mdsd.jamopp.model.java.parameters.Parameter observedJaMoPPParameter, + final Member jaMoPPMember) { final EventGroup eventGroup = createEventGroupAndUpdateSCDM(observedEventDataType); createEventType(eventGroup, repository, observedEventDataType, observedJaMoPPParameter, jaMoPPMember); return eventGroup; @@ -94,7 +96,8 @@ public EventGroup createEventGroupAndEventTypeAndUpdateSourceCodeDecorator( private EventType createEventType(final EventGroup eventGroup, final Repository repoitory, final ConcreteClassifier observedEventDataType, - final org.emftext.language.java.parameters.Parameter observedJaMoPPParameter, final Member jaMoPPMember) { + final tools.mdsd.jamopp.model.java.parameters.Parameter observedJaMoPPParameter, + final Member jaMoPPMember) { final EventType eventType = RepositoryFactory.eINSTANCE.createEventType(); eventType.setEntityName(observedEventDataType.getName()); eventGroup.getEventTypes__EventGroup().add(eventType); @@ -142,13 +145,13 @@ private DataType getDataTypeAndUpdateSourceCodeDecorator(final Repository repo, } private void createParameterAndAddParameter(final Repository repo, final OperationSignature opSignature, - final org.emftext.language.java.parameters.Parameter jaMoPPParam) { + final tools.mdsd.jamopp.model.java.parameters.Parameter jaMoPPParam) { final Parameter pcmParam = createParameter(repo, jaMoPPParam); opSignature.getParameters__OperationSignature().add(pcmParam); } private Parameter createParameter(final Repository repo, - final org.emftext.language.java.parameters.Parameter jaMoPPParam) { + final tools.mdsd.jamopp.model.java.parameters.Parameter jaMoPPParam) { final Parameter pcmParam = RepositoryFactory.eINSTANCE.createParameter(); pcmParam.setParameterName(jaMoPPParam.getName()); diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/AbstractInitializationStrategy.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/AbstractInitializationStrategy.java index 3fd0bac..0818bfe 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/AbstractInitializationStrategy.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/AbstractInitializationStrategy.java @@ -1,13 +1,10 @@ package org.somox.analyzer.simplemodelanalyzer.detection; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; import org.somox.filter.DataObjectFilter; import org.somox.kdmhelper.KDMHelper; -//import de.fzi.gast.functions.Method; -//import de.fzi.gast.types.GASTClass; -//import de.fzi.gast.types.GASTStruct; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; /** * Abstract class for {@link IInitializationStrategy} providing default class diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentDetectionByClustering.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentDetectionByClustering.java index ffffaeb..369daf0 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentDetectionByClustering.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentDetectionByClustering.java @@ -16,7 +16,6 @@ import org.apache.log4j.Logger; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.Graph; import org.jgrapht.alg.connectivity.ConnectivityInspector; import org.jgrapht.graph.AsSubgraph; @@ -42,10 +41,10 @@ import org.somox.metrics.helper.ComponentToImplementingClassesHelper; import org.somox.metrics.registry.MetricsRegistry; import org.somox.metrics.util.GraphPrinter; -//import de.fzi.gast.core.Root; -//import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * Detection strategy for composite component which relies on clustering of * metrics computed for pair-wise component relationships diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentInterfaceStrategy.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentInterfaceStrategy.java index 2396211..fa796cf 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentInterfaceStrategy.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/ComponentInterfaceStrategy.java @@ -1,15 +1,14 @@ package org.somox.analyzer.simplemodelanalyzer.detection; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; -//import de.fzi.gast.functions.Method; -//import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.InterfaceSourceCodeLink; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Default interface detection strategy. Conditions in GAST: interface or only * virtual methods which is not primitive or identified a component interface diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/GastToPrimitiveComponentInitializationStrategy.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/GastToPrimitiveComponentInitializationStrategy.java index 2dceb56..45cda84 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/GastToPrimitiveComponentInitializationStrategy.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/GastToPrimitiveComponentInitializationStrategy.java @@ -3,17 +3,15 @@ import java.util.ArrayList; import java.util.List; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.analyzer.simplemodelanalyzer.builder.ComponentBuilder; import org.somox.configuration.SoMoXConfiguration; import org.somox.filter.ComposedFilter; import org.somox.filter.EClassBasedFilter; import org.somox.kdmhelper.metamodeladdition.Root; -//import de.fzi.gast.core.Root; -//import de.fzi.gast.types.GASTClass; -//import de.fzi.gast.types.typesPackage; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * Initialization class for the conversion from GAST class to component.
* Classes are extracted from the Resource and "bundled" with their inner diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/IComponentInterfaceStrategy.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/IComponentInterfaceStrategy.java index 93dbaf9..0bc2396 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/IComponentInterfaceStrategy.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/IComponentInterfaceStrategy.java @@ -1,6 +1,6 @@ package org.somox.analyzer.simplemodelanalyzer.detection; -import org.emftext.language.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/NoGastClassToPrimitiveComponentInitializationStrategy.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/NoGastClassToPrimitiveComponentInitializationStrategy.java index 7533fdc..69b3a0b 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/NoGastClassToPrimitiveComponentInitializationStrategy.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/NoGastClassToPrimitiveComponentInitializationStrategy.java @@ -3,18 +3,16 @@ import java.util.ArrayList; import java.util.List; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.analyzer.simplemodelanalyzer.builder.ComponentBuilder; import org.somox.configuration.SoMoXConfiguration; import org.somox.filter.ComposedFilter; import org.somox.filter.EClassBasedFilter; import org.somox.kdmhelper.KDMHelper; import org.somox.kdmhelper.metamodeladdition.Root; -//import de.fzi.gast.core.Root; -//import de.fzi.gast.types.GASTClass; -//import de.fzi.gast.types.typesPackage; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * Initialization class which only lists a filtered set of classes which * potentially can become a component. Does NOT create a SAMM primitive diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/AccessFilter.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/AccessFilter.java index 693e9f3..4903f7a 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/AccessFilter.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/AccessFilter.java @@ -4,9 +4,6 @@ import java.util.List; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.types.TypeReference; //import org.eclipse.gmt.modisco.java.Commentable; //import org.eclipse.gmt.modisco.java.ClassInstanceCreation; //import org.eclipse.gmt.modisco.java.EnumConstantDeclaration; @@ -17,6 +14,10 @@ import org.somox.kdmhelper.GetAccessedType; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; + //import de.fzi.gast.accesses.Access; //import de.fzi.gast.accesses.CompositeAccess; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/ComponentPrinter.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/ComponentPrinter.java index 7fdc2bb..9573044 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/ComponentPrinter.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/detection/util/ComponentPrinter.java @@ -3,11 +3,12 @@ import java.util.List; import org.apache.log4j.Logger; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; //import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.types.Type; + public class ComponentPrinter { /** diff --git a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/metricvalues/MetricValuesWriter.java b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/metricvalues/MetricValuesWriter.java index 0886b83..cf83ec6 100644 --- a/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/metricvalues/MetricValuesWriter.java +++ b/bundles/org.somox.analyzer.simplemodelanalyzer/src/org/somox/analyzer/simplemodelanalyzer/metricvalues/MetricValuesWriter.java @@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.graph.DefaultDirectedGraph; import org.palladiosimulator.pcm.repository.RepositoryComponent; import org.somox.analyzer.simplemodelanalyzer.Activator; @@ -31,6 +30,7 @@ import metricvalues.MetricValue; import metricvalues.MetricValuesModel; import metricvalues.MetricvaluesFactory; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; public class MetricValuesWriter { diff --git a/bundles/org.somox.core/META-INF/MANIFEST.MF b/bundles/org.somox.core/META-INF/MANIFEST.MF index 55b2458..2a0f48d 100644 --- a/bundles/org.somox.core/META-INF/MANIFEST.MF +++ b/bundles/org.somox.core/META-INF/MANIFEST.MF @@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime, org.somox.kdmhelper, org.eclipse.emf.edit, org.somox.sourcecodedecorator, - org.palladiosimulator.pcm + org.palladiosimulator.pcm, + tools.mdsd.jamopp.model.java Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.somox.core.Activator Export-Package: org.somox.analyzer, diff --git a/bundles/org.somox.core/src/org/somox/configuration/AbstractMoxConfiguration.java b/bundles/org.somox.core/src/org/somox/configuration/AbstractMoxConfiguration.java index 244935e..0f1716f 100644 --- a/bundles/org.somox.core/src/org/somox/configuration/AbstractMoxConfiguration.java +++ b/bundles/org.somox.core/src/org/somox/configuration/AbstractMoxConfiguration.java @@ -98,7 +98,8 @@ public void applyAttributeMap(final Map attributeMap) { } final FileLocationConfiguration fileLocations = getFileLocations(); if (attributeMap.get(AbstractMoxConfiguration.SOMOX_PROJECT_NAME) != null) { - fileLocations.setProjectNames(Set.of((String)attributeMap.get(AbstractMoxConfiguration.SOMOX_PROJECT_NAME))); + fileLocations + .setProjectNames(Set.of((String) attributeMap.get(AbstractMoxConfiguration.SOMOX_PROJECT_NAME))); } if (attributeMap.get(AbstractMoxConfiguration.SOMOX_ANALYZER_INPUT_FILE) != null) { diff --git a/bundles/org.somox.core/src/org/somox/configuration/SoMoXConfiguration.java b/bundles/org.somox.core/src/org/somox/configuration/SoMoXConfiguration.java index a1f2982..8d6da58 100644 --- a/bundles/org.somox.core/src/org/somox/configuration/SoMoXConfiguration.java +++ b/bundles/org.somox.core/src/org/somox/configuration/SoMoXConfiguration.java @@ -5,12 +5,13 @@ import java.util.Set; import java.util.StringTokenizer; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; import org.somox.filter.BlacklistFilter; import org.somox.filter.ComposedFilter; import org.somox.filter.tests.TestFileFilter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * SoMoX’ central configuration. *

attribute map

This configuration has a bijective representation as diff --git a/bundles/org.somox.filter/META-INF/MANIFEST.MF b/bundles/org.somox.filter/META-INF/MANIFEST.MF index e37cd77..4509d0b 100644 --- a/bundles/org.somox.filter/META-INF/MANIFEST.MF +++ b/bundles/org.somox.filter/META-INF/MANIFEST.MF @@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.apache.log4j, org.somox.kdmhelper, - org.emftext.language.java, org.eclipse.jdt.core, org.eclipse.core.resources, - org.eclipse.emf.ecore + org.eclipse.emf.ecore, + tools.mdsd.jamopp.model.java Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.somox.filter, diff --git a/bundles/org.somox.filter/src/org/somox/filter/AccessedTargetBlacklistFilter.java b/bundles/org.somox.filter/src/org/somox/filter/AccessedTargetBlacklistFilter.java index 0675f51..afbc81d 100644 --- a/bundles/org.somox.filter/src/org/somox/filter/AccessedTargetBlacklistFilter.java +++ b/bundles/org.somox.filter/src/org/somox/filter/AccessedTargetBlacklistFilter.java @@ -1,9 +1,10 @@ package org.somox.filter; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.Member; import org.somox.kdmhelper.GetAccessedType; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.Member; + //import de.fzi.gast.accesses.Access; //import de.fzi.gast.types.GASTClass; @@ -26,7 +27,7 @@ public AccessedTargetBlacklistFilter(final BaseFilter classi @Override public boolean passes(final Member access) { - final org.emftext.language.java.types.Type accessedClass = GetAccessedType.getAccessedType(access); + final tools.mdsd.jamopp.model.java.types.Type accessedClass = GetAccessedType.getAccessedType(access); if ((accessedClass == null) && !(accessedClass instanceof ConcreteClassifier)) { return false; } diff --git a/bundles/org.somox.filter/src/org/somox/filter/BlacklistFilter.java b/bundles/org.somox.filter/src/org/somox/filter/BlacklistFilter.java index 27ddb83..8a4a808 100644 --- a/bundles/org.somox.filter/src/org/somox/filter/BlacklistFilter.java +++ b/bundles/org.somox.filter/src/org/somox/filter/BlacklistFilter.java @@ -5,15 +5,16 @@ import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.Field; -import org.emftext.language.java.members.InterfaceMethod; -import org.emftext.language.java.members.Member; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.Field; +import tools.mdsd.jamopp.model.java.members.InterfaceMethod; +import tools.mdsd.jamopp.model.java.members.Member; +import tools.mdsd.jamopp.model.java.types.Type; + public class BlacklistFilter extends BaseFilter { private static Logger logger = Logger.getLogger(BlacklistFilter.class); diff --git a/bundles/org.somox.filter/src/org/somox/filter/DataObjectFilter.java b/bundles/org.somox.filter/src/org/somox/filter/DataObjectFilter.java index 49bdfb1..b3d276a 100644 --- a/bundles/org.somox.filter/src/org/somox/filter/DataObjectFilter.java +++ b/bundles/org.somox.filter/src/org/somox/filter/DataObjectFilter.java @@ -3,18 +3,11 @@ import java.util.List; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.EnumConstant; -import org.emftext.language.java.members.Method; -//import org.eclipse.gmt.modisco.java.EnumDeclaration; -//import org.eclipse.gmt.modisco.java.MethodDeclaration; -//import org.eclipse.gmt.modisco.java.Type; -//import org.eclipse.gmt.modisco.java.VisibilityKind; import org.somox.kdmhelper.KDMHelper; -//import de.fzi.gast.functions.Method; -//import de.fzi.gast.types.GASTClass; -//import de.fzi.gast.types.Visibilities; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.EnumConstant; +import tools.mdsd.jamopp.model.java.members.Method; /** * Filter all classes which are only data classes, i.e., all public methods are diff --git a/bundles/org.somox.filter/src/org/somox/filter/SubstractFilter.java b/bundles/org.somox.filter/src/org/somox/filter/SubstractFilter.java index 6625083..4c04d73 100644 --- a/bundles/org.somox.filter/src/org/somox/filter/SubstractFilter.java +++ b/bundles/org.somox.filter/src/org/somox/filter/SubstractFilter.java @@ -2,9 +2,7 @@ import java.util.Set; -import org.emftext.language.java.types.Type; - -//import de.fzi.gast.types.GASTClass; +import tools.mdsd.jamopp.model.java.types.Type; /** * Removes one set from another set. diff --git a/bundles/org.somox.filter/src/org/somox/filter/tests/TestFileFilter.java b/bundles/org.somox.filter/src/org/somox/filter/tests/TestFileFilter.java index dcdea74..0505367 100644 --- a/bundles/org.somox.filter/src/org/somox/filter/tests/TestFileFilter.java +++ b/bundles/org.somox.filter/src/org/somox/filter/tests/TestFileFilter.java @@ -7,11 +7,12 @@ import java.util.Optional; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.containers.CompilationUnit; import org.somox.filter.BaseFilter; import org.somox.filter.BlacklistFilter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; + public class TestFileFilter extends BaseFilter { private static final Logger logger = Logger.getLogger(BlacklistFilter.class); diff --git a/bundles/org.somox.gast2seff/META-INF/MANIFEST.MF b/bundles/org.somox.gast2seff/META-INF/MANIFEST.MF index 6784f5e..8c5f63e 100644 --- a/bundles/org.somox.gast2seff/META-INF/MANIFEST.MF +++ b/bundles/org.somox.gast2seff/META-INF/MANIFEST.MF @@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.ui, org.somox.kdmhelper, org.somox.core, org.palladiosimulator.pcm, - org.emftext.language.java, - org.somox.util + org.somox.util, + tools.mdsd.jamopp.model.java Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.somox.gast2seff.jobs, diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/jobs/GAST2SEFFJob.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/jobs/GAST2SEFFJob.java index 334a633..de9df87 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/jobs/GAST2SEFFJob.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/jobs/GAST2SEFFJob.java @@ -14,7 +14,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.seff.ResourceDemandingSEFF; import org.palladiosimulator.pcm.seff.SeffFactory; @@ -38,6 +37,7 @@ import de.uka.ipd.sdq.workflow.jobs.IBlackboardInteractingJob; import de.uka.ipd.sdq.workflow.jobs.JobFailedException; import de.uka.ipd.sdq.workflow.jobs.UserCanceledException; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; /** * Transformation Job transforming a SAM instance with GAST Behaviours into a diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractFunctionClassificationStrategy.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractFunctionClassificationStrategy.java index b7dae65..0da0deb 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractFunctionClassificationStrategy.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractFunctionClassificationStrategy.java @@ -6,10 +6,11 @@ import java.util.List; import org.apache.log4j.Logger; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.Statement; import org.somox.gast2seff.visitors.FunctionCallClassificationVisitor.FunctionCallType; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.Statement; + /** * Base implementation of {@link IFunctionClassificationStrategy}. Delagates the * decisions on the function call types to subclasses diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractJaMoPPStatementVisitor.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractJaMoPPStatementVisitor.java index 99d8712..88532b0 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractJaMoPPStatementVisitor.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractJaMoPPStatementVisitor.java @@ -8,30 +8,31 @@ import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.ComposedSwitch; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.containers.CompilationUnit; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.members.util.MembersSwitch; -import org.emftext.language.java.statements.Assert; -import org.emftext.language.java.statements.Block; -import org.emftext.language.java.statements.Condition; -import org.emftext.language.java.statements.DoWhileLoop; -import org.emftext.language.java.statements.ExpressionStatement; -import org.emftext.language.java.statements.ForEachLoop; -import org.emftext.language.java.statements.ForLoop; -import org.emftext.language.java.statements.Jump; -import org.emftext.language.java.statements.LocalVariableStatement; -import org.emftext.language.java.statements.Statement; -import org.emftext.language.java.statements.StatementListContainer; -import org.emftext.language.java.statements.Switch; -import org.emftext.language.java.statements.SynchronizedBlock; -import org.emftext.language.java.statements.TryBlock; -import org.emftext.language.java.statements.WhileLoop; -import org.emftext.language.java.statements.util.StatementsSwitch; import org.somox.gast2seff.visitors.FunctionCallClassificationVisitor.FunctionCallType; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.members.util.MembersSwitch; +import tools.mdsd.jamopp.model.java.statements.Assert; +import tools.mdsd.jamopp.model.java.statements.Block; +import tools.mdsd.jamopp.model.java.statements.Condition; +import tools.mdsd.jamopp.model.java.statements.DoWhileLoop; +import tools.mdsd.jamopp.model.java.statements.ExpressionStatement; +import tools.mdsd.jamopp.model.java.statements.ForEachLoop; +import tools.mdsd.jamopp.model.java.statements.ForLoop; +import tools.mdsd.jamopp.model.java.statements.Jump; +import tools.mdsd.jamopp.model.java.statements.LocalVariableStatement; +import tools.mdsd.jamopp.model.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; +import tools.mdsd.jamopp.model.java.statements.Switch; +import tools.mdsd.jamopp.model.java.statements.SynchronizedBlock; +import tools.mdsd.jamopp.model.java.statements.TryBlock; +import tools.mdsd.jamopp.model.java.statements.WhileLoop; +import tools.mdsd.jamopp.model.java.statements.util.StatementsSwitch; + public abstract class AbstractJaMoPPStatementVisitor extends ComposedSwitch { private static final Logger logger = Logger.getLogger(AbstractJaMoPPStatementVisitor.class); /** diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractLibraryCallFunctionClassificationStrategy.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractLibraryCallFunctionClassificationStrategy.java index 03a9e43..ac4bd31 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractLibraryCallFunctionClassificationStrategy.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/AbstractLibraryCallFunctionClassificationStrategy.java @@ -1,11 +1,12 @@ package org.somox.gast2seff.visitors; import org.apache.log4j.Logger; -import org.emftext.language.java.containers.CompilationUnit; -import org.emftext.language.java.members.Method; import org.somox.kdmhelper.metamodeladdition.Root; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; +import tools.mdsd.jamopp.model.java.members.Method; + /** * Class that defines how library calls are marked but not how external calls * are marked. diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/BasicFunctionClassificationStrategy.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/BasicFunctionClassificationStrategy.java index 2233b4e..b63960a 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/BasicFunctionClassificationStrategy.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/BasicFunctionClassificationStrategy.java @@ -6,7 +6,6 @@ import java.util.List; import org.apache.log4j.Logger; -import org.emftext.language.java.members.Method; import org.palladiosimulator.pcm.repository.BasicComponent; import org.somox.kdmhelper.EqualityChecker; import org.somox.kdmhelper.KDMHelper; @@ -15,6 +14,8 @@ import org.somox.sourcecodedecorator.InterfaceSourceCodeLink; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.members.Method; + /** * Implementation of {@link IFunctionClassificationStrategy}. Uses basic * heuristics based on the source code decorator and the GAST model to decide on diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultInterfaceOfExternalCallFinder.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultInterfaceOfExternalCallFinder.java index c4d2518..32b1582 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultInterfaceOfExternalCallFinder.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultInterfaceOfExternalCallFinder.java @@ -1,10 +1,6 @@ package org.somox.gast2seff.visitors; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.Member; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.Statement; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.repository.Interface; import org.palladiosimulator.pcm.repository.OperationRequiredRole; @@ -15,6 +11,11 @@ import org.somox.sourcecodedecorator.MethodLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.Member; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.Statement; + public class DefaultInterfaceOfExternalCallFinder implements InterfaceOfExternalCallFinding { private static final Logger logger = Logger.getLogger(DefaultInterfaceOfExternalCallFinder.class.getSimpleName()); diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultResourceDemandingBehaviourForClassMethodFinder.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultResourceDemandingBehaviourForClassMethodFinder.java index b247461..69651a3 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultResourceDemandingBehaviourForClassMethodFinder.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/DefaultResourceDemandingBehaviourForClassMethodFinder.java @@ -1,6 +1,5 @@ package org.somox.gast2seff.visitors; -import org.emftext.language.java.members.ClassMethod; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.repository.Signature; import org.palladiosimulator.pcm.seff.ResourceDemandingInternalBehaviour; @@ -10,6 +9,8 @@ import org.somox.sourcecodedecorator.MethodLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.members.ClassMethod; + public class DefaultResourceDemandingBehaviourForClassMethodFinder implements ResourceDemandingBehaviourForClassMethodFinding { diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/FunctionCallClassificationVisitor.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/FunctionCallClassificationVisitor.java index 52f1505..c9a8aae 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/FunctionCallClassificationVisitor.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/FunctionCallClassificationVisitor.java @@ -12,26 +12,27 @@ import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.ComposedSwitch; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.expressions.util.ExpressionsSwitch; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.members.util.MembersSwitch; -import org.emftext.language.java.statements.Assert; -import org.emftext.language.java.statements.Block; -import org.emftext.language.java.statements.CatchBlock; -import org.emftext.language.java.statements.Condition; -import org.emftext.language.java.statements.DoWhileLoop; -import org.emftext.language.java.statements.ExpressionStatement; -import org.emftext.language.java.statements.ForEachLoop; -import org.emftext.language.java.statements.ForLoop; -import org.emftext.language.java.statements.LocalVariableStatement; -import org.emftext.language.java.statements.Statement; -import org.emftext.language.java.statements.StatementListContainer; -import org.emftext.language.java.statements.TryBlock; -import org.emftext.language.java.statements.WhileLoop; -import org.emftext.language.java.statements.util.StatementsSwitch; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.expressions.util.ExpressionsSwitch; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.members.util.MembersSwitch; +import tools.mdsd.jamopp.model.java.statements.Assert; +import tools.mdsd.jamopp.model.java.statements.Block; +import tools.mdsd.jamopp.model.java.statements.CatchBlock; +import tools.mdsd.jamopp.model.java.statements.Condition; +import tools.mdsd.jamopp.model.java.statements.DoWhileLoop; +import tools.mdsd.jamopp.model.java.statements.ExpressionStatement; +import tools.mdsd.jamopp.model.java.statements.ForEachLoop; +import tools.mdsd.jamopp.model.java.statements.ForLoop; +import tools.mdsd.jamopp.model.java.statements.LocalVariableStatement; +import tools.mdsd.jamopp.model.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; +import tools.mdsd.jamopp.model.java.statements.TryBlock; +import tools.mdsd.jamopp.model.java.statements.WhileLoop; +import tools.mdsd.jamopp.model.java.statements.util.StatementsSwitch; + /** * Classifies function calls are internal, library, or external calls. * Transitively assigns that type to outer statements like loops or branches. @@ -139,7 +140,7 @@ public Collection caseCondition(final Condition condition) { } @Override - public Collection caseSwitch(final org.emftext.language.java.statements.Switch switchStatement) { + public Collection caseSwitch(final tools.mdsd.jamopp.model.java.statements.Switch switchStatement) { if (annotations.containsKey(switchStatement)) { return annotations.get(switchStatement); } diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/IFunctionClassificationStrategy.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/IFunctionClassificationStrategy.java index 5254bbd..2f0c4b1 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/IFunctionClassificationStrategy.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/IFunctionClassificationStrategy.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; -import org.emftext.language.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.Statement; /** * Interface for the function call classification strategy. Implementing classes diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/InterfaceOfExternalCallFinding.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/InterfaceOfExternalCallFinding.java index 1fc67ba..b1a2d8b 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/InterfaceOfExternalCallFinding.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/InterfaceOfExternalCallFinding.java @@ -1,10 +1,11 @@ package org.somox.gast2seff.visitors; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.Statement; import org.palladiosimulator.pcm.repository.Role; import org.palladiosimulator.pcm.repository.Signature; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.Statement; + /** * Implementations of the interface are used by {@link JaMoPPStatementVisitor} * to find the called interface port and the interface operation of an external diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/JaMoPPStatementVisitor.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/JaMoPPStatementVisitor.java index b8d1eb3..1d5fe1d 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/JaMoPPStatementVisitor.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/JaMoPPStatementVisitor.java @@ -7,14 +7,6 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.Condition; -import org.emftext.language.java.statements.Statement; -import org.emftext.language.java.statements.Switch; -import org.emftext.language.java.statements.SynchronizedBlock; -import org.emftext.language.java.statements.TryBlock; import org.palladiosimulator.pcm.core.CoreFactory; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.repository.EventType; @@ -44,6 +36,14 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorFactory; import de.uka.ipd.sdq.identifier.Identifier; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.Condition; +import tools.mdsd.jamopp.model.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.Switch; +import tools.mdsd.jamopp.model.java.statements.SynchronizedBlock; +import tools.mdsd.jamopp.model.java.statements.TryBlock; /** * A visitor which traverses a GAST behaviour and creates a SEFF matching the diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/MethodCallFinder.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/MethodCallFinder.java index c59a085..6fc93ba 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/MethodCallFinder.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/MethodCallFinder.java @@ -10,12 +10,13 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; -// import org.emftext.language.java.annotations.AnnotationAttribute; -import org.emftext.language.java.expressions.Expression; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.references.MethodCall; -import org.emftext.language.java.references.Reference; -import org.emftext.language.java.statements.Statement; + +// import tools.mdsd.jamopp.model.java.annotations.AnnotationAttribute; +import tools.mdsd.jamopp.model.java.expressions.Expression; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.references.MethodCall; +import tools.mdsd.jamopp.model.java.references.Reference; +import tools.mdsd.jamopp.model.java.statements.Statement; /** * The class finds methodCalls within a statement. It also caches the found diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/ResourceDemandingBehaviourForClassMethodFinding.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/ResourceDemandingBehaviourForClassMethodFinding.java index 56b92d0..eeba411 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/ResourceDemandingBehaviourForClassMethodFinding.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/ResourceDemandingBehaviourForClassMethodFinding.java @@ -1,9 +1,10 @@ package org.somox.gast2seff.visitors; -import org.emftext.language.java.members.ClassMethod; import org.palladiosimulator.pcm.seff.ResourceDemandingInternalBehaviour; import org.palladiosimulator.pcm.seff.ResourceDemandingSEFF; +import tools.mdsd.jamopp.model.java.members.ClassMethod; + public interface ResourceDemandingBehaviourForClassMethodFinding { ResourceDemandingSEFF getCorrespondingRDSEFForClassMethod(final ClassMethod classMethod); diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/SwitchStatementHelper.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/SwitchStatementHelper.java index eeea382..f19d482 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/SwitchStatementHelper.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/SwitchStatementHelper.java @@ -5,10 +5,11 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.statements.Break; -import org.emftext.language.java.statements.Statement; -import org.emftext.language.java.statements.Switch; -import org.emftext.language.java.statements.SwitchCase; + +import tools.mdsd.jamopp.model.java.statements.Break; +import tools.mdsd.jamopp.model.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.Switch; +import tools.mdsd.jamopp.model.java.statements.SwitchCase; /** * Computes for a {@link SwitchStatement} the case branches in a way that to the diff --git a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/VisitorUtils.java b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/VisitorUtils.java index dfacfa2..992c238 100644 --- a/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/VisitorUtils.java +++ b/bundles/org.somox.gast2seff/src/org/somox/gast2seff/visitors/VisitorUtils.java @@ -1,12 +1,13 @@ package org.somox.gast2seff.visitors; -import org.emftext.language.java.statements.Statement; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.repository.BasicComponent; import org.palladiosimulator.pcm.seff.AbstractAction; import org.palladiosimulator.pcm.seff.ResourceDemandingBehaviour; import org.somox.sourcecodedecorator.SourceCodeDecoratorRepository; +import tools.mdsd.jamopp.model.java.statements.Statement; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; + public class VisitorUtils { // private static final Logger logger = diff --git a/bundles/org.somox.kdmhelper/META-INF/MANIFEST.MF b/bundles/org.somox.kdmhelper/META-INF/MANIFEST.MF index b8547ec..599e075 100644 --- a/bundles/org.somox.kdmhelper/META-INF/MANIFEST.MF +++ b/bundles/org.somox.kdmhelper/META-INF/MANIFEST.MF @@ -9,18 +9,18 @@ Require-Bundle: org.apache.log4j, org.eclipse.emf.common, org.eclipse.emf.ecore, org.eclipse.jdt.core, - org.emftext.language.java, org.eclipse.core.resources, org.eclipse.equinox.registry, - jamopp.resource, org.eclipse.osgi, - org.apache.commons.io + org.apache.commons.io, + tools.mdsd.jamopp.model.java, + tools.mdsd.jamopp.resource, + tools.mdsd.jamopp.parser Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.somox.kdmhelper, org.somox.kdmhelper.metamodeladdition, org.splevo.jamopp.extraction -Import-Package: jamopp.parser.jdt, - org.eclipse.emf.ecore.xmi, +Import-Package: org.eclipse.emf.ecore.xmi, org.eclipse.emf.ecore.xmi.impl Automatic-Module-Name: org.somox.kdmhelper diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/EqualityChecker.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/EqualityChecker.java index 083239e..0d64b56 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/EqualityChecker.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/EqualityChecker.java @@ -1,14 +1,12 @@ package org.somox.kdmhelper; -import org.emftext.language.java.commons.NamedElement; -import org.emftext.language.java.members.Constructor; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.parameters.Parametrizable; -import org.emftext.language.java.types.PrimitiveType; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.types.TypeReference; - -//import de.fzi.gast.functions.Function; +import tools.mdsd.jamopp.model.java.commons.NamedElement; +import tools.mdsd.jamopp.model.java.members.Constructor; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.parameters.Parametrizable; +import tools.mdsd.jamopp.model.java.types.PrimitiveType; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; /** * Helper class diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/GetAccessedType.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/GetAccessedType.java index 37c8d80..926f74c 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/GetAccessedType.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/GetAccessedType.java @@ -1,13 +1,13 @@ package org.somox.kdmhelper; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.references.IdentifierReference; -import org.emftext.language.java.references.MethodCall; -import org.emftext.language.java.references.ReferenceableElement; -import org.emftext.language.java.types.PrimitiveType; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.types.TypeReference; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.references.IdentifierReference; +import tools.mdsd.jamopp.model.java.references.MethodCall; +import tools.mdsd.jamopp.model.java.references.ReferenceableElement; +import tools.mdsd.jamopp.model.java.types.PrimitiveType; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; public class GetAccessedType { diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMHelper.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMHelper.java index 53db6a5..8ab1d14 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMHelper.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMHelper.java @@ -16,37 +16,36 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.BodyDeclaration; -import org.emftext.language.java.classifiers.Class; -import org.emftext.language.java.classifiers.Classifier; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.classifiers.Interface; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.commons.NamedElement; -import org.emftext.language.java.containers.CompilationUnit; -import org.emftext.language.java.containers.Package; -import org.emftext.language.java.generics.TypeArgument; -import org.emftext.language.java.members.Constructor; -import org.emftext.language.java.members.Member; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.modifiers.AnnotableAndModifiable; -import org.emftext.language.java.modifiers.Final; -import org.emftext.language.java.modifiers.Modifier; -import org.emftext.language.java.modifiers.ModifiersFactory; -import org.emftext.language.java.modifiers.Private; -import org.emftext.language.java.modifiers.Static; -import org.emftext.language.java.parameters.Parameter; -import org.emftext.language.java.parameters.VariableLengthParameter; -import org.emftext.language.java.references.IdentifierReference; -import org.emftext.language.java.references.MethodCall; -import org.emftext.language.java.references.ReferenceableElement; -import org.emftext.language.java.statements.StatementListContainer; -import org.emftext.language.java.statements.StatementsFactory; -import org.emftext.language.java.types.ClassifierReference; -import org.emftext.language.java.types.PrimitiveType; -import org.emftext.language.java.types.Type; -//CompilationUnit statt Model -//Commentable statt AstNode -import org.emftext.language.java.types.TypeReference; + +import tools.mdsd.jamopp.model.java.classifiers.Class; +import tools.mdsd.jamopp.model.java.classifiers.Classifier; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.classifiers.Interface; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.commons.NamedElement; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; +import tools.mdsd.jamopp.model.java.containers.Package; +import tools.mdsd.jamopp.model.java.generics.TypeArgument; +import tools.mdsd.jamopp.model.java.members.Constructor; +import tools.mdsd.jamopp.model.java.members.Member; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable; +import tools.mdsd.jamopp.model.java.modifiers.Final; +import tools.mdsd.jamopp.model.java.modifiers.Modifier; +import tools.mdsd.jamopp.model.java.modifiers.ModifiersFactory; +import tools.mdsd.jamopp.model.java.modifiers.Private; +import tools.mdsd.jamopp.model.java.modifiers.Static; +import tools.mdsd.jamopp.model.java.parameters.Parameter; +import tools.mdsd.jamopp.model.java.parameters.VariableLengthParameter; +import tools.mdsd.jamopp.model.java.references.IdentifierReference; +import tools.mdsd.jamopp.model.java.references.MethodCall; +import tools.mdsd.jamopp.model.java.references.ReferenceableElement; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; +import tools.mdsd.jamopp.model.java.statements.StatementsFactory; +import tools.mdsd.jamopp.model.java.types.ClassifierReference; +import tools.mdsd.jamopp.model.java.types.PrimitiveType; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; /** * This class contains a set of methods that are missing in the MoDisco Java @@ -122,31 +121,31 @@ public static String getName(final Type type) { } public static String getName(final PrimitiveType type) { - if (type instanceof org.emftext.language.java.types.Boolean) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Boolean) { return "bool"; } - if (type instanceof org.emftext.language.java.types.Byte) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Byte) { return "byte"; } - if (type instanceof org.emftext.language.java.types.Char) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Char) { return "char"; } - if (type instanceof org.emftext.language.java.types.Double) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Double) { return "double"; } - if (type instanceof org.emftext.language.java.types.Float) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Float) { return "float"; } - if (type instanceof org.emftext.language.java.types.Int) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Int) { return "int"; } - if (type instanceof org.emftext.language.java.types.Long) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Long) { return "long"; } - if (type instanceof org.emftext.language.java.types.Short) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Short) { return "short"; } - if (type instanceof org.emftext.language.java.types.Void) { + if (type instanceof tools.mdsd.jamopp.model.java.types.Void) { return "void"; } return type.toString(); @@ -555,7 +554,7 @@ public static EList getOwnedPackages(final Package prefixPackage) { return null;// ( (Object) prefixPackage).getSubpackages(); // EList ownedPackages=null; - // org.emftext.language.java.containers.Package p; + // tools.mdsd.jamopp.model.java.containers.Package p; // // for (CompilationUnit comUnit :prefixPackage.getCompilationUnits()) // { diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMReader.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMReader.java index a4ee47e..1a53cb6 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMReader.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/KDMReader.java @@ -18,10 +18,11 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.emftext.language.java.containers.CompilationUnit; import org.somox.kdmhelper.metamodeladdition.Root; import org.splevo.jamopp.extraction.JaMoPPSoftwareModelExtractor; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; + public class KDMReader { private final Root root; diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/SoMoXUtil.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/SoMoXUtil.java index 255ba05..1c063fd 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/SoMoXUtil.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/SoMoXUtil.java @@ -5,11 +5,12 @@ import java.util.Set; import org.eclipse.core.resources.ResourcesPlugin; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.members.ClassMethod; -import org.emftext.language.java.members.InterfaceMethod; -import org.emftext.language.java.members.Method; -import org.emftext.language.java.statements.StatementListContainer; + +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.members.ClassMethod; +import tools.mdsd.jamopp.model.java.members.InterfaceMethod; +import tools.mdsd.jamopp.model.java.members.Method; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; public class SoMoXUtil { diff --git a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/metamodeladdition/Root.java b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/metamodeladdition/Root.java index 2fd8720..ff48609 100644 --- a/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/metamodeladdition/Root.java +++ b/bundles/org.somox.kdmhelper/src/org/somox/kdmhelper/metamodeladdition/Root.java @@ -8,13 +8,14 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.emftext.language.java.classifiers.Class; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.classifiers.Enumeration; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.containers.CompilationUnit; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.classifiers.Class; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.classifiers.Enumeration; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; + public class Root { private final List models = new ArrayList<>(); diff --git a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/JaMoPPSoftwareModelExtractor.java b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/JaMoPPSoftwareModelExtractor.java index 46f664d..06b1633 100644 --- a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/JaMoPPSoftwareModelExtractor.java +++ b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/JaMoPPSoftwareModelExtractor.java @@ -21,15 +21,15 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; -import org.emftext.language.java.JavaClasspath; import org.splevo.jamopp.extraction.FileResourceHandling.ResourceHandlingOptions; import org.splevo.jamopp.extraction.cache.ReferenceCache; import org.splevo.jamopp.extraction.resource.JavaSourceOrClassFileResourceCachingFactoryImpl; import com.google.common.collect.Lists; -import jamopp.parser.jdt.JaMoPPJDTParser; -import jamopp.resource.JavaResource2Factory; +import tools.mdsd.jamopp.model.java.JavaClasspath; +import tools.mdsd.jamopp.parser.JaMoPPJDTParser; +import tools.mdsd.jamopp.resource.JavaResource2Factory; /** * Software Model Extractor for the Java technology based on the Java Model diff --git a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/cache/ReferenceCache.java b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/cache/ReferenceCache.java index b2bf979..44b015a 100755 --- a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/cache/ReferenceCache.java +++ b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/cache/ReferenceCache.java @@ -31,12 +31,13 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.emftext.language.java.JavaClasspath; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import tools.mdsd.jamopp.model.java.JavaClasspath; + /** * A file based cache to reuse the proxy resolutions already performed. * diff --git a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/resource/JavaSourceOrClassFileCachingResource.java b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/resource/JavaSourceOrClassFileCachingResource.java index 1834e20..5213637 100755 --- a/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/resource/JavaSourceOrClassFileCachingResource.java +++ b/bundles/org.somox.kdmhelper/src/org/splevo/jamopp/extraction/resource/JavaSourceOrClassFileCachingResource.java @@ -18,7 +18,7 @@ import com.google.common.base.Strings; -import jamopp.resource.JavaResource2; +import tools.mdsd.jamopp.resource.JavaResource2; /*** * JaMoPP java resource using an internal cache for reference resolving. diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/AbstractMetricDSLUiModule.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/AbstractMetricDSLUiModule.java index 33764ca..711dc00 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/AbstractMetricDSLUiModule.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/AbstractMetricDSLUiModule.java @@ -22,19 +22,22 @@ public com.google.inject.Provider bindIProposalConflictHelper() { return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public void configureHighlightingLexer(final com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class) .annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)) .to(org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLLexer.class); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public void configureHighlightingTokenDefProvider(final com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class) .annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)) @@ -103,74 +106,87 @@ public void configureResourceUIServiceLabelProvider(final com.google.inject.Bind .to(org.somox.metrics.dsl.ui.labeling.MetricDSLDescriptionLabelProvider.class); } - // contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment + // contributed by + // org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment public Class bindIOutlineTreeProvider() { return org.somox.metrics.dsl.ui.outline.MetricDSLOutlineTreeProvider.class; } - // contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment + // contributed by + // org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment public Class bindIOutlineTreeStructureProvider() { return org.somox.metrics.dsl.ui.outline.MetricDSLOutlineTreeProvider.class; } - // contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment + // contributed by + // org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment @Override public Class bindIssueResolutionProvider() { return org.somox.metrics.dsl.ui.quickfix.MetricDSLQuickfixProvider.class; } - // contributed by org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment + // contributed by + // org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment public Class bindIContentProposalProvider() { return org.somox.metrics.dsl.ui.contentassist.MetricDSLProposalProvider.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment public Class bindContentAssistContext$Factory() { return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment public Class bindIContentAssistParser() { return org.somox.metrics.dsl.ui.contentassist.antlr.MetricDSLParser.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment public void configureContentAssistLexerProvider(final com.google.inject.Binder binder) { binder.bind(org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLLexer.class) .toProvider(org.eclipse.xtext.parser.antlr.LexerProvider .create(org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLLexer.class)); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment public void configureContentAssistLexer(final com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class) .annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST)) .to(org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLLexer.class); } - // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment + // contributed by + // org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment public Class bindIRenameStrategy() { return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class; } - // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment + // contributed by + // org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment public Class bindIReferenceUpdater() { return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class; } - // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment + // contributed by + // org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment public void configureIPreferenceStoreInitializer(final com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class) .annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")) .to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class); } - // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment + // contributed by + // org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment public Class bindIRenameRefactoringProvider() { return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class; } - // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment + // contributed by + // org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment public Class bindIRenameSupport$Factory() { return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class; } @@ -230,29 +246,34 @@ public Class provideTemplatesLanguageConfiguration() { return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator .getTemplatesLanguageConfigurationProvider(); } - // contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment + // contributed by + // org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment public com.google.inject.Provider provideLanguageRegistry() { return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry(); } - // contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment + // contributed by + // org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment @org.eclipse.xtext.service.SingletonBinding(eager = true) public Class bindLanguageRegistrar() { return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class; } - // contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment + // contributed by + // org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment public Class bindXtextTemplatePreferencePage() { return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class; } - // contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment + // contributed by + // org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment public Class bindIPartialContentAssistParser() { return org.somox.metrics.dsl.ui.contentassist.antlr.PartialMetricDSLContentAssistParser.class; } diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/MetricDSLExecutableExtensionFactory.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/MetricDSLExecutableExtensionFactory.java index fd7c543..17b7058 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/MetricDSLExecutableExtensionFactory.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/MetricDSLExecutableExtensionFactory.java @@ -10,7 +10,8 @@ import com.google.inject.Injector; /** - * This class was generated. Customizations should only happen in a newly introduced subclass. + * This class was generated. Customizations should only happen in a newly + * introduced subclass. */ public class MetricDSLExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory { diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/AbstractMetricDSLProposalProvider.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/AbstractMetricDSLProposalProvider.java index 390f698..6b5f9e0 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/AbstractMetricDSLProposalProvider.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/AbstractMetricDSLProposalProvider.java @@ -12,9 +12,9 @@ /** * Represents a generated, default implementation of superclass - * {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}. Methods are - * dynamically dispatched on the first parameter, i.e., you can override them with a more concrete - * subtype. + * {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}. + * Methods are dynamically dispatched on the first parameter, i.e., you can + * override them with a more concrete subtype. */ @SuppressWarnings("all") public class AbstractMetricDSLProposalProvider @@ -22,77 +22,77 @@ public class AbstractMetricDSLProposalProvider public void completeMetricModel_ImportURI(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeMetricModel_Metrics(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeExternalMetric_Name(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeInternalMetric_Name(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeInternalMetric_ShortName(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeInternalMetric_Description(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeInternalMetric_Parameter(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeInternalMetric_Definition(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeParameter_Name(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeParameter_Shortname(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeParameter_Description(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeParameter_DefaultValue(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeConstant_Name(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeConstant_Value(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeWeightedMetric_Weights(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeStepwiseMetric_InnerMetric(final EObject model, final Assignment assignment, @@ -102,7 +102,7 @@ public void completeStepwiseMetric_InnerMetric(final EObject model, final Assign public void completeStepwiseMetric_Steps(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { - this.completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor); } public void completeRatioMetric_NominatorMetric(final EObject model, final Assignment assignment, diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/MetricDSLParser.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/MetricDSLParser.java index 3d28888..6caecc6 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/MetricDSLParser.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/MetricDSLParser.java @@ -27,103 +27,84 @@ public class MetricDSLParser extends AbstractContentAssistParser { protected org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLParser createParser() { final org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLParser result = new org.somox.metrics.dsl.ui.contentassist.antlr.internal.InternalMetricDSLParser( null); - result.setGrammarAccess(this.grammarAccess); + result.setGrammarAccess(grammarAccess); return result; } @Override protected String getRuleName(final AbstractElement element) { - if (this.nameMappings == null) { - this.nameMappings = new HashMap() { + if (nameMappings == null) { + nameMappings = new HashMap<>() { private static final long serialVersionUID = 1L; { - this.put(MetricDSLParser.this.grammarAccess.getMetricAccess().getAlternatives(), - "rule__Metric__Alternatives"); - this.put(MetricDSLParser.this.grammarAccess.getNumberAccess().getAlternatives(), - "rule__Number__Alternatives"); - this.put(MetricDSLParser.this.grammarAccess.getMetricDefinitionAccess().getAlternatives(), + put(grammarAccess.getMetricAccess().getAlternatives(), "rule__Metric__Alternatives"); + put(grammarAccess.getNumberAccess().getAlternatives(), "rule__Number__Alternatives"); + put(grammarAccess.getMetricDefinitionAccess().getAlternatives(), "rule__MetricDefinition__Alternatives"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getGroup(), - "rule__MetricModel__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getGroup_0(), - "rule__MetricModel__Group_0__0"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getGroup_1(), - "rule__MetricModel__Group_1__0"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getGroup(), - "rule__InternalMetric__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getGroup_8(), - "rule__InternalMetric__Group_8__0"); - this.put(MetricDSLParser.this.grammarAccess.getParameterAccess().getGroup(), - "rule__Parameter__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getConstantAccess().getGroup(), - "rule__Constant__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getWeightedMetricAccess().getGroup(), - "rule__WeightedMetric__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getStepwiseMetricAccess().getGroup(), - "rule__StepwiseMetric__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getRatioMetricAccess().getGroup(), - "rule__RatioMetric__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getBoundAndWeightAccess().getGroup(), - "rule__BoundAndWeight__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getMetricAndWeightAccess().getGroup(), - "rule__MetricAndWeight__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getMYIDAccess().getGroup(), "rule__MYID__Group__0"); - this.put(MetricDSLParser.this.grammarAccess.getMYIDAccess().getGroup_1(), "rule__MYID__Group_1__0"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1(), + put(grammarAccess.getMetricModelAccess().getGroup(), "rule__MetricModel__Group__0"); + put(grammarAccess.getMetricModelAccess().getGroup_0(), "rule__MetricModel__Group_0__0"); + put(grammarAccess.getMetricModelAccess().getGroup_1(), "rule__MetricModel__Group_1__0"); + put(grammarAccess.getInternalMetricAccess().getGroup(), "rule__InternalMetric__Group__0"); + put(grammarAccess.getInternalMetricAccess().getGroup_8(), "rule__InternalMetric__Group_8__0"); + put(grammarAccess.getParameterAccess().getGroup(), "rule__Parameter__Group__0"); + put(grammarAccess.getConstantAccess().getGroup(), "rule__Constant__Group__0"); + put(grammarAccess.getWeightedMetricAccess().getGroup(), "rule__WeightedMetric__Group__0"); + put(grammarAccess.getStepwiseMetricAccess().getGroup(), "rule__StepwiseMetric__Group__0"); + put(grammarAccess.getRatioMetricAccess().getGroup(), "rule__RatioMetric__Group__0"); + put(grammarAccess.getBoundAndWeightAccess().getGroup(), "rule__BoundAndWeight__Group__0"); + put(grammarAccess.getMetricAndWeightAccess().getGroup(), "rule__MetricAndWeight__Group__0"); + put(grammarAccess.getMYIDAccess().getGroup(), "rule__MYID__Group__0"); + put(grammarAccess.getMYIDAccess().getGroup_1(), "rule__MYID__Group_1__0"); + put(grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1(), "rule__MetricModel__ImportURIAssignment_0_1"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1(), + put(grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1(), "rule__MetricModel__MetricsAssignment_1_1"); - this.put(MetricDSLParser.this.grammarAccess.getMetricModelAccess().getMetricsAssignment_4(), + put(grammarAccess.getMetricModelAccess().getMetricsAssignment_4(), "rule__MetricModel__MetricsAssignment_4"); - this.put(MetricDSLParser.this.grammarAccess.getExternalMetricAccess().getNameAssignment(), + put(grammarAccess.getExternalMetricAccess().getNameAssignment(), "rule__ExternalMetric__NameAssignment"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getNameAssignment_1(), + put(grammarAccess.getInternalMetricAccess().getNameAssignment_1(), "rule__InternalMetric__NameAssignment_1"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getShortNameAssignment_3(), + put(grammarAccess.getInternalMetricAccess().getShortNameAssignment_3(), "rule__InternalMetric__ShortNameAssignment_3"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5(), + put(grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5(), "rule__InternalMetric__DescriptionAssignment_5"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2(), + put(grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2(), "rule__InternalMetric__ParameterAssignment_8_2"); - this.put(MetricDSLParser.this.grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9(), + put(grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9(), "rule__InternalMetric__DefinitionAssignment_9"); - this.put(MetricDSLParser.this.grammarAccess.getParameterAccess().getNameAssignment_1(), - "rule__Parameter__NameAssignment_1"); - this.put(MetricDSLParser.this.grammarAccess.getParameterAccess().getShortnameAssignment_3(), + put(grammarAccess.getParameterAccess().getNameAssignment_1(), "rule__Parameter__NameAssignment_1"); + put(grammarAccess.getParameterAccess().getShortnameAssignment_3(), "rule__Parameter__ShortnameAssignment_3"); - this.put(MetricDSLParser.this.grammarAccess.getParameterAccess().getDescriptionAssignment_5(), + put(grammarAccess.getParameterAccess().getDescriptionAssignment_5(), "rule__Parameter__DescriptionAssignment_5"); - this.put(MetricDSLParser.this.grammarAccess.getParameterAccess().getDefaultValueAssignment_7(), + put(grammarAccess.getParameterAccess().getDefaultValueAssignment_7(), "rule__Parameter__DefaultValueAssignment_7"); - this.put(MetricDSLParser.this.grammarAccess.getConstantAccess().getNameAssignment_1(), - "rule__Constant__NameAssignment_1"); - this.put(MetricDSLParser.this.grammarAccess.getConstantAccess().getValueAssignment_3(), - "rule__Constant__ValueAssignment_3"); - this.put(MetricDSLParser.this.grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2(), + put(grammarAccess.getConstantAccess().getNameAssignment_1(), "rule__Constant__NameAssignment_1"); + put(grammarAccess.getConstantAccess().getValueAssignment_3(), "rule__Constant__ValueAssignment_3"); + put(grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2(), "rule__WeightedMetric__WeightsAssignment_2"); - this.put(MetricDSLParser.this.grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2(), + put(grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2(), "rule__StepwiseMetric__InnerMetricAssignment_2"); - this.put(MetricDSLParser.this.grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5(), + put(grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5(), "rule__StepwiseMetric__StepsAssignment_5"); - this.put(MetricDSLParser.this.grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2(), + put(grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2(), "rule__RatioMetric__NominatorMetricAssignment_2"); - this.put( - MetricDSLParser.this.grammarAccess.getRatioMetricAccess() - .getDenominatorMetricAssignment_4(), + put(grammarAccess.getRatioMetricAccess().getDenominatorMetricAssignment_4(), "rule__RatioMetric__DenominatorMetricAssignment_4"); - this.put(MetricDSLParser.this.grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1(), + put(grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1(), "rule__BoundAndWeight__UpperBoundAssignment_1"); - this.put(MetricDSLParser.this.grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3(), + put(grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3(), "rule__BoundAndWeight__WeightAssignment_3"); - this.put(MetricDSLParser.this.grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1(), + put(grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1(), "rule__MetricAndWeight__MetricAssignment_1"); - this.put(MetricDSLParser.this.grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3(), + put(grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3(), "rule__MetricAndWeight__WeightAssignment_3"); } }; } - return this.nameMappings.get(element); + return nameMappings.get(element); } @Override @@ -143,7 +124,7 @@ protected String[] getInitialHiddenTokens() { } public MetricDSLGrammarAccess getGrammarAccess() { - return this.grammarAccess; + return grammarAccess; } public void setGrammarAccess(final MetricDSLGrammarAccess grammarAccess) { diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/PartialMetricDSLContentAssistParser.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/PartialMetricDSLContentAssistParser.java index b7fca7f..1119b47 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/PartialMetricDSLContentAssistParser.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/PartialMetricDSLContentAssistParser.java @@ -27,12 +27,12 @@ public void initializeFor(final AbstractRule rule) { @Override protected Collection getFollowElements(final AbstractInternalContentAssistParser parser) { - if (this.rule == null || this.rule.eIsProxy()) { + if ((rule == null) || rule.eIsProxy()) { return Collections.emptyList(); } - final String methodName = "entryRule" + this.rule.getName(); - final PolymorphicDispatcher> dispatcher = new PolymorphicDispatcher>( - methodName, 0, 0, Collections.singletonList(parser)); + final String methodName = "entryRule" + rule.getName(); + final PolymorphicDispatcher> dispatcher = new PolymorphicDispatcher<>(methodName, 0, + 0, Collections.singletonList(parser)); dispatcher.invoke(); return parser.getFollowElements(); } diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLLexer.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLLexer.java index c33e3c1..0b92990 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLLexer.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLLexer.java @@ -53,7 +53,7 @@ public class InternalMetricDSLLexer extends Lexer { // delegators public InternalMetricDSLLexer() { - ; + } public InternalMetricDSLLexer(final CharStream input) { @@ -84,8 +84,8 @@ public final void mT__12() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -105,8 +105,8 @@ public final void mT__13() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -126,8 +126,8 @@ public final void mT__14() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -147,8 +147,8 @@ public final void mT__15() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -168,8 +168,8 @@ public final void mT__16() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -189,8 +189,8 @@ public final void mT__17() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -210,8 +210,8 @@ public final void mT__18() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -231,8 +231,8 @@ public final void mT__19() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -252,8 +252,8 @@ public final void mT__20() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -273,8 +273,8 @@ public final void mT__21() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -294,8 +294,8 @@ public final void mT__22() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -315,8 +315,8 @@ public final void mT__23() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -336,8 +336,8 @@ public final void mT__24() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -357,8 +357,8 @@ public final void mT__25() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -378,8 +378,8 @@ public final void mT__26() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -399,8 +399,8 @@ public final void mT__27() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -420,8 +420,8 @@ public final void mT__28() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -441,8 +441,8 @@ public final void mT__29() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -462,8 +462,8 @@ public final void mT__30() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -483,8 +483,8 @@ public final void mT__31() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -504,8 +504,8 @@ public final void mT__32() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -525,8 +525,8 @@ public final void mT__33() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -546,8 +546,8 @@ public final void mT__34() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -567,8 +567,8 @@ public final void mT__35() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -587,7 +587,7 @@ public final void mRULE_DOUBLE() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3220:15: // ( '-' )? int alt1 = 2; - final int LA1_0 = this.input.LA(1); + final int LA1_0 = input.LA(1); if ((LA1_0 == '-')) { alt1 = 1; @@ -604,14 +604,14 @@ public final void mRULE_DOUBLE() throws RecognitionException { } - this.mRULE_INT(); + mRULE_INT(); this.match('.'); - this.mRULE_INT(); + mRULE_INT(); } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -623,16 +623,18 @@ public final void mRULE_ID() throws RecognitionException { final int _type = RULE_ID; final int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3222:9: - // ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. + // ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' + // | '0' .. // '9' )* ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3222:11: - // ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. + // ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | + // '0' .. // '9' )* { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3222:11: // ( '^' )? int alt2 = 2; - final int LA2_0 = this.input.LA(1); + final int LA2_0 = input.LA(1); if ((LA2_0 == '^')) { alt2 = 1; @@ -649,24 +651,22 @@ public final void mRULE_ID() throws RecognitionException { } - if ((this.input.LA(1) >= 'A' && this.input.LA(1) <= 'Z') || this.input.LA(1) == '_' - || (this.input.LA(1) >= 'a' && this.input.LA(1) <= 'z')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < 'A') || (input.LA(1) > 'Z')) && (input.LA(1) != '_') + && ((input.LA(1) < 'a') || (input.LA(1) > 'z'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3222:40: // ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop3: do { int alt3 = 2; - final int LA3_0 = this.input.LA(1); + final int LA3_0 = input.LA(1); - if (((LA3_0 >= '0' && LA3_0 <= '9') || (LA3_0 >= 'A' && LA3_0 <= 'Z') || LA3_0 == '_' - || (LA3_0 >= 'a' && LA3_0 <= 'z'))) { + if ((((LA3_0 >= '0') && (LA3_0 <= '9')) || ((LA3_0 >= 'A') && (LA3_0 <= 'Z')) || (LA3_0 == '_') + || ((LA3_0 >= 'a') && (LA3_0 <= 'z')))) { alt3 = 1; } @@ -674,16 +674,13 @@ public final void mRULE_ID() throws RecognitionException { case 1: // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g: { - if ((this.input.LA(1) >= '0' && this.input.LA(1) <= '9') - || (this.input.LA(1) >= 'A' && this.input.LA(1) <= 'Z') || this.input.LA(1) == '_' - || (this.input.LA(1) >= 'a' && this.input.LA(1) <= 'z')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '0') || (input.LA(1) > '9')) && ((input.LA(1) < 'A') || (input.LA(1) > 'Z')) + && (input.LA(1) != '_') && ((input.LA(1) < 'a') || (input.LA(1) > 'z'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -695,8 +692,8 @@ public final void mRULE_ID() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -717,9 +714,9 @@ public final void mRULE_INT() throws RecognitionException { int cnt4 = 0; loop4: do { int alt4 = 2; - final int LA4_0 = this.input.LA(1); + final int LA4_0 = input.LA(1); - if (((LA4_0 >= '0' && LA4_0 <= '9'))) { + if ((((LA4_0 >= '0') && (LA4_0 <= '9')))) { alt4 = 1; } @@ -728,7 +725,7 @@ public final void mRULE_INT() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3224:13: // '0' .. '9' { - this.matchRange('0', '9'); + matchRange('0', '9'); } break; @@ -737,7 +734,7 @@ public final void mRULE_INT() throws RecognitionException { if (cnt4 >= 1) { break loop4; } - final EarlyExitException eee = new EarlyExitException(4, this.input); + final EarlyExitException eee = new EarlyExitException(4, input); throw eee; } cnt4++; @@ -745,8 +742,8 @@ public final void mRULE_INT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -758,34 +755,41 @@ public final void mRULE_STRING() throws RecognitionException { final int _type = RULE_STRING; final int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:13: - // ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( - // ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | + // ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' + // ) | ~ ( + // ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // 'u' | // '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:15: - // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( - // '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' + // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ ( ( + // '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // 'u' | '\"' // | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:15: - // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ - // ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ + // ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' + // | // 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt7 = 2; - final int LA7_0 = this.input.LA(1); + final int LA7_0 = input.LA(1); if ((LA7_0 == '\"')) { alt7 = 1; } else if ((LA7_0 == '\'')) { alt7 = 2; } else { - final NoViableAltException nvae = new NoViableAltException("", 7, 0, this.input); + final NoViableAltException nvae = new NoViableAltException("", 7, 0, input); throw nvae; } switch (alt7) { case 1: // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:16: - // '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( + // '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | + // ~ ( // ( '\\\\' | '\"' ) ) )* '\"' { this.match('\"'); @@ -794,12 +798,12 @@ public final void mRULE_STRING() throws RecognitionException { // ( '\\\\' | '\"' ) ) )* loop5: do { int alt5 = 3; - final int LA5_0 = this.input.LA(1); + final int LA5_0 = input.LA(1); if ((LA5_0 == '\\')) { alt5 = 1; - } else if (((LA5_0 >= '\u0000' && LA5_0 <= '!') || (LA5_0 >= '#' && LA5_0 <= '[') - || (LA5_0 >= ']' && LA5_0 <= '\uFFFF'))) { + } else if ((((LA5_0 >= '\u0000') && (LA5_0 <= '!')) || ((LA5_0 >= '#') && (LA5_0 <= '[')) + || ((LA5_0 >= ']') && (LA5_0 <= '\uFFFF')))) { alt5 = 2; } @@ -809,17 +813,14 @@ public final void mRULE_STRING() throws RecognitionException { // '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { this.match('\\'); - if (this.input.LA(1) == '\"' || this.input.LA(1) == '\'' || this.input.LA(1) == '\\' - || this.input.LA(1) == 'b' || this.input.LA(1) == 'f' || this.input.LA(1) == 'n' - || this.input.LA(1) == 'r' - || (this.input.LA(1) >= 't' && this.input.LA(1) <= 'u')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if ((input.LA(1) != '\"') && (input.LA(1) != '\'') && (input.LA(1) != '\\') + && (input.LA(1) != 'b') && (input.LA(1) != 'f') && (input.LA(1) != 'n') + && (input.LA(1) != 'r') && ((input.LA(1) < 't') || (input.LA(1) > 'u'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -827,16 +828,14 @@ public final void mRULE_STRING() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:66: // ~ ( ( '\\\\' | '\"' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '!') - || (this.input.LA(1) >= '#' && this.input.LA(1) <= '[') - || (this.input.LA(1) >= ']' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '!')) + && ((input.LA(1) < '#') || (input.LA(1) > '[')) + && ((input.LA(1) < ']') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -852,7 +851,8 @@ public final void mRULE_STRING() throws RecognitionException { break; case 2: // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:86: - // '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ + // '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ // ( ( '\\\\' | '\\'' ) ) )* '\\'' { this.match('\''); @@ -861,12 +861,12 @@ public final void mRULE_STRING() throws RecognitionException { // ( '\\\\' | '\\'' ) ) )* loop6: do { int alt6 = 3; - final int LA6_0 = this.input.LA(1); + final int LA6_0 = input.LA(1); if ((LA6_0 == '\\')) { alt6 = 1; - } else if (((LA6_0 >= '\u0000' && LA6_0 <= '&') || (LA6_0 >= '(' && LA6_0 <= '[') - || (LA6_0 >= ']' && LA6_0 <= '\uFFFF'))) { + } else if ((((LA6_0 >= '\u0000') && (LA6_0 <= '&')) || ((LA6_0 >= '(') && (LA6_0 <= '[')) + || ((LA6_0 >= ']') && (LA6_0 <= '\uFFFF')))) { alt6 = 2; } @@ -876,17 +876,14 @@ public final void mRULE_STRING() throws RecognitionException { // '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { this.match('\\'); - if (this.input.LA(1) == '\"' || this.input.LA(1) == '\'' || this.input.LA(1) == '\\' - || this.input.LA(1) == 'b' || this.input.LA(1) == 'f' || this.input.LA(1) == 'n' - || this.input.LA(1) == 'r' - || (this.input.LA(1) >= 't' && this.input.LA(1) <= 'u')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if ((input.LA(1) != '\"') && (input.LA(1) != '\'') && (input.LA(1) != '\\') + && (input.LA(1) != 'b') && (input.LA(1) != 'f') && (input.LA(1) != 'n') + && (input.LA(1) != 'r') && ((input.LA(1) < 't') || (input.LA(1) > 'u'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -894,16 +891,14 @@ public final void mRULE_STRING() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3226:137: // ~ ( ( '\\\\' | '\\'' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '&') - || (this.input.LA(1) >= '(' && this.input.LA(1) <= '[') - || (this.input.LA(1) >= ']' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '&')) + && ((input.LA(1) < '(') || (input.LA(1) > '[')) + && ((input.LA(1) < ']') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -922,8 +917,8 @@ public final void mRULE_STRING() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -945,18 +940,19 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { // ( options {greedy=false; } : . )* loop8: do { int alt8 = 2; - final int LA8_0 = this.input.LA(1); + final int LA8_0 = input.LA(1); if ((LA8_0 == '*')) { - final int LA8_1 = this.input.LA(2); + final int LA8_1 = input.LA(2); if ((LA8_1 == '/')) { alt8 = 2; - } else if (((LA8_1 >= '\u0000' && LA8_1 <= '.') || (LA8_1 >= '0' && LA8_1 <= '\uFFFF'))) { + } else if ((((LA8_1 >= '\u0000') && (LA8_1 <= '.')) + || ((LA8_1 >= '0') && (LA8_1 <= '\uFFFF')))) { alt8 = 1; } - } else if (((LA8_0 >= '\u0000' && LA8_0 <= ')') || (LA8_0 >= '+' && LA8_0 <= '\uFFFF'))) { + } else if ((((LA8_0 >= '\u0000') && (LA8_0 <= ')')) || ((LA8_0 >= '+') && (LA8_0 <= '\uFFFF')))) { alt8 = 1; } @@ -979,8 +975,8 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1002,10 +998,10 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // (~ ( ( '\\n' | '\\r' ) ) )* loop9: do { int alt9 = 2; - final int LA9_0 = this.input.LA(1); + final int LA9_0 = input.LA(1); - if (((LA9_0 >= '\u0000' && LA9_0 <= '\t') || (LA9_0 >= '\u000B' && LA9_0 <= '\f') - || (LA9_0 >= '\u000E' && LA9_0 <= '\uFFFF'))) { + if ((((LA9_0 >= '\u0000') && (LA9_0 <= '\t')) || ((LA9_0 >= '\u000B') && (LA9_0 <= '\f')) + || ((LA9_0 >= '\u000E') && (LA9_0 <= '\uFFFF')))) { alt9 = 1; } @@ -1014,16 +1010,14 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3230:24: // ~ ( ( '\\n' | '\\r' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '\t') - || (this.input.LA(1) >= '\u000B' && this.input.LA(1) <= '\f') - || (this.input.LA(1) >= '\u000E' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '\t')) + && ((input.LA(1) < '\u000B') || (input.LA(1) > '\f')) + && ((input.LA(1) < '\u000E') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -1036,9 +1030,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3230:40: // ( ( '\\r' )? '\\n' )? int alt11 = 2; - final int LA11_0 = this.input.LA(1); + final int LA11_0 = input.LA(1); - if ((LA11_0 == '\n' || LA11_0 == '\r')) { + if (((LA11_0 == '\n') || (LA11_0 == '\r'))) { alt11 = 1; } switch (alt11) { @@ -1049,7 +1043,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3230:41: // ( '\\r' )? int alt10 = 2; - final int LA10_0 = this.input.LA(1); + final int LA10_0 = input.LA(1); if ((LA10_0 == '\r')) { alt10 = 1; @@ -1075,8 +1069,8 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1097,9 +1091,9 @@ public final void mRULE_WS() throws RecognitionException { int cnt12 = 0; loop12: do { int alt12 = 2; - final int LA12_0 = this.input.LA(1); + final int LA12_0 = input.LA(1); - if (((LA12_0 >= '\t' && LA12_0 <= '\n') || LA12_0 == '\r' || LA12_0 == ' ')) { + if ((((LA12_0 >= '\t') && (LA12_0 <= '\n')) || (LA12_0 == '\r') || (LA12_0 == ' '))) { alt12 = 1; } @@ -1107,15 +1101,13 @@ public final void mRULE_WS() throws RecognitionException { case 1: // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g: { - if ((this.input.LA(1) >= '\t' && this.input.LA(1) <= '\n') || this.input.LA(1) == '\r' - || this.input.LA(1) == ' ') { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\t') || (input.LA(1) > '\n')) && (input.LA(1) != '\r') + && (input.LA(1) != ' ')) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -1124,7 +1116,7 @@ public final void mRULE_WS() throws RecognitionException { if (cnt12 >= 1) { break loop12; } - final EarlyExitException eee = new EarlyExitException(12, this.input); + final EarlyExitException eee = new EarlyExitException(12, input); throw eee; } cnt12++; @@ -1132,8 +1124,8 @@ public final void mRULE_WS() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1153,8 +1145,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1162,19 +1154,13 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { @Override public void mTokens() throws RecognitionException { - // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:8: - // ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | - // T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | - // T__34 | T__35 | RULE_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | - // RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt13 = 32; - alt13 = this.dfa13.predict(this.input); + final int alt13 = dfa13.predict(input); switch (alt13) { case 1: // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:10: // T__12 { - this.mT__12(); + mT__12(); } break; @@ -1182,7 +1168,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:16: // T__13 { - this.mT__13(); + mT__13(); } break; @@ -1190,7 +1176,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:22: // T__14 { - this.mT__14(); + mT__14(); } break; @@ -1198,7 +1184,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:28: // T__15 { - this.mT__15(); + mT__15(); } break; @@ -1206,7 +1192,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:34: // T__16 { - this.mT__16(); + mT__16(); } break; @@ -1214,7 +1200,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:40: // T__17 { - this.mT__17(); + mT__17(); } break; @@ -1222,7 +1208,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:46: // T__18 { - this.mT__18(); + mT__18(); } break; @@ -1230,7 +1216,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:52: // T__19 { - this.mT__19(); + mT__19(); } break; @@ -1238,7 +1224,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:58: // T__20 { - this.mT__20(); + mT__20(); } break; @@ -1246,7 +1232,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:64: // T__21 { - this.mT__21(); + mT__21(); } break; @@ -1254,7 +1240,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:70: // T__22 { - this.mT__22(); + mT__22(); } break; @@ -1262,7 +1248,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:76: // T__23 { - this.mT__23(); + mT__23(); } break; @@ -1270,7 +1256,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:82: // T__24 { - this.mT__24(); + mT__24(); } break; @@ -1278,7 +1264,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:88: // T__25 { - this.mT__25(); + mT__25(); } break; @@ -1286,7 +1272,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:94: // T__26 { - this.mT__26(); + mT__26(); } break; @@ -1294,7 +1280,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:100: // T__27 { - this.mT__27(); + mT__27(); } break; @@ -1302,7 +1288,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:106: // T__28 { - this.mT__28(); + mT__28(); } break; @@ -1310,7 +1296,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:112: // T__29 { - this.mT__29(); + mT__29(); } break; @@ -1318,7 +1304,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:118: // T__30 { - this.mT__30(); + mT__30(); } break; @@ -1326,7 +1312,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:124: // T__31 { - this.mT__31(); + mT__31(); } break; @@ -1334,7 +1320,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:130: // T__32 { - this.mT__32(); + mT__32(); } break; @@ -1342,7 +1328,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:136: // T__33 { - this.mT__33(); + mT__33(); } break; @@ -1350,7 +1336,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:142: // T__34 { - this.mT__34(); + mT__34(); } break; @@ -1358,7 +1344,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:148: // T__35 { - this.mT__35(); + mT__35(); } break; @@ -1366,7 +1352,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:154: // RULE_DOUBLE { - this.mRULE_DOUBLE(); + mRULE_DOUBLE(); } break; @@ -1374,7 +1360,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:166: // RULE_ID { - this.mRULE_ID(); + mRULE_ID(); } break; @@ -1382,7 +1368,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:174: // RULE_INT { - this.mRULE_INT(); + mRULE_INT(); } break; @@ -1390,7 +1376,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:183: // RULE_STRING { - this.mRULE_STRING(); + mRULE_STRING(); } break; @@ -1398,7 +1384,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:195: // RULE_ML_COMMENT { - this.mRULE_ML_COMMENT(); + mRULE_ML_COMMENT(); } break; @@ -1406,7 +1392,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:211: // RULE_SL_COMMENT { - this.mRULE_SL_COMMENT(); + mRULE_SL_COMMENT(); } break; @@ -1414,7 +1400,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:227: // RULE_WS { - this.mRULE_WS(); + mRULE_WS(); } break; @@ -1422,7 +1408,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1:235: // RULE_ANY_OTHER { - this.mRULE_ANY_OTHER(); + mRULE_ANY_OTHER(); } break; @@ -1432,35 +1418,43 @@ public void mTokens() throws RecognitionException { } protected DFA13 dfa13 = new DFA13(this); - static final String DFA13_eotS = "\1\uffff\1\40\1\uffff\1\43\1\40\1\uffff\1\40\3\uffff\3\40\1\uffff" - + "\2\40\2\uffff\1\40\1\65\3\uffff\1\36\1\72\1\36\1\uffff\2\36\2\uffff" - + "\1\40\4\uffff\1\40\1\uffff\1\40\3\uffff\3\40\1\uffff\2\40\2\uffff" - + "\1\40\10\uffff\1\72\2\uffff\27\40\1\136\2\40\1\141\1\143\1\144\1" - + "\145\2\40\1\uffff\2\40\1\uffff\1\152\3\uffff\4\40\1\uffff\3\40\1" - + "\162\1\40\1\164\1\40\1\uffff\1\166\1\uffff\1\40\1\uffff\1\170\1" + "\uffff"; + static final String DFA13_eotS = """ + \1\uffff\1\40\1\uffff\1\43\1\40\1\uffff\1\40\3\uffff\3\40\1\uffff\ + \2\40\2\uffff\1\40\1\65\3\uffff\1\36\1\72\1\36\1\uffff\2\36\2\uffff\ + \1\40\4\uffff\1\40\1\uffff\1\40\3\uffff\3\40\1\uffff\2\40\2\uffff\ + \1\40\10\uffff\1\72\2\uffff\27\40\1\136\2\40\1\141\1\143\1\144\1\ + \145\2\40\1\uffff\2\40\1\uffff\1\152\3\uffff\4\40\1\uffff\3\40\1\ + \162\1\40\1\164\1\40\1\uffff\1\166\1\uffff\1\40\1\uffff\1\170\1\ + \uffff"""; static final String DFA13_eofS = "\171\uffff"; - static final String DFA13_minS = "\1\0\1\145\1\uffff\1\73\1\155\1\uffff\1\170\3\uffff\2\141\1\157" - + "\1\uffff\1\145\1\164\2\uffff\1\141\1\52\3\uffff\1\60\1\56\1\101" - + "\1\uffff\2\0\2\uffff\1\164\4\uffff\1\160\1\uffff\1\164\3\uffff\2" - + "\162\1\156\1\uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\56\2\uffff" - + "\1\162\1\157\1\145\2\141\1\163\1\147\1\160\2\151\2\162\2\155\2\164" - + "\1\167\1\157\1\143\1\164\1\156\2\145\1\60\1\150\1\151\4\60\2\164" - + "\1\uffff\1\145\1\163\1\uffff\1\60\3\uffff\2\145\1\144\1\145\1\uffff" - + "\2\162\1\123\1\60\1\163\1\60\1\165\1\uffff\1\60\1\uffff\1\155\1" + "\uffff\1\60\1\uffff"; - static final String DFA13_maxS = "\1\uffff\1\145\1\uffff\1\73\1\155\1\uffff\1\170\3\uffff\2\141\1" - + "\157\1\uffff\1\145\1\164\2\uffff\1\141\1\57\3\uffff\2\71\1\172\1" - + "\uffff\2\uffff\2\uffff\1\164\4\uffff\1\160\1\uffff\1\164\3\uffff" - + "\2\162\1\156\1\uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\71\2\uffff" - + "\1\162\1\157\1\145\2\141\1\163\1\147\1\160\2\151\2\162\2\155\2\164" - + "\1\167\1\157\1\143\1\164\1\156\2\145\1\172\1\150\1\151\4\172\2\164" - + "\1\uffff\1\145\1\163\1\uffff\1\172\3\uffff\2\145\1\144\1\145\1\uffff" - + "\2\162\1\123\1\172\1\163\1\172\1\165\1\uffff\1\172\1\uffff\1\155" + "\1\uffff\1\172\1\uffff"; - static final String DFA13_acceptS = "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\1\11\1\12\3\uffff\1\17\2\uffff" - + "\1\22\1\23\2\uffff\1\26\1\27\1\30\3\uffff\1\32\2\uffff\1\37\1\40" - + "\1\uffff\1\32\1\2\1\13\1\3\1\uffff\1\5\1\uffff\1\10\1\11\1\12\3" - + "\uffff\1\17\2\uffff\1\22\1\23\1\uffff\1\35\1\36\1\25\1\26\1\27\1" - + "\30\1\31\1\33\1\uffff\1\34\1\37\40\uffff\1\16\2\uffff\1\24\1\uffff" - + "\1\7\1\4\1\6\4\uffff\1\1\7\uffff\1\21\1\uffff\1\15\1\uffff\1\14" + "\1\uffff\1\20"; + static final String DFA13_minS = """ + \1\0\1\145\1\uffff\1\73\1\155\1\uffff\1\170\3\uffff\2\141\1\157\ + \1\uffff\1\145\1\164\2\uffff\1\141\1\52\3\uffff\1\60\1\56\1\101\ + \1\uffff\2\0\2\uffff\1\164\4\uffff\1\160\1\uffff\1\164\3\uffff\2\ + \162\1\156\1\uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\56\2\uffff\ + \1\162\1\157\1\145\2\141\1\163\1\147\1\160\2\151\2\162\2\155\2\164\ + \1\167\1\157\1\143\1\164\1\156\2\145\1\60\1\150\1\151\4\60\2\164\ + \1\uffff\1\145\1\163\1\uffff\1\60\3\uffff\2\145\1\144\1\145\1\uffff\ + \2\162\1\123\1\60\1\163\1\60\1\165\1\uffff\1\60\1\uffff\1\155\1\ + \uffff\1\60\1\uffff"""; + static final String DFA13_maxS = """ + \1\uffff\1\145\1\uffff\1\73\1\155\1\uffff\1\170\3\uffff\2\141\1\ + \157\1\uffff\1\145\1\164\2\uffff\1\141\1\57\3\uffff\2\71\1\172\1\ + \uffff\2\uffff\2\uffff\1\164\4\uffff\1\160\1\uffff\1\164\3\uffff\ + \2\162\1\156\1\uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\71\2\uffff\ + \1\162\1\157\1\145\2\141\1\163\1\147\1\160\2\151\2\162\2\155\2\164\ + \1\167\1\157\1\143\1\164\1\156\2\145\1\172\1\150\1\151\4\172\2\164\ + \1\uffff\1\145\1\163\1\uffff\1\172\3\uffff\2\145\1\144\1\145\1\uffff\ + \2\162\1\123\1\172\1\163\1\172\1\165\1\uffff\1\172\1\uffff\1\155\ + \1\uffff\1\172\1\uffff"""; + static final String DFA13_acceptS = """ + \2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\1\11\1\12\3\uffff\1\17\2\uffff\ + \1\22\1\23\2\uffff\1\26\1\27\1\30\3\uffff\1\32\2\uffff\1\37\1\40\ + \1\uffff\1\32\1\2\1\13\1\3\1\uffff\1\5\1\uffff\1\10\1\11\1\12\3\ + \uffff\1\17\2\uffff\1\22\1\23\1\uffff\1\35\1\36\1\25\1\26\1\27\1\ + \30\1\31\1\33\1\uffff\1\34\1\37\40\uffff\1\16\2\uffff\1\24\1\uffff\ + \1\7\1\4\1\6\4\uffff\1\1\7\uffff\1\21\1\uffff\1\15\1\uffff\1\14\ + \1\uffff\1\20"""; static final String DFA13_specialS = "\1\2\32\uffff\1\0\1\1\134\uffff}>"; static final String[] DFA13_transitionS = { "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\33\4\36\1\34\1\7\1\11" @@ -1505,14 +1499,14 @@ class DFA13 extends DFA { public DFA13(final BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 13; - this.eot = DFA13_eot; - this.eof = DFA13_eof; - this.min = DFA13_min; - this.max = DFA13_max; - this.accept = DFA13_accept; - this.special = DFA13_special; - this.transition = DFA13_transition; + decisionNumber = 13; + eot = DFA13_eot; + eof = DFA13_eof; + min = DFA13_min; + max = DFA13_max; + accept = DFA13_accept; + special = DFA13_special; + transition = DFA13_transition; } @Override @@ -1529,7 +1523,7 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_27 = input.LA(1); s = -1; - if (((LA13_27 >= '\u0000' && LA13_27 <= '\uFFFF'))) { + if ((((LA13_27 >= '\u0000') && (LA13_27 <= '\uFFFF')))) { s = 60; } else { s = 30; @@ -1543,7 +1537,7 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_28 = input.LA(1); s = -1; - if (((LA13_28 >= '\u0000' && LA13_28 <= '\uFFFF'))) { + if ((((LA13_28 >= '\u0000') && (LA13_28 <= '\uFFFF')))) { s = 60; } else { s = 30; @@ -1557,132 +1551,114 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_0 = input.LA(1); s = -1; - if ((LA13_0 == 'M')) { + switch (LA13_0) { + case 'M': s = 1; - } - - else if ((LA13_0 == '{')) { + break; + case '{': s = 2; - } - - else if ((LA13_0 == '}')) { + break; + case '}': s = 3; - } - - else if ((LA13_0 == 'i')) { + break; + case 'i': s = 4; - } - - else if ((LA13_0 == ';')) { + break; + case ';': s = 5; - } - - else if ((LA13_0 == 'e')) { + break; + case 'e': s = 6; - } - - else if ((LA13_0 == '(')) { + break; + case '(': s = 7; - } - - else if ((LA13_0 == ',')) { + break; + case ',': s = 8; - } - - else if ((LA13_0 == ')')) { + break; + case ')': s = 9; - } - - else if ((LA13_0 == 'p')) { + break; + case 'p': s = 10; - } - - else if ((LA13_0 == 'P')) { + break; + case 'P': s = 11; - } - - else if ((LA13_0 == 'C')) { + break; + case 'C': s = 12; - } - - else if ((LA13_0 == '=')) { + break; + case '=': s = 13; - } - - else if ((LA13_0 == 'W')) { + break; + case 'W': s = 14; - } - - else if ((LA13_0 == 'S')) { + break; + case 'S': s = 15; - } - - else if ((LA13_0 == '[')) { + break; + case '[': s = 16; - } - - else if ((LA13_0 == ']')) { + break; + case ']': s = 17; - } - - else if ((LA13_0 == 'R')) { + break; + case 'R': s = 18; - } - - else if ((LA13_0 == '/')) { + break; + case '/': s = 19; - } - - else if ((LA13_0 == '<')) { + break; + case '<': s = 20; - } - - else if ((LA13_0 == '>')) { + break; + case '>': s = 21; - } - - else if ((LA13_0 == '.')) { + break; + case '.': s = 22; - } - - else if ((LA13_0 == '-')) { + break; + case '-': s = 23; - } - - else if (((LA13_0 >= '0' && LA13_0 <= '9'))) { - s = 24; - } + break; + default: + if ((((LA13_0 >= '0') && (LA13_0 <= '9')))) { + s = 24; + } - else if ((LA13_0 == '^')) { - s = 25; - } + else if ((LA13_0 == '^')) { + s = 25; + } - else if (((LA13_0 >= 'A' && LA13_0 <= 'B') || (LA13_0 >= 'D' && LA13_0 <= 'L') - || (LA13_0 >= 'N' && LA13_0 <= 'O') || LA13_0 == 'Q' || (LA13_0 >= 'T' && LA13_0 <= 'V') - || (LA13_0 >= 'X' && LA13_0 <= 'Z') || LA13_0 == '_' || (LA13_0 >= 'a' && LA13_0 <= 'd') - || (LA13_0 >= 'f' && LA13_0 <= 'h') || (LA13_0 >= 'j' && LA13_0 <= 'o') - || (LA13_0 >= 'q' && LA13_0 <= 'z'))) { - s = 26; - } + else if ((((LA13_0 >= 'A') && (LA13_0 <= 'B')) || ((LA13_0 >= 'D') && (LA13_0 <= 'L')) + || ((LA13_0 >= 'N') && (LA13_0 <= 'O')) || (LA13_0 == 'Q') + || ((LA13_0 >= 'T') && (LA13_0 <= 'V')) || ((LA13_0 >= 'X') && (LA13_0 <= 'Z')) + || (LA13_0 == '_') || ((LA13_0 >= 'a') && (LA13_0 <= 'd')) + || ((LA13_0 >= 'f') && (LA13_0 <= 'h')) || ((LA13_0 >= 'j') && (LA13_0 <= 'o')) + || ((LA13_0 >= 'q') && (LA13_0 <= 'z')))) { + s = 26; + } - else if ((LA13_0 == '\"')) { - s = 27; - } + else if ((LA13_0 == '\"')) { + s = 27; + } - else if ((LA13_0 == '\'')) { - s = 28; - } + else if ((LA13_0 == '\'')) { + s = 28; + } - else if (((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) { - s = 29; - } + else if ((((LA13_0 >= '\t') && (LA13_0 <= '\n')) || (LA13_0 == '\r') || (LA13_0 == ' '))) { + s = 29; + } - else if (((LA13_0 >= '\u0000' && LA13_0 <= '\b') || (LA13_0 >= '\u000B' && LA13_0 <= '\f') - || (LA13_0 >= '\u000E' && LA13_0 <= '\u001F') || LA13_0 == '!' - || (LA13_0 >= '#' && LA13_0 <= '&') || (LA13_0 >= '*' && LA13_0 <= '+') || LA13_0 == ':' - || (LA13_0 >= '?' && LA13_0 <= '@') || LA13_0 == '\\' || LA13_0 == '`' || LA13_0 == '|' - || (LA13_0 >= '~' && LA13_0 <= '\uFFFF'))) { - s = 30; + else if ((((LA13_0 >= '\u0000') && (LA13_0 <= '\b')) || ((LA13_0 >= '\u000B') && (LA13_0 <= '\f')) + || ((LA13_0 >= '\u000E') && (LA13_0 <= '\u001F')) || (LA13_0 == '!') + || ((LA13_0 >= '#') && (LA13_0 <= '&')) || ((LA13_0 >= '*') && (LA13_0 <= '+')) + || (LA13_0 == ':') || ((LA13_0 >= '?') && (LA13_0 <= '@')) || (LA13_0 == '\\') + || (LA13_0 == '`') || (LA13_0 == '|') || ((LA13_0 >= '~') && (LA13_0 <= '\uFFFF')))) { + s = 30; + } + break; } if (s >= 0) { @@ -1690,8 +1666,8 @@ else if (((LA13_0 >= '\u0000' && LA13_0 <= '\b') || (LA13_0 >= '\u000B' && LA13_ } break; } - final NoViableAltException nvae = new NoViableAltException(this.getDescription(), 13, _s, input); - this.error(nvae); + final NoViableAltException nvae = new NoViableAltException(getDescription(), 13, _s, input); + error(nvae); throw nvae; } } diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLParser.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLParser.java index 9f37194..865148a 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLParser.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSLParser.java @@ -11,11 +11,11 @@ @SuppressWarnings("all") public class InternalMetricDSLParser extends AbstractInternalContentAssistParser { - public static final String[] tokenNames = new String[] { "", "", "", "", "RULE_ID", - "RULE_STRING", "RULE_DOUBLE", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", - "'Metrics'", "'{'", "'}'", "'import'", "';'", "'extern'", "'Metric'", "'('", "','", "')'", "'};'", - "'parameters'", "'Parameter'", "'Const'", "'='", "'WeigthedSum'", "'Stepwise'", "'['", "']'", "'Ratio'", - "'/'", "'<'", "'>'", "'.'" }; + public static final String[] tokenNames = { "", "", "", "", "RULE_ID", "RULE_STRING", + "RULE_DOUBLE", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'Metrics'", + "'{'", "'}'", "'import'", "';'", "'extern'", "'Metric'", "'('", "','", "')'", "'};'", "'parameters'", + "'Parameter'", "'Const'", "'='", "'WeigthedSum'", "'Stepwise'", "'['", "']'", "'Ratio'", "'/'", "'<'", + "'>'", "'.'" }; public static final int RULE_ID = 4; public static final int T__29 = 29; public static final int T__28 = 28; @@ -80,7 +80,7 @@ public void setGrammarAccess(final MetricDSLGrammarAccess grammarAccess) { @Override protected Grammar getGrammar() { - return this.grammarAccess.getGrammar(); + return grammarAccess.getGrammar(); } @Override @@ -98,23 +98,22 @@ public final void entryRuleMetricModel() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:62:1: // ruleMetricModel EOF { - this.before(this.grammarAccess.getMetricModelRule()); - this.pushFollow(FOLLOW_ruleMetricModel_in_entryRuleMetricModel61); - this.ruleMetricModel(); + this.before(grammarAccess.getMetricModelRule()); + pushFollow(FOLLOW_ruleMetricModel_in_entryRuleMetricModel61); + ruleMetricModel(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricModelRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricModel68); + this.after(grammarAccess.getMetricModelRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricModel68); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleMetricModel" @@ -123,7 +122,7 @@ public final void entryRuleMetricModel() throws RecognitionException { // ruleMetricModel : ( ( rule__MetricModel__Group__0 ) ) ; public final void ruleMetricModel() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:73:2: @@ -136,34 +135,33 @@ public final void ruleMetricModel() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:75:1: // ( rule__MetricModel__Group__0 ) { - this.before(this.grammarAccess.getMetricModelAccess().getGroup()); + this.before(grammarAccess.getMetricModelAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:76:1: // ( rule__MetricModel__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:76:2: // rule__MetricModel__Group__0 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__0_in_ruleMetricModel94); - this.rule__MetricModel__Group__0(); + pushFollow(FOLLOW_rule__MetricModel__Group__0_in_ruleMetricModel94); + rule__MetricModel__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricModelAccess().getGroup()); + this.after(grammarAccess.getMetricModelAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleMetricModel" @@ -177,23 +175,22 @@ public final void entryRuleExternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:92:1: // ruleExternalMetric EOF { - this.before(this.grammarAccess.getExternalMetricRule()); - this.pushFollow(FOLLOW_ruleExternalMetric_in_entryRuleExternalMetric123); - this.ruleExternalMetric(); + this.before(grammarAccess.getExternalMetricRule()); + pushFollow(FOLLOW_ruleExternalMetric_in_entryRuleExternalMetric123); + ruleExternalMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getExternalMetricRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleExternalMetric130); + this.after(grammarAccess.getExternalMetricRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleExternalMetric130); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleExternalMetric" @@ -202,7 +199,7 @@ public final void entryRuleExternalMetric() throws RecognitionException { // ruleExternalMetric : ( ( rule__ExternalMetric__NameAssignment ) ) ; public final void ruleExternalMetric() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:103:2: @@ -215,34 +212,33 @@ public final void ruleExternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:105:1: // ( rule__ExternalMetric__NameAssignment ) { - this.before(this.grammarAccess.getExternalMetricAccess().getNameAssignment()); + this.before(grammarAccess.getExternalMetricAccess().getNameAssignment()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:106:1: // ( rule__ExternalMetric__NameAssignment ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:106:2: // rule__ExternalMetric__NameAssignment { - this.pushFollow(FOLLOW_rule__ExternalMetric__NameAssignment_in_ruleExternalMetric156); - this.rule__ExternalMetric__NameAssignment(); + pushFollow(FOLLOW_rule__ExternalMetric__NameAssignment_in_ruleExternalMetric156); + rule__ExternalMetric__NameAssignment(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getExternalMetricAccess().getNameAssignment()); + this.after(grammarAccess.getExternalMetricAccess().getNameAssignment()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleExternalMetric" @@ -256,23 +252,22 @@ public final void entryRuleInternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:120:1: // ruleInternalMetric EOF { - this.before(this.grammarAccess.getInternalMetricRule()); - this.pushFollow(FOLLOW_ruleInternalMetric_in_entryRuleInternalMetric183); - this.ruleInternalMetric(); + this.before(grammarAccess.getInternalMetricRule()); + pushFollow(FOLLOW_ruleInternalMetric_in_entryRuleInternalMetric183); + ruleInternalMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getInternalMetricRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleInternalMetric190); + this.after(grammarAccess.getInternalMetricRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleInternalMetric190); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleInternalMetric" @@ -281,7 +276,7 @@ public final void entryRuleInternalMetric() throws RecognitionException { // ruleInternalMetric : ( ( rule__InternalMetric__Group__0 ) ) ; public final void ruleInternalMetric() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:131:2: @@ -294,34 +289,33 @@ public final void ruleInternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:133:1: // ( rule__InternalMetric__Group__0 ) { - this.before(this.grammarAccess.getInternalMetricAccess().getGroup()); + this.before(grammarAccess.getInternalMetricAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:134:1: // ( rule__InternalMetric__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:134:2: // rule__InternalMetric__Group__0 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__0_in_ruleInternalMetric216); - this.rule__InternalMetric__Group__0(); + pushFollow(FOLLOW_rule__InternalMetric__Group__0_in_ruleInternalMetric216); + rule__InternalMetric__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getInternalMetricAccess().getGroup()); + this.after(grammarAccess.getInternalMetricAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleInternalMetric" @@ -335,23 +329,22 @@ public final void entryRuleNumber() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:148:1: // ruleNumber EOF { - this.before(this.grammarAccess.getNumberRule()); - this.pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber243); - this.ruleNumber(); + this.before(grammarAccess.getNumberRule()); + pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber243); + ruleNumber(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getNumberRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleNumber250); + this.after(grammarAccess.getNumberRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleNumber250); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleNumber" @@ -360,7 +353,7 @@ public final void entryRuleNumber() throws RecognitionException { // ruleNumber : ( ( rule__Number__Alternatives ) ) ; public final void ruleNumber() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:159:2: @@ -373,34 +366,33 @@ public final void ruleNumber() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:161:1: // ( rule__Number__Alternatives ) { - this.before(this.grammarAccess.getNumberAccess().getAlternatives()); + this.before(grammarAccess.getNumberAccess().getAlternatives()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:162:1: // ( rule__Number__Alternatives ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:162:2: // rule__Number__Alternatives { - this.pushFollow(FOLLOW_rule__Number__Alternatives_in_ruleNumber276); - this.rule__Number__Alternatives(); + pushFollow(FOLLOW_rule__Number__Alternatives_in_ruleNumber276); + rule__Number__Alternatives(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getNumberAccess().getAlternatives()); + this.after(grammarAccess.getNumberAccess().getAlternatives()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleNumber" @@ -414,23 +406,22 @@ public final void entryRuleParameter() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:176:1: // ruleParameter EOF { - this.before(this.grammarAccess.getParameterRule()); - this.pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter303); - this.ruleParameter(); + this.before(grammarAccess.getParameterRule()); + pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter303); + ruleParameter(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getParameterRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleParameter310); + this.after(grammarAccess.getParameterRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleParameter310); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleParameter" @@ -439,7 +430,7 @@ public final void entryRuleParameter() throws RecognitionException { // ruleParameter : ( ( rule__Parameter__Group__0 ) ) ; public final void ruleParameter() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:187:2: @@ -452,34 +443,33 @@ public final void ruleParameter() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:189:1: // ( rule__Parameter__Group__0 ) { - this.before(this.grammarAccess.getParameterAccess().getGroup()); + this.before(grammarAccess.getParameterAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:190:1: // ( rule__Parameter__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:190:2: // rule__Parameter__Group__0 { - this.pushFollow(FOLLOW_rule__Parameter__Group__0_in_ruleParameter336); - this.rule__Parameter__Group__0(); + pushFollow(FOLLOW_rule__Parameter__Group__0_in_ruleParameter336); + rule__Parameter__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getParameterAccess().getGroup()); + this.after(grammarAccess.getParameterAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleParameter" @@ -493,23 +483,22 @@ public final void entryRuleConstant() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:204:1: // ruleConstant EOF { - this.before(this.grammarAccess.getConstantRule()); - this.pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant363); - this.ruleConstant(); + this.before(grammarAccess.getConstantRule()); + pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant363); + ruleConstant(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getConstantRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleConstant370); + this.after(grammarAccess.getConstantRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleConstant370); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleConstant" @@ -518,7 +507,7 @@ public final void entryRuleConstant() throws RecognitionException { // ruleConstant : ( ( rule__Constant__Group__0 ) ) ; public final void ruleConstant() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:215:2: @@ -531,34 +520,33 @@ public final void ruleConstant() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:217:1: // ( rule__Constant__Group__0 ) { - this.before(this.grammarAccess.getConstantAccess().getGroup()); + this.before(grammarAccess.getConstantAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:218:1: // ( rule__Constant__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:218:2: // rule__Constant__Group__0 { - this.pushFollow(FOLLOW_rule__Constant__Group__0_in_ruleConstant396); - this.rule__Constant__Group__0(); + pushFollow(FOLLOW_rule__Constant__Group__0_in_ruleConstant396); + rule__Constant__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getConstantAccess().getGroup()); + this.after(grammarAccess.getConstantAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleConstant" @@ -572,23 +560,22 @@ public final void entryRuleMetricDefinition() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:232:1: // ruleMetricDefinition EOF { - this.before(this.grammarAccess.getMetricDefinitionRule()); - this.pushFollow(FOLLOW_ruleMetricDefinition_in_entryRuleMetricDefinition423); - this.ruleMetricDefinition(); + this.before(grammarAccess.getMetricDefinitionRule()); + pushFollow(FOLLOW_ruleMetricDefinition_in_entryRuleMetricDefinition423); + ruleMetricDefinition(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricDefinitionRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricDefinition430); + this.after(grammarAccess.getMetricDefinitionRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricDefinition430); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleMetricDefinition" @@ -597,7 +584,7 @@ public final void entryRuleMetricDefinition() throws RecognitionException { // ruleMetricDefinition : ( ( rule__MetricDefinition__Alternatives ) ) ; public final void ruleMetricDefinition() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:243:2: @@ -610,34 +597,33 @@ public final void ruleMetricDefinition() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:245:1: // ( rule__MetricDefinition__Alternatives ) { - this.before(this.grammarAccess.getMetricDefinitionAccess().getAlternatives()); + this.before(grammarAccess.getMetricDefinitionAccess().getAlternatives()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:246:1: // ( rule__MetricDefinition__Alternatives ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:246:2: // rule__MetricDefinition__Alternatives { - this.pushFollow(FOLLOW_rule__MetricDefinition__Alternatives_in_ruleMetricDefinition456); - this.rule__MetricDefinition__Alternatives(); + pushFollow(FOLLOW_rule__MetricDefinition__Alternatives_in_ruleMetricDefinition456); + rule__MetricDefinition__Alternatives(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricDefinitionAccess().getAlternatives()); + this.after(grammarAccess.getMetricDefinitionAccess().getAlternatives()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleMetricDefinition" @@ -651,23 +637,22 @@ public final void entryRuleWeightedMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:260:1: // ruleWeightedMetric EOF { - this.before(this.grammarAccess.getWeightedMetricRule()); - this.pushFollow(FOLLOW_ruleWeightedMetric_in_entryRuleWeightedMetric483); - this.ruleWeightedMetric(); + this.before(grammarAccess.getWeightedMetricRule()); + pushFollow(FOLLOW_ruleWeightedMetric_in_entryRuleWeightedMetric483); + ruleWeightedMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getWeightedMetricRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleWeightedMetric490); + this.after(grammarAccess.getWeightedMetricRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleWeightedMetric490); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleWeightedMetric" @@ -676,7 +661,7 @@ public final void entryRuleWeightedMetric() throws RecognitionException { // ruleWeightedMetric : ( ( rule__WeightedMetric__Group__0 ) ) ; public final void ruleWeightedMetric() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:271:2: @@ -689,34 +674,33 @@ public final void ruleWeightedMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:273:1: // ( rule__WeightedMetric__Group__0 ) { - this.before(this.grammarAccess.getWeightedMetricAccess().getGroup()); + this.before(grammarAccess.getWeightedMetricAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:274:1: // ( rule__WeightedMetric__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:274:2: // rule__WeightedMetric__Group__0 { - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__0_in_ruleWeightedMetric516); - this.rule__WeightedMetric__Group__0(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__0_in_ruleWeightedMetric516); + rule__WeightedMetric__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getWeightedMetricAccess().getGroup()); + this.after(grammarAccess.getWeightedMetricAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleWeightedMetric" @@ -730,23 +714,22 @@ public final void entryRuleStepwiseMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:288:1: // ruleStepwiseMetric EOF { - this.before(this.grammarAccess.getStepwiseMetricRule()); - this.pushFollow(FOLLOW_ruleStepwiseMetric_in_entryRuleStepwiseMetric543); - this.ruleStepwiseMetric(); + this.before(grammarAccess.getStepwiseMetricRule()); + pushFollow(FOLLOW_ruleStepwiseMetric_in_entryRuleStepwiseMetric543); + ruleStepwiseMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getStepwiseMetricRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleStepwiseMetric550); + this.after(grammarAccess.getStepwiseMetricRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleStepwiseMetric550); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleStepwiseMetric" @@ -755,7 +738,7 @@ public final void entryRuleStepwiseMetric() throws RecognitionException { // ruleStepwiseMetric : ( ( rule__StepwiseMetric__Group__0 ) ) ; public final void ruleStepwiseMetric() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:299:2: @@ -768,34 +751,33 @@ public final void ruleStepwiseMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:301:1: // ( rule__StepwiseMetric__Group__0 ) { - this.before(this.grammarAccess.getStepwiseMetricAccess().getGroup()); + this.before(grammarAccess.getStepwiseMetricAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:302:1: // ( rule__StepwiseMetric__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:302:2: // rule__StepwiseMetric__Group__0 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__0_in_ruleStepwiseMetric576); - this.rule__StepwiseMetric__Group__0(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__0_in_ruleStepwiseMetric576); + rule__StepwiseMetric__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getStepwiseMetricAccess().getGroup()); + this.after(grammarAccess.getStepwiseMetricAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleStepwiseMetric" @@ -809,23 +791,22 @@ public final void entryRuleRatioMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:316:1: // ruleRatioMetric EOF { - this.before(this.grammarAccess.getRatioMetricRule()); - this.pushFollow(FOLLOW_ruleRatioMetric_in_entryRuleRatioMetric603); - this.ruleRatioMetric(); + this.before(grammarAccess.getRatioMetricRule()); + pushFollow(FOLLOW_ruleRatioMetric_in_entryRuleRatioMetric603); + ruleRatioMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getRatioMetricRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleRatioMetric610); + this.after(grammarAccess.getRatioMetricRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleRatioMetric610); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleRatioMetric" @@ -834,7 +815,7 @@ public final void entryRuleRatioMetric() throws RecognitionException { // ruleRatioMetric : ( ( rule__RatioMetric__Group__0 ) ) ; public final void ruleRatioMetric() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:327:2: @@ -847,34 +828,33 @@ public final void ruleRatioMetric() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:329:1: // ( rule__RatioMetric__Group__0 ) { - this.before(this.grammarAccess.getRatioMetricAccess().getGroup()); + this.before(grammarAccess.getRatioMetricAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:330:1: // ( rule__RatioMetric__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:330:2: // rule__RatioMetric__Group__0 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__0_in_ruleRatioMetric636); - this.rule__RatioMetric__Group__0(); + pushFollow(FOLLOW_rule__RatioMetric__Group__0_in_ruleRatioMetric636); + rule__RatioMetric__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getRatioMetricAccess().getGroup()); + this.after(grammarAccess.getRatioMetricAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleRatioMetric" @@ -888,23 +868,22 @@ public final void entryRuleBoundAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:344:1: // ruleBoundAndWeight EOF { - this.before(this.grammarAccess.getBoundAndWeightRule()); - this.pushFollow(FOLLOW_ruleBoundAndWeight_in_entryRuleBoundAndWeight663); - this.ruleBoundAndWeight(); + this.before(grammarAccess.getBoundAndWeightRule()); + pushFollow(FOLLOW_ruleBoundAndWeight_in_entryRuleBoundAndWeight663); + ruleBoundAndWeight(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getBoundAndWeightRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleBoundAndWeight670); + this.after(grammarAccess.getBoundAndWeightRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleBoundAndWeight670); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleBoundAndWeight" @@ -913,7 +892,7 @@ public final void entryRuleBoundAndWeight() throws RecognitionException { // ruleBoundAndWeight : ( ( rule__BoundAndWeight__Group__0 ) ) ; public final void ruleBoundAndWeight() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:355:2: @@ -926,34 +905,33 @@ public final void ruleBoundAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:357:1: // ( rule__BoundAndWeight__Group__0 ) { - this.before(this.grammarAccess.getBoundAndWeightAccess().getGroup()); + this.before(grammarAccess.getBoundAndWeightAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:358:1: // ( rule__BoundAndWeight__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:358:2: // rule__BoundAndWeight__Group__0 { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__0_in_ruleBoundAndWeight696); - this.rule__BoundAndWeight__Group__0(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__0_in_ruleBoundAndWeight696); + rule__BoundAndWeight__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getBoundAndWeightAccess().getGroup()); + this.after(grammarAccess.getBoundAndWeightAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleBoundAndWeight" @@ -967,23 +945,22 @@ public final void entryRuleMetricAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:372:1: // ruleMetricAndWeight EOF { - this.before(this.grammarAccess.getMetricAndWeightRule()); - this.pushFollow(FOLLOW_ruleMetricAndWeight_in_entryRuleMetricAndWeight723); - this.ruleMetricAndWeight(); + this.before(grammarAccess.getMetricAndWeightRule()); + pushFollow(FOLLOW_ruleMetricAndWeight_in_entryRuleMetricAndWeight723); + ruleMetricAndWeight(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricAndWeightRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricAndWeight730); + this.after(grammarAccess.getMetricAndWeightRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricAndWeight730); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleMetricAndWeight" @@ -992,7 +969,7 @@ public final void entryRuleMetricAndWeight() throws RecognitionException { // ruleMetricAndWeight : ( ( rule__MetricAndWeight__Group__0 ) ) ; public final void ruleMetricAndWeight() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:383:2: @@ -1005,34 +982,33 @@ public final void ruleMetricAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:385:1: // ( rule__MetricAndWeight__Group__0 ) { - this.before(this.grammarAccess.getMetricAndWeightAccess().getGroup()); + this.before(grammarAccess.getMetricAndWeightAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:386:1: // ( rule__MetricAndWeight__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:386:2: // rule__MetricAndWeight__Group__0 { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__0_in_ruleMetricAndWeight756); - this.rule__MetricAndWeight__Group__0(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__0_in_ruleMetricAndWeight756); + rule__MetricAndWeight__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricAndWeightAccess().getGroup()); + this.after(grammarAccess.getMetricAndWeightAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleMetricAndWeight" @@ -1046,23 +1022,22 @@ public final void entryRuleMYID() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:400:1: // ruleMYID EOF { - this.before(this.grammarAccess.getMYIDRule()); - this.pushFollow(FOLLOW_ruleMYID_in_entryRuleMYID783); - this.ruleMYID(); + this.before(grammarAccess.getMYIDRule()); + pushFollow(FOLLOW_ruleMYID_in_entryRuleMYID783); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMYIDRule()); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMYID790); + this.after(grammarAccess.getMYIDRule()); + match(input, EOF, FOLLOW_EOF_in_entryRuleMYID790); } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { } - return; } // $ANTLR end "entryRuleMYID" @@ -1071,7 +1046,7 @@ public final void entryRuleMYID() throws RecognitionException { // ruleMYID : ( ( rule__MYID__Group__0 ) ) ; public final void ruleMYID() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:411:2: @@ -1084,34 +1059,33 @@ public final void ruleMYID() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:413:1: // ( rule__MYID__Group__0 ) { - this.before(this.grammarAccess.getMYIDAccess().getGroup()); + this.before(grammarAccess.getMYIDAccess().getGroup()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:414:1: // ( rule__MYID__Group__0 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:414:2: // rule__MYID__Group__0 { - this.pushFollow(FOLLOW_rule__MYID__Group__0_in_ruleMYID816); - this.rule__MYID__Group__0(); + pushFollow(FOLLOW_rule__MYID__Group__0_in_ruleMYID816); + rule__MYID__Group__0(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMYIDAccess().getGroup()); + this.after(grammarAccess.getMYIDAccess().getGroup()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "ruleMYID" @@ -1120,20 +1094,20 @@ public final void ruleMYID() throws RecognitionException { // rule__Number__Alternatives : ( ( ruleParameter ) | ( ruleConstant ) ); public final void rule__Number__Alternatives() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:431:1: // ( ( ruleParameter ) | ( ruleConstant ) ) int alt1 = 2; - final int LA1_0 = this.input.LA(1); + final int LA1_0 = input.LA(1); if ((LA1_0 == 24)) { alt1 = 1; } else if ((LA1_0 == 25)) { alt1 = 2; } else { - final NoViableAltException nvae = new NoViableAltException("", 1, 0, this.input); + final NoViableAltException nvae = new NoViableAltException("", 1, 0, input); throw nvae; } @@ -1147,13 +1121,13 @@ public final void rule__Number__Alternatives() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:433:1: // ruleParameter { - this.before(this.grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleParameter_in_rule__Number__Alternatives853); - this.ruleParameter(); + this.before(grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); + pushFollow(FOLLOW_ruleParameter_in_rule__Number__Alternatives853); + ruleParameter(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); + this.after(grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); } @@ -1168,13 +1142,13 @@ public final void rule__Number__Alternatives() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:439:1: // ruleConstant { - this.before(this.grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); - this.pushFollow(FOLLOW_ruleConstant_in_rule__Number__Alternatives870); - this.ruleConstant(); + this.before(grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); + pushFollow(FOLLOW_ruleConstant_in_rule__Number__Alternatives870); + ruleConstant(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); + this.after(grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); } @@ -1183,47 +1157,38 @@ public final void rule__Number__Alternatives() throws RecognitionException { } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Number__Alternatives" // $ANTLR start "rule__MetricDefinition__Alternatives" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:449:1: - // rule__MetricDefinition__Alternatives : ( ( ruleWeightedMetric ) | ( ruleStepwiseMetric ) | ( + // rule__MetricDefinition__Alternatives : ( ( ruleWeightedMetric ) | ( + // ruleStepwiseMetric ) | ( // ruleRatioMetric ) ); public final void rule__MetricDefinition__Alternatives() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:453:1: // ( ( ruleWeightedMetric ) | ( ruleStepwiseMetric ) | ( ruleRatioMetric ) ) int alt2 = 3; - switch (this.input.LA(1)) { - case 27: { - alt2 = 1; - } - break; - case 28: { - alt2 = 2; - } - break; - case 31: { - alt2 = 3; - } - break; - default: - final NoViableAltException nvae = new NoViableAltException("", 2, 0, this.input); - + alt2 = switch (input.LA(1)) { + case 27 -> 1; + case 28 -> 2; + case 31 -> 3; + default -> { + final NoViableAltException nvae = new NoViableAltException("", 2, 0, input); throw nvae; } + }; switch (alt2) { case 1: @@ -1235,13 +1200,13 @@ public final void rule__MetricDefinition__Alternatives() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:455:1: // ruleWeightedMetric { - this.before(this.grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleWeightedMetric_in_rule__MetricDefinition__Alternatives902); - this.ruleWeightedMetric(); + this.before(grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); + pushFollow(FOLLOW_ruleWeightedMetric_in_rule__MetricDefinition__Alternatives902); + ruleWeightedMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); + this.after(grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); } @@ -1256,13 +1221,13 @@ public final void rule__MetricDefinition__Alternatives() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:461:1: // ruleStepwiseMetric { - this.before(this.grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); - this.pushFollow(FOLLOW_ruleStepwiseMetric_in_rule__MetricDefinition__Alternatives919); - this.ruleStepwiseMetric(); + this.before(grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); + pushFollow(FOLLOW_ruleStepwiseMetric_in_rule__MetricDefinition__Alternatives919); + ruleStepwiseMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); + this.after(grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); } @@ -1277,13 +1242,13 @@ public final void rule__MetricDefinition__Alternatives() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:467:1: // ruleRatioMetric { - this.before(this.grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); - this.pushFollow(FOLLOW_ruleRatioMetric_in_rule__MetricDefinition__Alternatives936); - this.ruleRatioMetric(); + this.before(grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); + pushFollow(FOLLOW_ruleRatioMetric_in_rule__MetricDefinition__Alternatives936); + ruleRatioMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); + this.after(grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); } @@ -1292,23 +1257,23 @@ public final void rule__MetricDefinition__Alternatives() throws RecognitionExcep } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricDefinition__Alternatives" // $ANTLR start "rule__MetricModel__Group__0" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:479:1: - // rule__MetricModel__Group__0 : rule__MetricModel__Group__0__Impl rule__MetricModel__Group__1 ; + // rule__MetricModel__Group__0 : rule__MetricModel__Group__0__Impl + // rule__MetricModel__Group__1 ; public final void rule__MetricModel__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:483:1: @@ -1316,27 +1281,26 @@ public final void rule__MetricModel__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:484:2: // rule__MetricModel__Group__0__Impl rule__MetricModel__Group__1 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__0__Impl_in_rule__MetricModel__Group__0966); - this.rule__MetricModel__Group__0__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__0__Impl_in_rule__MetricModel__Group__0966); + rule__MetricModel__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group__1_in_rule__MetricModel__Group__0969); - this.rule__MetricModel__Group__1(); + pushFollow(FOLLOW_rule__MetricModel__Group__1_in_rule__MetricModel__Group__0969); + rule__MetricModel__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__0" @@ -1345,7 +1309,7 @@ public final void rule__MetricModel__Group__0() throws RecognitionException { // rule__MetricModel__Group__0__Impl : ( ( rule__MetricModel__Group_0__0 )* ) ; public final void rule__MetricModel__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:495:1: @@ -1358,12 +1322,12 @@ public final void rule__MetricModel__Group__0__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:497:1: // ( rule__MetricModel__Group_0__0 )* { - this.before(this.grammarAccess.getMetricModelAccess().getGroup_0()); + this.before(grammarAccess.getMetricModelAccess().getGroup_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:498:1: // ( rule__MetricModel__Group_0__0 )* loop3: do { int alt3 = 2; - final int LA3_0 = this.input.LA(1); + final int LA3_0 = input.LA(1); if ((LA3_0 == 15)) { alt3 = 1; @@ -1374,11 +1338,10 @@ public final void rule__MetricModel__Group__0__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:498:2: // rule__MetricModel__Group_0__0 { - this.pushFollow( - FOLLOW_rule__MetricModel__Group_0__0_in_rule__MetricModel__Group__0__Impl996); - this.rule__MetricModel__Group_0__0(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__0_in_rule__MetricModel__Group__0__Impl996); + rule__MetricModel__Group_0__0(); - this.state._fsp--; + state._fsp--; } break; @@ -1388,30 +1351,30 @@ public final void rule__MetricModel__Group__0__Impl() throws RecognitionExceptio } } while (true); - this.after(this.grammarAccess.getMetricModelAccess().getGroup_0()); + this.after(grammarAccess.getMetricModelAccess().getGroup_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__0__Impl" // $ANTLR start "rule__MetricModel__Group__1" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:508:1: - // rule__MetricModel__Group__1 : rule__MetricModel__Group__1__Impl rule__MetricModel__Group__2 ; + // rule__MetricModel__Group__1 : rule__MetricModel__Group__1__Impl + // rule__MetricModel__Group__2 ; public final void rule__MetricModel__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:512:1: @@ -1419,27 +1382,26 @@ public final void rule__MetricModel__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:513:2: // rule__MetricModel__Group__1__Impl rule__MetricModel__Group__2 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__1__Impl_in_rule__MetricModel__Group__11027); - this.rule__MetricModel__Group__1__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__1__Impl_in_rule__MetricModel__Group__11027); + rule__MetricModel__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group__2_in_rule__MetricModel__Group__11030); - this.rule__MetricModel__Group__2(); + pushFollow(FOLLOW_rule__MetricModel__Group__2_in_rule__MetricModel__Group__11030); + rule__MetricModel__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__1" @@ -1448,7 +1410,7 @@ public final void rule__MetricModel__Group__1() throws RecognitionException { // rule__MetricModel__Group__1__Impl : ( ( rule__MetricModel__Group_1__0 )* ) ; public final void rule__MetricModel__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:524:1: @@ -1461,12 +1423,12 @@ public final void rule__MetricModel__Group__1__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:526:1: // ( rule__MetricModel__Group_1__0 )* { - this.before(this.grammarAccess.getMetricModelAccess().getGroup_1()); + this.before(grammarAccess.getMetricModelAccess().getGroup_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:527:1: // ( rule__MetricModel__Group_1__0 )* loop4: do { int alt4 = 2; - final int LA4_0 = this.input.LA(1); + final int LA4_0 = input.LA(1); if ((LA4_0 == 17)) { alt4 = 1; @@ -1477,11 +1439,10 @@ public final void rule__MetricModel__Group__1__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:527:2: // rule__MetricModel__Group_1__0 { - this.pushFollow( - FOLLOW_rule__MetricModel__Group_1__0_in_rule__MetricModel__Group__1__Impl1057); - this.rule__MetricModel__Group_1__0(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__0_in_rule__MetricModel__Group__1__Impl1057); + rule__MetricModel__Group_1__0(); - this.state._fsp--; + state._fsp--; } break; @@ -1491,30 +1452,30 @@ public final void rule__MetricModel__Group__1__Impl() throws RecognitionExceptio } } while (true); - this.after(this.grammarAccess.getMetricModelAccess().getGroup_1()); + this.after(grammarAccess.getMetricModelAccess().getGroup_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__1__Impl" // $ANTLR start "rule__MetricModel__Group__2" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:537:1: - // rule__MetricModel__Group__2 : rule__MetricModel__Group__2__Impl rule__MetricModel__Group__3 ; + // rule__MetricModel__Group__2 : rule__MetricModel__Group__2__Impl + // rule__MetricModel__Group__3 ; public final void rule__MetricModel__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:541:1: @@ -1522,27 +1483,26 @@ public final void rule__MetricModel__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:542:2: // rule__MetricModel__Group__2__Impl rule__MetricModel__Group__3 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__2__Impl_in_rule__MetricModel__Group__21088); - this.rule__MetricModel__Group__2__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__2__Impl_in_rule__MetricModel__Group__21088); + rule__MetricModel__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group__3_in_rule__MetricModel__Group__21091); - this.rule__MetricModel__Group__3(); + pushFollow(FOLLOW_rule__MetricModel__Group__3_in_rule__MetricModel__Group__21091); + rule__MetricModel__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__2" @@ -1551,7 +1511,7 @@ public final void rule__MetricModel__Group__2() throws RecognitionException { // rule__MetricModel__Group__2__Impl : ( 'Metrics' ) ; public final void rule__MetricModel__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:553:1: @@ -1564,32 +1524,32 @@ public final void rule__MetricModel__Group__2__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:555:1: // 'Metrics' { - this.before(this.grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); - this.match(this.input, 12, FOLLOW_12_in_rule__MetricModel__Group__2__Impl1119); - this.after(this.grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); + this.before(grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); + match(input, 12, FOLLOW_12_in_rule__MetricModel__Group__2__Impl1119); + this.after(grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__2__Impl" // $ANTLR start "rule__MetricModel__Group__3" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:568:1: - // rule__MetricModel__Group__3 : rule__MetricModel__Group__3__Impl rule__MetricModel__Group__4 ; + // rule__MetricModel__Group__3 : rule__MetricModel__Group__3__Impl + // rule__MetricModel__Group__4 ; public final void rule__MetricModel__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:572:1: @@ -1597,27 +1557,26 @@ public final void rule__MetricModel__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:573:2: // rule__MetricModel__Group__3__Impl rule__MetricModel__Group__4 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__3__Impl_in_rule__MetricModel__Group__31150); - this.rule__MetricModel__Group__3__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__3__Impl_in_rule__MetricModel__Group__31150); + rule__MetricModel__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group__4_in_rule__MetricModel__Group__31153); - this.rule__MetricModel__Group__4(); + pushFollow(FOLLOW_rule__MetricModel__Group__4_in_rule__MetricModel__Group__31153); + rule__MetricModel__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__3" @@ -1626,7 +1585,7 @@ public final void rule__MetricModel__Group__3() throws RecognitionException { // rule__MetricModel__Group__3__Impl : ( '{' ) ; public final void rule__MetricModel__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:584:1: @@ -1639,32 +1598,32 @@ public final void rule__MetricModel__Group__3__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:586:1: // '{' { - this.before(this.grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); - this.match(this.input, 13, FOLLOW_13_in_rule__MetricModel__Group__3__Impl1181); - this.after(this.grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); + this.before(grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); + match(input, 13, FOLLOW_13_in_rule__MetricModel__Group__3__Impl1181); + this.after(grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__3__Impl" // $ANTLR start "rule__MetricModel__Group__4" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:599:1: - // rule__MetricModel__Group__4 : rule__MetricModel__Group__4__Impl rule__MetricModel__Group__5 ; + // rule__MetricModel__Group__4 : rule__MetricModel__Group__4__Impl + // rule__MetricModel__Group__5 ; public final void rule__MetricModel__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:603:1: @@ -1672,37 +1631,37 @@ public final void rule__MetricModel__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:604:2: // rule__MetricModel__Group__4__Impl rule__MetricModel__Group__5 { - this.pushFollow(FOLLOW_rule__MetricModel__Group__4__Impl_in_rule__MetricModel__Group__41212); - this.rule__MetricModel__Group__4__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__4__Impl_in_rule__MetricModel__Group__41212); + rule__MetricModel__Group__4__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group__5_in_rule__MetricModel__Group__41215); - this.rule__MetricModel__Group__5(); + pushFollow(FOLLOW_rule__MetricModel__Group__5_in_rule__MetricModel__Group__41215); + rule__MetricModel__Group__5(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__4" // $ANTLR start "rule__MetricModel__Group__4__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:611:1: - // rule__MetricModel__Group__4__Impl : ( ( ( rule__MetricModel__MetricsAssignment_4 ) ) ( ( + // rule__MetricModel__Group__4__Impl : ( ( ( + // rule__MetricModel__MetricsAssignment_4 ) ) ( ( // rule__MetricModel__MetricsAssignment_4 )* ) ) ; public final void rule__MetricModel__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:615:1: @@ -1724,21 +1683,21 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:618:1: // ( rule__MetricModel__MetricsAssignment_4 ) { - this.before(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); + this.before(grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:619:1: // ( rule__MetricModel__MetricsAssignment_4 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:619:2: // rule__MetricModel__MetricsAssignment_4 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricModel__MetricsAssignment_4_in_rule__MetricModel__Group__4__Impl1244); - this.rule__MetricModel__MetricsAssignment_4(); + rule__MetricModel__MetricsAssignment_4(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); + this.after(grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); } @@ -1747,12 +1706,12 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:623:1: // ( rule__MetricModel__MetricsAssignment_4 )* { - this.before(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); + this.before(grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:624:1: // ( rule__MetricModel__MetricsAssignment_4 )* loop5: do { int alt5 = 2; - final int LA5_0 = this.input.LA(1); + final int LA5_0 = input.LA(1); if ((LA5_0 == 18)) { alt5 = 1; @@ -1763,11 +1722,11 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:624:2: // rule__MetricModel__MetricsAssignment_4 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricModel__MetricsAssignment_4_in_rule__MetricModel__Group__4__Impl1256); - this.rule__MetricModel__MetricsAssignment_4(); + rule__MetricModel__MetricsAssignment_4(); - this.state._fsp--; + state._fsp--; } break; @@ -1777,7 +1736,7 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio } } while (true); - this.after(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); + this.after(grammarAccess.getMetricModelAccess().getMetricsAssignment_4()); } @@ -1786,14 +1745,13 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__4__Impl" @@ -1802,7 +1760,7 @@ public final void rule__MetricModel__Group__4__Impl() throws RecognitionExceptio // rule__MetricModel__Group__5 : rule__MetricModel__Group__5__Impl ; public final void rule__MetricModel__Group__5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:639:1: @@ -1810,22 +1768,21 @@ public final void rule__MetricModel__Group__5() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:640:2: // rule__MetricModel__Group__5__Impl { - this.pushFollow(FOLLOW_rule__MetricModel__Group__5__Impl_in_rule__MetricModel__Group__51289); - this.rule__MetricModel__Group__5__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group__5__Impl_in_rule__MetricModel__Group__51289); + rule__MetricModel__Group__5__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__5" @@ -1834,7 +1791,7 @@ public final void rule__MetricModel__Group__5() throws RecognitionException { // rule__MetricModel__Group__5__Impl : ( '}' ) ; public final void rule__MetricModel__Group__5__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:650:1: @@ -1847,23 +1804,22 @@ public final void rule__MetricModel__Group__5__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:652:1: // '}' { - this.before(this.grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); - this.match(this.input, 14, FOLLOW_14_in_rule__MetricModel__Group__5__Impl1317); - this.after(this.grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); + this.before(grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); + match(input, 14, FOLLOW_14_in_rule__MetricModel__Group__5__Impl1317); + this.after(grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group__5__Impl" @@ -1873,7 +1829,7 @@ public final void rule__MetricModel__Group__5__Impl() throws RecognitionExceptio // rule__MetricModel__Group_0__1 ; public final void rule__MetricModel__Group_0__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:681:1: @@ -1881,27 +1837,26 @@ public final void rule__MetricModel__Group_0__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:682:2: // rule__MetricModel__Group_0__0__Impl rule__MetricModel__Group_0__1 { - this.pushFollow(FOLLOW_rule__MetricModel__Group_0__0__Impl_in_rule__MetricModel__Group_0__01360); - this.rule__MetricModel__Group_0__0__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__0__Impl_in_rule__MetricModel__Group_0__01360); + rule__MetricModel__Group_0__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group_0__1_in_rule__MetricModel__Group_0__01363); - this.rule__MetricModel__Group_0__1(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__1_in_rule__MetricModel__Group_0__01363); + rule__MetricModel__Group_0__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__0" @@ -1910,7 +1865,7 @@ public final void rule__MetricModel__Group_0__0() throws RecognitionException { // rule__MetricModel__Group_0__0__Impl : ( 'import' ) ; public final void rule__MetricModel__Group_0__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:693:1: @@ -1923,23 +1878,22 @@ public final void rule__MetricModel__Group_0__0__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:695:1: // 'import' { - this.before(this.grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); - this.match(this.input, 15, FOLLOW_15_in_rule__MetricModel__Group_0__0__Impl1391); - this.after(this.grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); + this.before(grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); + match(input, 15, FOLLOW_15_in_rule__MetricModel__Group_0__0__Impl1391); + this.after(grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__0__Impl" @@ -1949,7 +1903,7 @@ public final void rule__MetricModel__Group_0__0__Impl() throws RecognitionExcept // rule__MetricModel__Group_0__2 ; public final void rule__MetricModel__Group_0__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:712:1: @@ -1957,36 +1911,36 @@ public final void rule__MetricModel__Group_0__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:713:2: // rule__MetricModel__Group_0__1__Impl rule__MetricModel__Group_0__2 { - this.pushFollow(FOLLOW_rule__MetricModel__Group_0__1__Impl_in_rule__MetricModel__Group_0__11422); - this.rule__MetricModel__Group_0__1__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__1__Impl_in_rule__MetricModel__Group_0__11422); + rule__MetricModel__Group_0__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group_0__2_in_rule__MetricModel__Group_0__11425); - this.rule__MetricModel__Group_0__2(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__2_in_rule__MetricModel__Group_0__11425); + rule__MetricModel__Group_0__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__1" // $ANTLR start "rule__MetricModel__Group_0__1__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:720:1: - // rule__MetricModel__Group_0__1__Impl : ( ( rule__MetricModel__ImportURIAssignment_0_1 ) ) ; + // rule__MetricModel__Group_0__1__Impl : ( ( + // rule__MetricModel__ImportURIAssignment_0_1 ) ) ; public final void rule__MetricModel__Group_0__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:724:1: @@ -1999,35 +1953,34 @@ public final void rule__MetricModel__Group_0__1__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:726:1: // ( rule__MetricModel__ImportURIAssignment_0_1 ) { - this.before(this.grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1()); + this.before(grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:727:1: // ( rule__MetricModel__ImportURIAssignment_0_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:727:2: // rule__MetricModel__ImportURIAssignment_0_1 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricModel__ImportURIAssignment_0_1_in_rule__MetricModel__Group_0__1__Impl1452); - this.rule__MetricModel__ImportURIAssignment_0_1(); + rule__MetricModel__ImportURIAssignment_0_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1()); + this.after(grammarAccess.getMetricModelAccess().getImportURIAssignment_0_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__1__Impl" @@ -2036,7 +1989,7 @@ public final void rule__MetricModel__Group_0__1__Impl() throws RecognitionExcept // rule__MetricModel__Group_0__2 : rule__MetricModel__Group_0__2__Impl ; public final void rule__MetricModel__Group_0__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:741:1: @@ -2044,22 +1997,21 @@ public final void rule__MetricModel__Group_0__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:742:2: // rule__MetricModel__Group_0__2__Impl { - this.pushFollow(FOLLOW_rule__MetricModel__Group_0__2__Impl_in_rule__MetricModel__Group_0__21482); - this.rule__MetricModel__Group_0__2__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_0__2__Impl_in_rule__MetricModel__Group_0__21482); + rule__MetricModel__Group_0__2__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__2" @@ -2068,7 +2020,7 @@ public final void rule__MetricModel__Group_0__2() throws RecognitionException { // rule__MetricModel__Group_0__2__Impl : ( ';' ) ; public final void rule__MetricModel__Group_0__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:752:1: @@ -2081,23 +2033,22 @@ public final void rule__MetricModel__Group_0__2__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:754:1: // ';' { - this.before(this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); - this.match(this.input, 16, FOLLOW_16_in_rule__MetricModel__Group_0__2__Impl1510); - this.after(this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); + this.before(grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); + match(input, 16, FOLLOW_16_in_rule__MetricModel__Group_0__2__Impl1510); + this.after(grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_0__2__Impl" @@ -2107,7 +2058,7 @@ public final void rule__MetricModel__Group_0__2__Impl() throws RecognitionExcept // rule__MetricModel__Group_1__1 ; public final void rule__MetricModel__Group_1__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:777:1: @@ -2115,27 +2066,26 @@ public final void rule__MetricModel__Group_1__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:778:2: // rule__MetricModel__Group_1__0__Impl rule__MetricModel__Group_1__1 { - this.pushFollow(FOLLOW_rule__MetricModel__Group_1__0__Impl_in_rule__MetricModel__Group_1__01547); - this.rule__MetricModel__Group_1__0__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__0__Impl_in_rule__MetricModel__Group_1__01547); + rule__MetricModel__Group_1__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group_1__1_in_rule__MetricModel__Group_1__01550); - this.rule__MetricModel__Group_1__1(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__1_in_rule__MetricModel__Group_1__01550); + rule__MetricModel__Group_1__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__0" @@ -2144,7 +2094,7 @@ public final void rule__MetricModel__Group_1__0() throws RecognitionException { // rule__MetricModel__Group_1__0__Impl : ( 'extern' ) ; public final void rule__MetricModel__Group_1__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:789:1: @@ -2157,23 +2107,22 @@ public final void rule__MetricModel__Group_1__0__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:791:1: // 'extern' { - this.before(this.grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); - this.match(this.input, 17, FOLLOW_17_in_rule__MetricModel__Group_1__0__Impl1578); - this.after(this.grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); + this.before(grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); + match(input, 17, FOLLOW_17_in_rule__MetricModel__Group_1__0__Impl1578); + this.after(grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__0__Impl" @@ -2183,7 +2132,7 @@ public final void rule__MetricModel__Group_1__0__Impl() throws RecognitionExcept // rule__MetricModel__Group_1__2 ; public final void rule__MetricModel__Group_1__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:808:1: @@ -2191,36 +2140,36 @@ public final void rule__MetricModel__Group_1__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:809:2: // rule__MetricModel__Group_1__1__Impl rule__MetricModel__Group_1__2 { - this.pushFollow(FOLLOW_rule__MetricModel__Group_1__1__Impl_in_rule__MetricModel__Group_1__11609); - this.rule__MetricModel__Group_1__1__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__1__Impl_in_rule__MetricModel__Group_1__11609); + rule__MetricModel__Group_1__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricModel__Group_1__2_in_rule__MetricModel__Group_1__11612); - this.rule__MetricModel__Group_1__2(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__2_in_rule__MetricModel__Group_1__11612); + rule__MetricModel__Group_1__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__1" // $ANTLR start "rule__MetricModel__Group_1__1__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:816:1: - // rule__MetricModel__Group_1__1__Impl : ( ( rule__MetricModel__MetricsAssignment_1_1 ) ) ; + // rule__MetricModel__Group_1__1__Impl : ( ( + // rule__MetricModel__MetricsAssignment_1_1 ) ) ; public final void rule__MetricModel__Group_1__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:820:1: @@ -2233,35 +2182,34 @@ public final void rule__MetricModel__Group_1__1__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:822:1: // ( rule__MetricModel__MetricsAssignment_1_1 ) { - this.before(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1()); + this.before(grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:823:1: // ( rule__MetricModel__MetricsAssignment_1_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:823:2: // rule__MetricModel__MetricsAssignment_1_1 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricModel__MetricsAssignment_1_1_in_rule__MetricModel__Group_1__1__Impl1639); - this.rule__MetricModel__MetricsAssignment_1_1(); + rule__MetricModel__MetricsAssignment_1_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1()); + this.after(grammarAccess.getMetricModelAccess().getMetricsAssignment_1_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__1__Impl" @@ -2270,7 +2218,7 @@ public final void rule__MetricModel__Group_1__1__Impl() throws RecognitionExcept // rule__MetricModel__Group_1__2 : rule__MetricModel__Group_1__2__Impl ; public final void rule__MetricModel__Group_1__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:837:1: @@ -2278,22 +2226,21 @@ public final void rule__MetricModel__Group_1__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:838:2: // rule__MetricModel__Group_1__2__Impl { - this.pushFollow(FOLLOW_rule__MetricModel__Group_1__2__Impl_in_rule__MetricModel__Group_1__21669); - this.rule__MetricModel__Group_1__2__Impl(); + pushFollow(FOLLOW_rule__MetricModel__Group_1__2__Impl_in_rule__MetricModel__Group_1__21669); + rule__MetricModel__Group_1__2__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__2" @@ -2302,7 +2249,7 @@ public final void rule__MetricModel__Group_1__2() throws RecognitionException { // rule__MetricModel__Group_1__2__Impl : ( ';' ) ; public final void rule__MetricModel__Group_1__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:848:1: @@ -2315,23 +2262,22 @@ public final void rule__MetricModel__Group_1__2__Impl() throws RecognitionExcept // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:850:1: // ';' { - this.before(this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); - this.match(this.input, 16, FOLLOW_16_in_rule__MetricModel__Group_1__2__Impl1697); - this.after(this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); + this.before(grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); + match(input, 16, FOLLOW_16_in_rule__MetricModel__Group_1__2__Impl1697); + this.after(grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__Group_1__2__Impl" @@ -2341,7 +2287,7 @@ public final void rule__MetricModel__Group_1__2__Impl() throws RecognitionExcept // rule__InternalMetric__Group__1 ; public final void rule__InternalMetric__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:873:1: @@ -2349,27 +2295,26 @@ public final void rule__InternalMetric__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:874:2: // rule__InternalMetric__Group__0__Impl rule__InternalMetric__Group__1 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__0__Impl_in_rule__InternalMetric__Group__01734); - this.rule__InternalMetric__Group__0__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__0__Impl_in_rule__InternalMetric__Group__01734); + rule__InternalMetric__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__1_in_rule__InternalMetric__Group__01737); - this.rule__InternalMetric__Group__1(); + pushFollow(FOLLOW_rule__InternalMetric__Group__1_in_rule__InternalMetric__Group__01737); + rule__InternalMetric__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__0" @@ -2378,7 +2323,7 @@ public final void rule__InternalMetric__Group__0() throws RecognitionException { // rule__InternalMetric__Group__0__Impl : ( 'Metric' ) ; public final void rule__InternalMetric__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:885:1: @@ -2391,23 +2336,22 @@ public final void rule__InternalMetric__Group__0__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:887:1: // 'Metric' { - this.before(this.grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); - this.match(this.input, 18, FOLLOW_18_in_rule__InternalMetric__Group__0__Impl1765); - this.after(this.grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); + this.before(grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); + match(input, 18, FOLLOW_18_in_rule__InternalMetric__Group__0__Impl1765); + this.after(grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__0__Impl" @@ -2417,7 +2361,7 @@ public final void rule__InternalMetric__Group__0__Impl() throws RecognitionExcep // rule__InternalMetric__Group__2 ; public final void rule__InternalMetric__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:904:1: @@ -2425,36 +2369,36 @@ public final void rule__InternalMetric__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:905:2: // rule__InternalMetric__Group__1__Impl rule__InternalMetric__Group__2 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__1__Impl_in_rule__InternalMetric__Group__11796); - this.rule__InternalMetric__Group__1__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__1__Impl_in_rule__InternalMetric__Group__11796); + rule__InternalMetric__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__2_in_rule__InternalMetric__Group__11799); - this.rule__InternalMetric__Group__2(); + pushFollow(FOLLOW_rule__InternalMetric__Group__2_in_rule__InternalMetric__Group__11799); + rule__InternalMetric__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__1" // $ANTLR start "rule__InternalMetric__Group__1__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:912:1: - // rule__InternalMetric__Group__1__Impl : ( ( rule__InternalMetric__NameAssignment_1 ) ) ; + // rule__InternalMetric__Group__1__Impl : ( ( + // rule__InternalMetric__NameAssignment_1 ) ) ; public final void rule__InternalMetric__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:916:1: @@ -2467,35 +2411,34 @@ public final void rule__InternalMetric__Group__1__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:918:1: // ( rule__InternalMetric__NameAssignment_1 ) { - this.before(this.grammarAccess.getInternalMetricAccess().getNameAssignment_1()); + this.before(grammarAccess.getInternalMetricAccess().getNameAssignment_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:919:1: // ( rule__InternalMetric__NameAssignment_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:919:2: // rule__InternalMetric__NameAssignment_1 { - this.pushFollow( + pushFollow( FOLLOW_rule__InternalMetric__NameAssignment_1_in_rule__InternalMetric__Group__1__Impl1826); - this.rule__InternalMetric__NameAssignment_1(); + rule__InternalMetric__NameAssignment_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getInternalMetricAccess().getNameAssignment_1()); + this.after(grammarAccess.getInternalMetricAccess().getNameAssignment_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__1__Impl" @@ -2505,7 +2448,7 @@ public final void rule__InternalMetric__Group__1__Impl() throws RecognitionExcep // rule__InternalMetric__Group__3 ; public final void rule__InternalMetric__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:933:1: @@ -2513,27 +2456,26 @@ public final void rule__InternalMetric__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:934:2: // rule__InternalMetric__Group__2__Impl rule__InternalMetric__Group__3 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__2__Impl_in_rule__InternalMetric__Group__21856); - this.rule__InternalMetric__Group__2__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__2__Impl_in_rule__InternalMetric__Group__21856); + rule__InternalMetric__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__3_in_rule__InternalMetric__Group__21859); - this.rule__InternalMetric__Group__3(); + pushFollow(FOLLOW_rule__InternalMetric__Group__3_in_rule__InternalMetric__Group__21859); + rule__InternalMetric__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__2" @@ -2542,7 +2484,7 @@ public final void rule__InternalMetric__Group__2() throws RecognitionException { // rule__InternalMetric__Group__2__Impl : ( '(' ) ; public final void rule__InternalMetric__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:945:1: @@ -2555,23 +2497,22 @@ public final void rule__InternalMetric__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:947:1: // '(' { - this.before(this.grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); - this.match(this.input, 19, FOLLOW_19_in_rule__InternalMetric__Group__2__Impl1887); - this.after(this.grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); + this.before(grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); + match(input, 19, FOLLOW_19_in_rule__InternalMetric__Group__2__Impl1887); + this.after(grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__2__Impl" @@ -2581,7 +2522,7 @@ public final void rule__InternalMetric__Group__2__Impl() throws RecognitionExcep // rule__InternalMetric__Group__4 ; public final void rule__InternalMetric__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:964:1: @@ -2589,36 +2530,36 @@ public final void rule__InternalMetric__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:965:2: // rule__InternalMetric__Group__3__Impl rule__InternalMetric__Group__4 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__3__Impl_in_rule__InternalMetric__Group__31918); - this.rule__InternalMetric__Group__3__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__3__Impl_in_rule__InternalMetric__Group__31918); + rule__InternalMetric__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__4_in_rule__InternalMetric__Group__31921); - this.rule__InternalMetric__Group__4(); + pushFollow(FOLLOW_rule__InternalMetric__Group__4_in_rule__InternalMetric__Group__31921); + rule__InternalMetric__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__3" // $ANTLR start "rule__InternalMetric__Group__3__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:972:1: - // rule__InternalMetric__Group__3__Impl : ( ( rule__InternalMetric__ShortNameAssignment_3 ) ) ; + // rule__InternalMetric__Group__3__Impl : ( ( + // rule__InternalMetric__ShortNameAssignment_3 ) ) ; public final void rule__InternalMetric__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:976:1: @@ -2631,35 +2572,34 @@ public final void rule__InternalMetric__Group__3__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:978:1: // ( rule__InternalMetric__ShortNameAssignment_3 ) { - this.before(this.grammarAccess.getInternalMetricAccess().getShortNameAssignment_3()); + this.before(grammarAccess.getInternalMetricAccess().getShortNameAssignment_3()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:979:1: // ( rule__InternalMetric__ShortNameAssignment_3 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:979:2: // rule__InternalMetric__ShortNameAssignment_3 { - this.pushFollow( + pushFollow( FOLLOW_rule__InternalMetric__ShortNameAssignment_3_in_rule__InternalMetric__Group__3__Impl1948); - this.rule__InternalMetric__ShortNameAssignment_3(); + rule__InternalMetric__ShortNameAssignment_3(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getInternalMetricAccess().getShortNameAssignment_3()); + this.after(grammarAccess.getInternalMetricAccess().getShortNameAssignment_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__3__Impl" @@ -2669,7 +2609,7 @@ public final void rule__InternalMetric__Group__3__Impl() throws RecognitionExcep // rule__InternalMetric__Group__5 ; public final void rule__InternalMetric__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:993:1: @@ -2677,27 +2617,26 @@ public final void rule__InternalMetric__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:994:2: // rule__InternalMetric__Group__4__Impl rule__InternalMetric__Group__5 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__4__Impl_in_rule__InternalMetric__Group__41978); - this.rule__InternalMetric__Group__4__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__4__Impl_in_rule__InternalMetric__Group__41978); + rule__InternalMetric__Group__4__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__5_in_rule__InternalMetric__Group__41981); - this.rule__InternalMetric__Group__5(); + pushFollow(FOLLOW_rule__InternalMetric__Group__5_in_rule__InternalMetric__Group__41981); + rule__InternalMetric__Group__5(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__4" @@ -2706,7 +2645,7 @@ public final void rule__InternalMetric__Group__4() throws RecognitionException { // rule__InternalMetric__Group__4__Impl : ( ',' ) ; public final void rule__InternalMetric__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1005:1: @@ -2719,23 +2658,22 @@ public final void rule__InternalMetric__Group__4__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1007:1: // ',' { - this.before(this.grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); - this.match(this.input, 20, FOLLOW_20_in_rule__InternalMetric__Group__4__Impl2009); - this.after(this.grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); + this.before(grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); + match(input, 20, FOLLOW_20_in_rule__InternalMetric__Group__4__Impl2009); + this.after(grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__4__Impl" @@ -2745,7 +2683,7 @@ public final void rule__InternalMetric__Group__4__Impl() throws RecognitionExcep // rule__InternalMetric__Group__6 ; public final void rule__InternalMetric__Group__5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1024:1: @@ -2753,37 +2691,37 @@ public final void rule__InternalMetric__Group__5() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1025:2: // rule__InternalMetric__Group__5__Impl rule__InternalMetric__Group__6 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__5__Impl_in_rule__InternalMetric__Group__52040); - this.rule__InternalMetric__Group__5__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__5__Impl_in_rule__InternalMetric__Group__52040); + rule__InternalMetric__Group__5__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__6_in_rule__InternalMetric__Group__52043); - this.rule__InternalMetric__Group__6(); + pushFollow(FOLLOW_rule__InternalMetric__Group__6_in_rule__InternalMetric__Group__52043); + rule__InternalMetric__Group__6(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__5" // $ANTLR start "rule__InternalMetric__Group__5__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1032:1: - // rule__InternalMetric__Group__5__Impl : ( ( rule__InternalMetric__DescriptionAssignment_5 ) ) + // rule__InternalMetric__Group__5__Impl : ( ( + // rule__InternalMetric__DescriptionAssignment_5 ) ) // ; public final void rule__InternalMetric__Group__5__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1036:1: @@ -2796,35 +2734,34 @@ public final void rule__InternalMetric__Group__5__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1038:1: // ( rule__InternalMetric__DescriptionAssignment_5 ) { - this.before(this.grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5()); + this.before(grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1039:1: // ( rule__InternalMetric__DescriptionAssignment_5 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1039:2: // rule__InternalMetric__DescriptionAssignment_5 { - this.pushFollow( + pushFollow( FOLLOW_rule__InternalMetric__DescriptionAssignment_5_in_rule__InternalMetric__Group__5__Impl2070); - this.rule__InternalMetric__DescriptionAssignment_5(); + rule__InternalMetric__DescriptionAssignment_5(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5()); + this.after(grammarAccess.getInternalMetricAccess().getDescriptionAssignment_5()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__5__Impl" @@ -2834,7 +2771,7 @@ public final void rule__InternalMetric__Group__5__Impl() throws RecognitionExcep // rule__InternalMetric__Group__7 ; public final void rule__InternalMetric__Group__6() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1053:1: @@ -2842,27 +2779,26 @@ public final void rule__InternalMetric__Group__6() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1054:2: // rule__InternalMetric__Group__6__Impl rule__InternalMetric__Group__7 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__6__Impl_in_rule__InternalMetric__Group__62100); - this.rule__InternalMetric__Group__6__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__6__Impl_in_rule__InternalMetric__Group__62100); + rule__InternalMetric__Group__6__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__7_in_rule__InternalMetric__Group__62103); - this.rule__InternalMetric__Group__7(); + pushFollow(FOLLOW_rule__InternalMetric__Group__7_in_rule__InternalMetric__Group__62103); + rule__InternalMetric__Group__7(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__6" @@ -2871,7 +2807,7 @@ public final void rule__InternalMetric__Group__6() throws RecognitionException { // rule__InternalMetric__Group__6__Impl : ( ')' ) ; public final void rule__InternalMetric__Group__6__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1065:1: @@ -2884,23 +2820,22 @@ public final void rule__InternalMetric__Group__6__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1067:1: // ')' { - this.before(this.grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); - this.match(this.input, 21, FOLLOW_21_in_rule__InternalMetric__Group__6__Impl2131); - this.after(this.grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); + this.before(grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); + match(input, 21, FOLLOW_21_in_rule__InternalMetric__Group__6__Impl2131); + this.after(grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__6__Impl" @@ -2910,7 +2845,7 @@ public final void rule__InternalMetric__Group__6__Impl() throws RecognitionExcep // rule__InternalMetric__Group__8 ; public final void rule__InternalMetric__Group__7() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1084:1: @@ -2918,27 +2853,26 @@ public final void rule__InternalMetric__Group__7() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1085:2: // rule__InternalMetric__Group__7__Impl rule__InternalMetric__Group__8 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__7__Impl_in_rule__InternalMetric__Group__72162); - this.rule__InternalMetric__Group__7__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__7__Impl_in_rule__InternalMetric__Group__72162); + rule__InternalMetric__Group__7__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__8_in_rule__InternalMetric__Group__72165); - this.rule__InternalMetric__Group__8(); + pushFollow(FOLLOW_rule__InternalMetric__Group__8_in_rule__InternalMetric__Group__72165); + rule__InternalMetric__Group__8(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__7" @@ -2947,7 +2881,7 @@ public final void rule__InternalMetric__Group__7() throws RecognitionException { // rule__InternalMetric__Group__7__Impl : ( '{' ) ; public final void rule__InternalMetric__Group__7__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1096:1: @@ -2960,23 +2894,22 @@ public final void rule__InternalMetric__Group__7__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1098:1: // '{' { - this.before(this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); - this.match(this.input, 13, FOLLOW_13_in_rule__InternalMetric__Group__7__Impl2193); - this.after(this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); + this.before(grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); + match(input, 13, FOLLOW_13_in_rule__InternalMetric__Group__7__Impl2193); + this.after(grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__7__Impl" @@ -2986,7 +2919,7 @@ public final void rule__InternalMetric__Group__7__Impl() throws RecognitionExcep // rule__InternalMetric__Group__9 ; public final void rule__InternalMetric__Group__8() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1115:1: @@ -2994,36 +2927,36 @@ public final void rule__InternalMetric__Group__8() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1116:2: // rule__InternalMetric__Group__8__Impl rule__InternalMetric__Group__9 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__8__Impl_in_rule__InternalMetric__Group__82224); - this.rule__InternalMetric__Group__8__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__8__Impl_in_rule__InternalMetric__Group__82224); + rule__InternalMetric__Group__8__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__9_in_rule__InternalMetric__Group__82227); - this.rule__InternalMetric__Group__9(); + pushFollow(FOLLOW_rule__InternalMetric__Group__9_in_rule__InternalMetric__Group__82227); + rule__InternalMetric__Group__9(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__8" // $ANTLR start "rule__InternalMetric__Group__8__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1123:1: - // rule__InternalMetric__Group__8__Impl : ( ( rule__InternalMetric__Group_8__0 )? ) ; + // rule__InternalMetric__Group__8__Impl : ( ( rule__InternalMetric__Group_8__0 + // )? ) ; public final void rule__InternalMetric__Group__8__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1127:1: @@ -3036,11 +2969,11 @@ public final void rule__InternalMetric__Group__8__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1129:1: // ( rule__InternalMetric__Group_8__0 )? { - this.before(this.grammarAccess.getInternalMetricAccess().getGroup_8()); + this.before(grammarAccess.getInternalMetricAccess().getGroup_8()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1130:1: // ( rule__InternalMetric__Group_8__0 )? int alt6 = 2; - final int LA6_0 = this.input.LA(1); + final int LA6_0 = input.LA(1); if ((LA6_0 == 23)) { alt6 = 1; @@ -3050,32 +2983,30 @@ public final void rule__InternalMetric__Group__8__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1130:2: // rule__InternalMetric__Group_8__0 { - this.pushFollow( - FOLLOW_rule__InternalMetric__Group_8__0_in_rule__InternalMetric__Group__8__Impl2254); - this.rule__InternalMetric__Group_8__0(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__0_in_rule__InternalMetric__Group__8__Impl2254); + rule__InternalMetric__Group_8__0(); - this.state._fsp--; + state._fsp--; } break; } - this.after(this.grammarAccess.getInternalMetricAccess().getGroup_8()); + this.after(grammarAccess.getInternalMetricAccess().getGroup_8()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__8__Impl" @@ -3085,7 +3016,7 @@ public final void rule__InternalMetric__Group__8__Impl() throws RecognitionExcep // rule__InternalMetric__Group__10 ; public final void rule__InternalMetric__Group__9() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1144:1: @@ -3093,36 +3024,36 @@ public final void rule__InternalMetric__Group__9() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1145:2: // rule__InternalMetric__Group__9__Impl rule__InternalMetric__Group__10 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__9__Impl_in_rule__InternalMetric__Group__92285); - this.rule__InternalMetric__Group__9__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__9__Impl_in_rule__InternalMetric__Group__92285); + rule__InternalMetric__Group__9__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group__10_in_rule__InternalMetric__Group__92288); - this.rule__InternalMetric__Group__10(); + pushFollow(FOLLOW_rule__InternalMetric__Group__10_in_rule__InternalMetric__Group__92288); + rule__InternalMetric__Group__10(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__9" // $ANTLR start "rule__InternalMetric__Group__9__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1152:1: - // rule__InternalMetric__Group__9__Impl : ( ( rule__InternalMetric__DefinitionAssignment_9 ) ) ; + // rule__InternalMetric__Group__9__Impl : ( ( + // rule__InternalMetric__DefinitionAssignment_9 ) ) ; public final void rule__InternalMetric__Group__9__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1156:1: @@ -3135,35 +3066,34 @@ public final void rule__InternalMetric__Group__9__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1158:1: // ( rule__InternalMetric__DefinitionAssignment_9 ) { - this.before(this.grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9()); + this.before(grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1159:1: // ( rule__InternalMetric__DefinitionAssignment_9 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1159:2: // rule__InternalMetric__DefinitionAssignment_9 { - this.pushFollow( + pushFollow( FOLLOW_rule__InternalMetric__DefinitionAssignment_9_in_rule__InternalMetric__Group__9__Impl2315); - this.rule__InternalMetric__DefinitionAssignment_9(); + rule__InternalMetric__DefinitionAssignment_9(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9()); + this.after(grammarAccess.getInternalMetricAccess().getDefinitionAssignment_9()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__9__Impl" @@ -3172,7 +3102,7 @@ public final void rule__InternalMetric__Group__9__Impl() throws RecognitionExcep // rule__InternalMetric__Group__10 : rule__InternalMetric__Group__10__Impl ; public final void rule__InternalMetric__Group__10() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1173:1: @@ -3180,22 +3110,21 @@ public final void rule__InternalMetric__Group__10() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1174:2: // rule__InternalMetric__Group__10__Impl { - this.pushFollow(FOLLOW_rule__InternalMetric__Group__10__Impl_in_rule__InternalMetric__Group__102345); - this.rule__InternalMetric__Group__10__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group__10__Impl_in_rule__InternalMetric__Group__102345); + rule__InternalMetric__Group__10__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__10" @@ -3204,7 +3133,7 @@ public final void rule__InternalMetric__Group__10() throws RecognitionException // rule__InternalMetric__Group__10__Impl : ( '};' ) ; public final void rule__InternalMetric__Group__10__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1184:1: @@ -3217,23 +3146,22 @@ public final void rule__InternalMetric__Group__10__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1186:1: // '};' { - this.before(this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); - this.match(this.input, 22, FOLLOW_22_in_rule__InternalMetric__Group__10__Impl2373); - this.after(this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); + this.before(grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); + match(input, 22, FOLLOW_22_in_rule__InternalMetric__Group__10__Impl2373); + this.after(grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group__10__Impl" @@ -3243,7 +3171,7 @@ public final void rule__InternalMetric__Group__10__Impl() throws RecognitionExce // rule__InternalMetric__Group_8__1 ; public final void rule__InternalMetric__Group_8__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1225:1: @@ -3251,27 +3179,26 @@ public final void rule__InternalMetric__Group_8__0() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1226:2: // rule__InternalMetric__Group_8__0__Impl rule__InternalMetric__Group_8__1 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__0__Impl_in_rule__InternalMetric__Group_8__02426); - this.rule__InternalMetric__Group_8__0__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__0__Impl_in_rule__InternalMetric__Group_8__02426); + rule__InternalMetric__Group_8__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__1_in_rule__InternalMetric__Group_8__02429); - this.rule__InternalMetric__Group_8__1(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__1_in_rule__InternalMetric__Group_8__02429); + rule__InternalMetric__Group_8__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__0" @@ -3280,7 +3207,7 @@ public final void rule__InternalMetric__Group_8__0() throws RecognitionException // rule__InternalMetric__Group_8__0__Impl : ( 'parameters' ) ; public final void rule__InternalMetric__Group_8__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1237:1: @@ -3293,23 +3220,22 @@ public final void rule__InternalMetric__Group_8__0__Impl() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1239:1: // 'parameters' { - this.before(this.grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); - this.match(this.input, 23, FOLLOW_23_in_rule__InternalMetric__Group_8__0__Impl2457); - this.after(this.grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); + this.before(grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); + match(input, 23, FOLLOW_23_in_rule__InternalMetric__Group_8__0__Impl2457); + this.after(grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__0__Impl" @@ -3319,7 +3245,7 @@ public final void rule__InternalMetric__Group_8__0__Impl() throws RecognitionExc // rule__InternalMetric__Group_8__2 ; public final void rule__InternalMetric__Group_8__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1256:1: @@ -3327,27 +3253,26 @@ public final void rule__InternalMetric__Group_8__1() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1257:2: // rule__InternalMetric__Group_8__1__Impl rule__InternalMetric__Group_8__2 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__1__Impl_in_rule__InternalMetric__Group_8__12488); - this.rule__InternalMetric__Group_8__1__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__1__Impl_in_rule__InternalMetric__Group_8__12488); + rule__InternalMetric__Group_8__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__2_in_rule__InternalMetric__Group_8__12491); - this.rule__InternalMetric__Group_8__2(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__2_in_rule__InternalMetric__Group_8__12491); + rule__InternalMetric__Group_8__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__1" @@ -3356,7 +3281,7 @@ public final void rule__InternalMetric__Group_8__1() throws RecognitionException // rule__InternalMetric__Group_8__1__Impl : ( '{' ) ; public final void rule__InternalMetric__Group_8__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1268:1: @@ -3369,23 +3294,22 @@ public final void rule__InternalMetric__Group_8__1__Impl() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1270:1: // '{' { - this.before(this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); - this.match(this.input, 13, FOLLOW_13_in_rule__InternalMetric__Group_8__1__Impl2519); - this.after(this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); + this.before(grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); + match(input, 13, FOLLOW_13_in_rule__InternalMetric__Group_8__1__Impl2519); + this.after(grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__1__Impl" @@ -3395,7 +3319,7 @@ public final void rule__InternalMetric__Group_8__1__Impl() throws RecognitionExc // rule__InternalMetric__Group_8__3 ; public final void rule__InternalMetric__Group_8__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1287:1: @@ -3403,37 +3327,37 @@ public final void rule__InternalMetric__Group_8__2() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1288:2: // rule__InternalMetric__Group_8__2__Impl rule__InternalMetric__Group_8__3 { - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__2__Impl_in_rule__InternalMetric__Group_8__22550); - this.rule__InternalMetric__Group_8__2__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__2__Impl_in_rule__InternalMetric__Group_8__22550); + rule__InternalMetric__Group_8__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__3_in_rule__InternalMetric__Group_8__22553); - this.rule__InternalMetric__Group_8__3(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__3_in_rule__InternalMetric__Group_8__22553); + rule__InternalMetric__Group_8__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__2" // $ANTLR start "rule__InternalMetric__Group_8__2__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1295:1: - // rule__InternalMetric__Group_8__2__Impl : ( ( rule__InternalMetric__ParameterAssignment_8_2 )* + // rule__InternalMetric__Group_8__2__Impl : ( ( + // rule__InternalMetric__ParameterAssignment_8_2 )* // ) ; public final void rule__InternalMetric__Group_8__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1299:1: @@ -3446,14 +3370,14 @@ public final void rule__InternalMetric__Group_8__2__Impl() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1301:1: // ( rule__InternalMetric__ParameterAssignment_8_2 )* { - this.before(this.grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2()); + this.before(grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1302:1: // ( rule__InternalMetric__ParameterAssignment_8_2 )* loop7: do { int alt7 = 2; - final int LA7_0 = this.input.LA(1); + final int LA7_0 = input.LA(1); - if (((LA7_0 >= 24 && LA7_0 <= 25))) { + if ((((LA7_0 >= 24) && (LA7_0 <= 25)))) { alt7 = 1; } @@ -3462,11 +3386,11 @@ public final void rule__InternalMetric__Group_8__2__Impl() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1302:2: // rule__InternalMetric__ParameterAssignment_8_2 { - this.pushFollow( + pushFollow( FOLLOW_rule__InternalMetric__ParameterAssignment_8_2_in_rule__InternalMetric__Group_8__2__Impl2580); - this.rule__InternalMetric__ParameterAssignment_8_2(); + rule__InternalMetric__ParameterAssignment_8_2(); - this.state._fsp--; + state._fsp--; } break; @@ -3476,21 +3400,20 @@ public final void rule__InternalMetric__Group_8__2__Impl() throws RecognitionExc } } while (true); - this.after(this.grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2()); + this.after(grammarAccess.getInternalMetricAccess().getParameterAssignment_8_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__2__Impl" @@ -3499,7 +3422,7 @@ public final void rule__InternalMetric__Group_8__2__Impl() throws RecognitionExc // rule__InternalMetric__Group_8__3 : rule__InternalMetric__Group_8__3__Impl ; public final void rule__InternalMetric__Group_8__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1316:1: @@ -3507,22 +3430,21 @@ public final void rule__InternalMetric__Group_8__3() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1317:2: // rule__InternalMetric__Group_8__3__Impl { - this.pushFollow(FOLLOW_rule__InternalMetric__Group_8__3__Impl_in_rule__InternalMetric__Group_8__32611); - this.rule__InternalMetric__Group_8__3__Impl(); + pushFollow(FOLLOW_rule__InternalMetric__Group_8__3__Impl_in_rule__InternalMetric__Group_8__32611); + rule__InternalMetric__Group_8__3__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__3" @@ -3531,7 +3453,7 @@ public final void rule__InternalMetric__Group_8__3() throws RecognitionException // rule__InternalMetric__Group_8__3__Impl : ( '}' ) ; public final void rule__InternalMetric__Group_8__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1327:1: @@ -3544,32 +3466,32 @@ public final void rule__InternalMetric__Group_8__3__Impl() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1329:1: // '}' { - this.before(this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); - this.match(this.input, 14, FOLLOW_14_in_rule__InternalMetric__Group_8__3__Impl2639); - this.after(this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); + this.before(grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); + match(input, 14, FOLLOW_14_in_rule__InternalMetric__Group_8__3__Impl2639); + this.after(grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__Group_8__3__Impl" // $ANTLR start "rule__Parameter__Group__0" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1350:1: - // rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ; + // rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl + // rule__Parameter__Group__1 ; public final void rule__Parameter__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1354:1: @@ -3577,27 +3499,26 @@ public final void rule__Parameter__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1355:2: // rule__Parameter__Group__0__Impl rule__Parameter__Group__1 { - this.pushFollow(FOLLOW_rule__Parameter__Group__0__Impl_in_rule__Parameter__Group__02678); - this.rule__Parameter__Group__0__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__0__Impl_in_rule__Parameter__Group__02678); + rule__Parameter__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__1_in_rule__Parameter__Group__02681); - this.rule__Parameter__Group__1(); + pushFollow(FOLLOW_rule__Parameter__Group__1_in_rule__Parameter__Group__02681); + rule__Parameter__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__0" @@ -3606,7 +3527,7 @@ public final void rule__Parameter__Group__0() throws RecognitionException { // rule__Parameter__Group__0__Impl : ( 'Parameter' ) ; public final void rule__Parameter__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1366:1: @@ -3619,32 +3540,32 @@ public final void rule__Parameter__Group__0__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1368:1: // 'Parameter' { - this.before(this.grammarAccess.getParameterAccess().getParameterKeyword_0()); - this.match(this.input, 24, FOLLOW_24_in_rule__Parameter__Group__0__Impl2709); - this.after(this.grammarAccess.getParameterAccess().getParameterKeyword_0()); + this.before(grammarAccess.getParameterAccess().getParameterKeyword_0()); + match(input, 24, FOLLOW_24_in_rule__Parameter__Group__0__Impl2709); + this.after(grammarAccess.getParameterAccess().getParameterKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__0__Impl" // $ANTLR start "rule__Parameter__Group__1" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1381:1: - // rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl rule__Parameter__Group__2 ; + // rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl + // rule__Parameter__Group__2 ; public final void rule__Parameter__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1385:1: @@ -3652,27 +3573,26 @@ public final void rule__Parameter__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1386:2: // rule__Parameter__Group__1__Impl rule__Parameter__Group__2 { - this.pushFollow(FOLLOW_rule__Parameter__Group__1__Impl_in_rule__Parameter__Group__12740); - this.rule__Parameter__Group__1__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__1__Impl_in_rule__Parameter__Group__12740); + rule__Parameter__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__2_in_rule__Parameter__Group__12743); - this.rule__Parameter__Group__2(); + pushFollow(FOLLOW_rule__Parameter__Group__2_in_rule__Parameter__Group__12743); + rule__Parameter__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__1" @@ -3681,7 +3601,7 @@ public final void rule__Parameter__Group__1() throws RecognitionException { // rule__Parameter__Group__1__Impl : ( ( rule__Parameter__NameAssignment_1 ) ) ; public final void rule__Parameter__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1397:1: @@ -3694,44 +3614,43 @@ public final void rule__Parameter__Group__1__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1399:1: // ( rule__Parameter__NameAssignment_1 ) { - this.before(this.grammarAccess.getParameterAccess().getNameAssignment_1()); + this.before(grammarAccess.getParameterAccess().getNameAssignment_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1400:1: // ( rule__Parameter__NameAssignment_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1400:2: // rule__Parameter__NameAssignment_1 { - this.pushFollow( - FOLLOW_rule__Parameter__NameAssignment_1_in_rule__Parameter__Group__1__Impl2770); - this.rule__Parameter__NameAssignment_1(); + pushFollow(FOLLOW_rule__Parameter__NameAssignment_1_in_rule__Parameter__Group__1__Impl2770); + rule__Parameter__NameAssignment_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getParameterAccess().getNameAssignment_1()); + this.after(grammarAccess.getParameterAccess().getNameAssignment_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__1__Impl" // $ANTLR start "rule__Parameter__Group__2" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1410:1: - // rule__Parameter__Group__2 : rule__Parameter__Group__2__Impl rule__Parameter__Group__3 ; + // rule__Parameter__Group__2 : rule__Parameter__Group__2__Impl + // rule__Parameter__Group__3 ; public final void rule__Parameter__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1414:1: @@ -3739,27 +3658,26 @@ public final void rule__Parameter__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1415:2: // rule__Parameter__Group__2__Impl rule__Parameter__Group__3 { - this.pushFollow(FOLLOW_rule__Parameter__Group__2__Impl_in_rule__Parameter__Group__22800); - this.rule__Parameter__Group__2__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__2__Impl_in_rule__Parameter__Group__22800); + rule__Parameter__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__3_in_rule__Parameter__Group__22803); - this.rule__Parameter__Group__3(); + pushFollow(FOLLOW_rule__Parameter__Group__3_in_rule__Parameter__Group__22803); + rule__Parameter__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__2" @@ -3768,7 +3686,7 @@ public final void rule__Parameter__Group__2() throws RecognitionException { // rule__Parameter__Group__2__Impl : ( '(' ) ; public final void rule__Parameter__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1426:1: @@ -3781,32 +3699,32 @@ public final void rule__Parameter__Group__2__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1428:1: // '(' { - this.before(this.grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); - this.match(this.input, 19, FOLLOW_19_in_rule__Parameter__Group__2__Impl2831); - this.after(this.grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); + this.before(grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); + match(input, 19, FOLLOW_19_in_rule__Parameter__Group__2__Impl2831); + this.after(grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__2__Impl" // $ANTLR start "rule__Parameter__Group__3" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1441:1: - // rule__Parameter__Group__3 : rule__Parameter__Group__3__Impl rule__Parameter__Group__4 ; + // rule__Parameter__Group__3 : rule__Parameter__Group__3__Impl + // rule__Parameter__Group__4 ; public final void rule__Parameter__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1445:1: @@ -3814,36 +3732,36 @@ public final void rule__Parameter__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1446:2: // rule__Parameter__Group__3__Impl rule__Parameter__Group__4 { - this.pushFollow(FOLLOW_rule__Parameter__Group__3__Impl_in_rule__Parameter__Group__32862); - this.rule__Parameter__Group__3__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__3__Impl_in_rule__Parameter__Group__32862); + rule__Parameter__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__4_in_rule__Parameter__Group__32865); - this.rule__Parameter__Group__4(); + pushFollow(FOLLOW_rule__Parameter__Group__4_in_rule__Parameter__Group__32865); + rule__Parameter__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__3" // $ANTLR start "rule__Parameter__Group__3__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1453:1: - // rule__Parameter__Group__3__Impl : ( ( rule__Parameter__ShortnameAssignment_3 ) ) ; + // rule__Parameter__Group__3__Impl : ( ( rule__Parameter__ShortnameAssignment_3 + // ) ) ; public final void rule__Parameter__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1457:1: @@ -3856,44 +3774,44 @@ public final void rule__Parameter__Group__3__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1459:1: // ( rule__Parameter__ShortnameAssignment_3 ) { - this.before(this.grammarAccess.getParameterAccess().getShortnameAssignment_3()); + this.before(grammarAccess.getParameterAccess().getShortnameAssignment_3()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1460:1: // ( rule__Parameter__ShortnameAssignment_3 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1460:2: // rule__Parameter__ShortnameAssignment_3 { - this.pushFollow( + pushFollow( FOLLOW_rule__Parameter__ShortnameAssignment_3_in_rule__Parameter__Group__3__Impl2892); - this.rule__Parameter__ShortnameAssignment_3(); + rule__Parameter__ShortnameAssignment_3(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getParameterAccess().getShortnameAssignment_3()); + this.after(grammarAccess.getParameterAccess().getShortnameAssignment_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__3__Impl" // $ANTLR start "rule__Parameter__Group__4" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1470:1: - // rule__Parameter__Group__4 : rule__Parameter__Group__4__Impl rule__Parameter__Group__5 ; + // rule__Parameter__Group__4 : rule__Parameter__Group__4__Impl + // rule__Parameter__Group__5 ; public final void rule__Parameter__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1474:1: @@ -3901,27 +3819,26 @@ public final void rule__Parameter__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1475:2: // rule__Parameter__Group__4__Impl rule__Parameter__Group__5 { - this.pushFollow(FOLLOW_rule__Parameter__Group__4__Impl_in_rule__Parameter__Group__42922); - this.rule__Parameter__Group__4__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__4__Impl_in_rule__Parameter__Group__42922); + rule__Parameter__Group__4__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__5_in_rule__Parameter__Group__42925); - this.rule__Parameter__Group__5(); + pushFollow(FOLLOW_rule__Parameter__Group__5_in_rule__Parameter__Group__42925); + rule__Parameter__Group__5(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__4" @@ -3930,7 +3847,7 @@ public final void rule__Parameter__Group__4() throws RecognitionException { // rule__Parameter__Group__4__Impl : ( ',' ) ; public final void rule__Parameter__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1486:1: @@ -3943,32 +3860,32 @@ public final void rule__Parameter__Group__4__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1488:1: // ',' { - this.before(this.grammarAccess.getParameterAccess().getCommaKeyword_4()); - this.match(this.input, 20, FOLLOW_20_in_rule__Parameter__Group__4__Impl2953); - this.after(this.grammarAccess.getParameterAccess().getCommaKeyword_4()); + this.before(grammarAccess.getParameterAccess().getCommaKeyword_4()); + match(input, 20, FOLLOW_20_in_rule__Parameter__Group__4__Impl2953); + this.after(grammarAccess.getParameterAccess().getCommaKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__4__Impl" // $ANTLR start "rule__Parameter__Group__5" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1501:1: - // rule__Parameter__Group__5 : rule__Parameter__Group__5__Impl rule__Parameter__Group__6 ; + // rule__Parameter__Group__5 : rule__Parameter__Group__5__Impl + // rule__Parameter__Group__6 ; public final void rule__Parameter__Group__5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1505:1: @@ -3976,36 +3893,36 @@ public final void rule__Parameter__Group__5() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1506:2: // rule__Parameter__Group__5__Impl rule__Parameter__Group__6 { - this.pushFollow(FOLLOW_rule__Parameter__Group__5__Impl_in_rule__Parameter__Group__52984); - this.rule__Parameter__Group__5__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__5__Impl_in_rule__Parameter__Group__52984); + rule__Parameter__Group__5__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__6_in_rule__Parameter__Group__52987); - this.rule__Parameter__Group__6(); + pushFollow(FOLLOW_rule__Parameter__Group__6_in_rule__Parameter__Group__52987); + rule__Parameter__Group__6(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__5" // $ANTLR start "rule__Parameter__Group__5__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1513:1: - // rule__Parameter__Group__5__Impl : ( ( rule__Parameter__DescriptionAssignment_5 ) ) ; + // rule__Parameter__Group__5__Impl : ( ( + // rule__Parameter__DescriptionAssignment_5 ) ) ; public final void rule__Parameter__Group__5__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1517:1: @@ -4018,44 +3935,44 @@ public final void rule__Parameter__Group__5__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1519:1: // ( rule__Parameter__DescriptionAssignment_5 ) { - this.before(this.grammarAccess.getParameterAccess().getDescriptionAssignment_5()); + this.before(grammarAccess.getParameterAccess().getDescriptionAssignment_5()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1520:1: // ( rule__Parameter__DescriptionAssignment_5 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1520:2: // rule__Parameter__DescriptionAssignment_5 { - this.pushFollow( + pushFollow( FOLLOW_rule__Parameter__DescriptionAssignment_5_in_rule__Parameter__Group__5__Impl3014); - this.rule__Parameter__DescriptionAssignment_5(); + rule__Parameter__DescriptionAssignment_5(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getParameterAccess().getDescriptionAssignment_5()); + this.after(grammarAccess.getParameterAccess().getDescriptionAssignment_5()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__5__Impl" // $ANTLR start "rule__Parameter__Group__6" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1530:1: - // rule__Parameter__Group__6 : rule__Parameter__Group__6__Impl rule__Parameter__Group__7 ; + // rule__Parameter__Group__6 : rule__Parameter__Group__6__Impl + // rule__Parameter__Group__7 ; public final void rule__Parameter__Group__6() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1534:1: @@ -4063,27 +3980,26 @@ public final void rule__Parameter__Group__6() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1535:2: // rule__Parameter__Group__6__Impl rule__Parameter__Group__7 { - this.pushFollow(FOLLOW_rule__Parameter__Group__6__Impl_in_rule__Parameter__Group__63044); - this.rule__Parameter__Group__6__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__6__Impl_in_rule__Parameter__Group__63044); + rule__Parameter__Group__6__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__7_in_rule__Parameter__Group__63047); - this.rule__Parameter__Group__7(); + pushFollow(FOLLOW_rule__Parameter__Group__7_in_rule__Parameter__Group__63047); + rule__Parameter__Group__7(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__6" @@ -4092,7 +4008,7 @@ public final void rule__Parameter__Group__6() throws RecognitionException { // rule__Parameter__Group__6__Impl : ( ',' ) ; public final void rule__Parameter__Group__6__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1546:1: @@ -4105,32 +4021,32 @@ public final void rule__Parameter__Group__6__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1548:1: // ',' { - this.before(this.grammarAccess.getParameterAccess().getCommaKeyword_6()); - this.match(this.input, 20, FOLLOW_20_in_rule__Parameter__Group__6__Impl3075); - this.after(this.grammarAccess.getParameterAccess().getCommaKeyword_6()); + this.before(grammarAccess.getParameterAccess().getCommaKeyword_6()); + match(input, 20, FOLLOW_20_in_rule__Parameter__Group__6__Impl3075); + this.after(grammarAccess.getParameterAccess().getCommaKeyword_6()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__6__Impl" // $ANTLR start "rule__Parameter__Group__7" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1561:1: - // rule__Parameter__Group__7 : rule__Parameter__Group__7__Impl rule__Parameter__Group__8 ; + // rule__Parameter__Group__7 : rule__Parameter__Group__7__Impl + // rule__Parameter__Group__8 ; public final void rule__Parameter__Group__7() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1565:1: @@ -4138,36 +4054,36 @@ public final void rule__Parameter__Group__7() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1566:2: // rule__Parameter__Group__7__Impl rule__Parameter__Group__8 { - this.pushFollow(FOLLOW_rule__Parameter__Group__7__Impl_in_rule__Parameter__Group__73106); - this.rule__Parameter__Group__7__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__7__Impl_in_rule__Parameter__Group__73106); + rule__Parameter__Group__7__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__8_in_rule__Parameter__Group__73109); - this.rule__Parameter__Group__8(); + pushFollow(FOLLOW_rule__Parameter__Group__8_in_rule__Parameter__Group__73109); + rule__Parameter__Group__8(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__7" // $ANTLR start "rule__Parameter__Group__7__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1573:1: - // rule__Parameter__Group__7__Impl : ( ( rule__Parameter__DefaultValueAssignment_7 ) ) ; + // rule__Parameter__Group__7__Impl : ( ( + // rule__Parameter__DefaultValueAssignment_7 ) ) ; public final void rule__Parameter__Group__7__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1577:1: @@ -4180,44 +4096,44 @@ public final void rule__Parameter__Group__7__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1579:1: // ( rule__Parameter__DefaultValueAssignment_7 ) { - this.before(this.grammarAccess.getParameterAccess().getDefaultValueAssignment_7()); + this.before(grammarAccess.getParameterAccess().getDefaultValueAssignment_7()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1580:1: // ( rule__Parameter__DefaultValueAssignment_7 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1580:2: // rule__Parameter__DefaultValueAssignment_7 { - this.pushFollow( + pushFollow( FOLLOW_rule__Parameter__DefaultValueAssignment_7_in_rule__Parameter__Group__7__Impl3136); - this.rule__Parameter__DefaultValueAssignment_7(); + rule__Parameter__DefaultValueAssignment_7(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getParameterAccess().getDefaultValueAssignment_7()); + this.after(grammarAccess.getParameterAccess().getDefaultValueAssignment_7()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__7__Impl" // $ANTLR start "rule__Parameter__Group__8" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1590:1: - // rule__Parameter__Group__8 : rule__Parameter__Group__8__Impl rule__Parameter__Group__9 ; + // rule__Parameter__Group__8 : rule__Parameter__Group__8__Impl + // rule__Parameter__Group__9 ; public final void rule__Parameter__Group__8() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1594:1: @@ -4225,27 +4141,26 @@ public final void rule__Parameter__Group__8() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1595:2: // rule__Parameter__Group__8__Impl rule__Parameter__Group__9 { - this.pushFollow(FOLLOW_rule__Parameter__Group__8__Impl_in_rule__Parameter__Group__83166); - this.rule__Parameter__Group__8__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__8__Impl_in_rule__Parameter__Group__83166); + rule__Parameter__Group__8__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Parameter__Group__9_in_rule__Parameter__Group__83169); - this.rule__Parameter__Group__9(); + pushFollow(FOLLOW_rule__Parameter__Group__9_in_rule__Parameter__Group__83169); + rule__Parameter__Group__9(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__8" @@ -4254,7 +4169,7 @@ public final void rule__Parameter__Group__8() throws RecognitionException { // rule__Parameter__Group__8__Impl : ( ')' ) ; public final void rule__Parameter__Group__8__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1606:1: @@ -4267,23 +4182,22 @@ public final void rule__Parameter__Group__8__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1608:1: // ')' { - this.before(this.grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); - this.match(this.input, 21, FOLLOW_21_in_rule__Parameter__Group__8__Impl3197); - this.after(this.grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); + this.before(grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); + match(input, 21, FOLLOW_21_in_rule__Parameter__Group__8__Impl3197); + this.after(grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__8__Impl" @@ -4292,7 +4206,7 @@ public final void rule__Parameter__Group__8__Impl() throws RecognitionException // rule__Parameter__Group__9 : rule__Parameter__Group__9__Impl ; public final void rule__Parameter__Group__9() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1625:1: @@ -4300,22 +4214,21 @@ public final void rule__Parameter__Group__9() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1626:2: // rule__Parameter__Group__9__Impl { - this.pushFollow(FOLLOW_rule__Parameter__Group__9__Impl_in_rule__Parameter__Group__93228); - this.rule__Parameter__Group__9__Impl(); + pushFollow(FOLLOW_rule__Parameter__Group__9__Impl_in_rule__Parameter__Group__93228); + rule__Parameter__Group__9__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__9" @@ -4324,7 +4237,7 @@ public final void rule__Parameter__Group__9() throws RecognitionException { // rule__Parameter__Group__9__Impl : ( ';' ) ; public final void rule__Parameter__Group__9__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1636:1: @@ -4337,32 +4250,32 @@ public final void rule__Parameter__Group__9__Impl() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1638:1: // ';' { - this.before(this.grammarAccess.getParameterAccess().getSemicolonKeyword_9()); - this.match(this.input, 16, FOLLOW_16_in_rule__Parameter__Group__9__Impl3256); - this.after(this.grammarAccess.getParameterAccess().getSemicolonKeyword_9()); + this.before(grammarAccess.getParameterAccess().getSemicolonKeyword_9()); + match(input, 16, FOLLOW_16_in_rule__Parameter__Group__9__Impl3256); + this.after(grammarAccess.getParameterAccess().getSemicolonKeyword_9()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__Group__9__Impl" // $ANTLR start "rule__Constant__Group__0" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1671:1: - // rule__Constant__Group__0 : rule__Constant__Group__0__Impl rule__Constant__Group__1 ; + // rule__Constant__Group__0 : rule__Constant__Group__0__Impl + // rule__Constant__Group__1 ; public final void rule__Constant__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1675:1: @@ -4370,27 +4283,26 @@ public final void rule__Constant__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1676:2: // rule__Constant__Group__0__Impl rule__Constant__Group__1 { - this.pushFollow(FOLLOW_rule__Constant__Group__0__Impl_in_rule__Constant__Group__03307); - this.rule__Constant__Group__0__Impl(); + pushFollow(FOLLOW_rule__Constant__Group__0__Impl_in_rule__Constant__Group__03307); + rule__Constant__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Constant__Group__1_in_rule__Constant__Group__03310); - this.rule__Constant__Group__1(); + pushFollow(FOLLOW_rule__Constant__Group__1_in_rule__Constant__Group__03310); + rule__Constant__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__0" @@ -4399,7 +4311,7 @@ public final void rule__Constant__Group__0() throws RecognitionException { // rule__Constant__Group__0__Impl : ( 'Const' ) ; public final void rule__Constant__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1687:1: @@ -4412,32 +4324,32 @@ public final void rule__Constant__Group__0__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1689:1: // 'Const' { - this.before(this.grammarAccess.getConstantAccess().getConstKeyword_0()); - this.match(this.input, 25, FOLLOW_25_in_rule__Constant__Group__0__Impl3338); - this.after(this.grammarAccess.getConstantAccess().getConstKeyword_0()); + this.before(grammarAccess.getConstantAccess().getConstKeyword_0()); + match(input, 25, FOLLOW_25_in_rule__Constant__Group__0__Impl3338); + this.after(grammarAccess.getConstantAccess().getConstKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__0__Impl" // $ANTLR start "rule__Constant__Group__1" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1702:1: - // rule__Constant__Group__1 : rule__Constant__Group__1__Impl rule__Constant__Group__2 ; + // rule__Constant__Group__1 : rule__Constant__Group__1__Impl + // rule__Constant__Group__2 ; public final void rule__Constant__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1706:1: @@ -4445,27 +4357,26 @@ public final void rule__Constant__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1707:2: // rule__Constant__Group__1__Impl rule__Constant__Group__2 { - this.pushFollow(FOLLOW_rule__Constant__Group__1__Impl_in_rule__Constant__Group__13369); - this.rule__Constant__Group__1__Impl(); + pushFollow(FOLLOW_rule__Constant__Group__1__Impl_in_rule__Constant__Group__13369); + rule__Constant__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Constant__Group__2_in_rule__Constant__Group__13372); - this.rule__Constant__Group__2(); + pushFollow(FOLLOW_rule__Constant__Group__2_in_rule__Constant__Group__13372); + rule__Constant__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__1" @@ -4474,7 +4385,7 @@ public final void rule__Constant__Group__1() throws RecognitionException { // rule__Constant__Group__1__Impl : ( ( rule__Constant__NameAssignment_1 ) ) ; public final void rule__Constant__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1718:1: @@ -4487,43 +4398,43 @@ public final void rule__Constant__Group__1__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1720:1: // ( rule__Constant__NameAssignment_1 ) { - this.before(this.grammarAccess.getConstantAccess().getNameAssignment_1()); + this.before(grammarAccess.getConstantAccess().getNameAssignment_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1721:1: // ( rule__Constant__NameAssignment_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1721:2: // rule__Constant__NameAssignment_1 { - this.pushFollow(FOLLOW_rule__Constant__NameAssignment_1_in_rule__Constant__Group__1__Impl3399); - this.rule__Constant__NameAssignment_1(); + pushFollow(FOLLOW_rule__Constant__NameAssignment_1_in_rule__Constant__Group__1__Impl3399); + rule__Constant__NameAssignment_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getConstantAccess().getNameAssignment_1()); + this.after(grammarAccess.getConstantAccess().getNameAssignment_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__1__Impl" // $ANTLR start "rule__Constant__Group__2" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1731:1: - // rule__Constant__Group__2 : rule__Constant__Group__2__Impl rule__Constant__Group__3 ; + // rule__Constant__Group__2 : rule__Constant__Group__2__Impl + // rule__Constant__Group__3 ; public final void rule__Constant__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1735:1: @@ -4531,27 +4442,26 @@ public final void rule__Constant__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1736:2: // rule__Constant__Group__2__Impl rule__Constant__Group__3 { - this.pushFollow(FOLLOW_rule__Constant__Group__2__Impl_in_rule__Constant__Group__23429); - this.rule__Constant__Group__2__Impl(); + pushFollow(FOLLOW_rule__Constant__Group__2__Impl_in_rule__Constant__Group__23429); + rule__Constant__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Constant__Group__3_in_rule__Constant__Group__23432); - this.rule__Constant__Group__3(); + pushFollow(FOLLOW_rule__Constant__Group__3_in_rule__Constant__Group__23432); + rule__Constant__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__2" @@ -4560,7 +4470,7 @@ public final void rule__Constant__Group__2() throws RecognitionException { // rule__Constant__Group__2__Impl : ( '=' ) ; public final void rule__Constant__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1747:1: @@ -4573,32 +4483,32 @@ public final void rule__Constant__Group__2__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1749:1: // '=' { - this.before(this.grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); - this.match(this.input, 26, FOLLOW_26_in_rule__Constant__Group__2__Impl3460); - this.after(this.grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); + this.before(grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); + match(input, 26, FOLLOW_26_in_rule__Constant__Group__2__Impl3460); + this.after(grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__2__Impl" // $ANTLR start "rule__Constant__Group__3" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1762:1: - // rule__Constant__Group__3 : rule__Constant__Group__3__Impl rule__Constant__Group__4 ; + // rule__Constant__Group__3 : rule__Constant__Group__3__Impl + // rule__Constant__Group__4 ; public final void rule__Constant__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1766:1: @@ -4606,27 +4516,26 @@ public final void rule__Constant__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1767:2: // rule__Constant__Group__3__Impl rule__Constant__Group__4 { - this.pushFollow(FOLLOW_rule__Constant__Group__3__Impl_in_rule__Constant__Group__33491); - this.rule__Constant__Group__3__Impl(); + pushFollow(FOLLOW_rule__Constant__Group__3__Impl_in_rule__Constant__Group__33491); + rule__Constant__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__Constant__Group__4_in_rule__Constant__Group__33494); - this.rule__Constant__Group__4(); + pushFollow(FOLLOW_rule__Constant__Group__4_in_rule__Constant__Group__33494); + rule__Constant__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__3" @@ -4635,7 +4544,7 @@ public final void rule__Constant__Group__3() throws RecognitionException { // rule__Constant__Group__3__Impl : ( ( rule__Constant__ValueAssignment_3 ) ) ; public final void rule__Constant__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1778:1: @@ -4648,34 +4557,33 @@ public final void rule__Constant__Group__3__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1780:1: // ( rule__Constant__ValueAssignment_3 ) { - this.before(this.grammarAccess.getConstantAccess().getValueAssignment_3()); + this.before(grammarAccess.getConstantAccess().getValueAssignment_3()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1781:1: // ( rule__Constant__ValueAssignment_3 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1781:2: // rule__Constant__ValueAssignment_3 { - this.pushFollow(FOLLOW_rule__Constant__ValueAssignment_3_in_rule__Constant__Group__3__Impl3521); - this.rule__Constant__ValueAssignment_3(); + pushFollow(FOLLOW_rule__Constant__ValueAssignment_3_in_rule__Constant__Group__3__Impl3521); + rule__Constant__ValueAssignment_3(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getConstantAccess().getValueAssignment_3()); + this.after(grammarAccess.getConstantAccess().getValueAssignment_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__3__Impl" @@ -4684,7 +4592,7 @@ public final void rule__Constant__Group__3__Impl() throws RecognitionException { // rule__Constant__Group__4 : rule__Constant__Group__4__Impl ; public final void rule__Constant__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1795:1: @@ -4692,22 +4600,21 @@ public final void rule__Constant__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1796:2: // rule__Constant__Group__4__Impl { - this.pushFollow(FOLLOW_rule__Constant__Group__4__Impl_in_rule__Constant__Group__43551); - this.rule__Constant__Group__4__Impl(); + pushFollow(FOLLOW_rule__Constant__Group__4__Impl_in_rule__Constant__Group__43551); + rule__Constant__Group__4__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__4" @@ -4716,7 +4623,7 @@ public final void rule__Constant__Group__4() throws RecognitionException { // rule__Constant__Group__4__Impl : ( ';' ) ; public final void rule__Constant__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1806:1: @@ -4729,23 +4636,22 @@ public final void rule__Constant__Group__4__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1808:1: // ';' { - this.before(this.grammarAccess.getConstantAccess().getSemicolonKeyword_4()); - this.match(this.input, 16, FOLLOW_16_in_rule__Constant__Group__4__Impl3579); - this.after(this.grammarAccess.getConstantAccess().getSemicolonKeyword_4()); + this.before(grammarAccess.getConstantAccess().getSemicolonKeyword_4()); + match(input, 16, FOLLOW_16_in_rule__Constant__Group__4__Impl3579); + this.after(grammarAccess.getConstantAccess().getSemicolonKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__Group__4__Impl" @@ -4755,7 +4661,7 @@ public final void rule__Constant__Group__4__Impl() throws RecognitionException { // rule__WeightedMetric__Group__1 ; public final void rule__WeightedMetric__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1835:1: @@ -4763,27 +4669,26 @@ public final void rule__WeightedMetric__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1836:2: // rule__WeightedMetric__Group__0__Impl rule__WeightedMetric__Group__1 { - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__0__Impl_in_rule__WeightedMetric__Group__03620); - this.rule__WeightedMetric__Group__0__Impl(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__0__Impl_in_rule__WeightedMetric__Group__03620); + rule__WeightedMetric__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__1_in_rule__WeightedMetric__Group__03623); - this.rule__WeightedMetric__Group__1(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__1_in_rule__WeightedMetric__Group__03623); + rule__WeightedMetric__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__0" @@ -4792,7 +4697,7 @@ public final void rule__WeightedMetric__Group__0() throws RecognitionException { // rule__WeightedMetric__Group__0__Impl : ( 'WeigthedSum' ) ; public final void rule__WeightedMetric__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1847:1: @@ -4805,23 +4710,22 @@ public final void rule__WeightedMetric__Group__0__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1849:1: // 'WeigthedSum' { - this.before(this.grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); - this.match(this.input, 27, FOLLOW_27_in_rule__WeightedMetric__Group__0__Impl3651); - this.after(this.grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); + this.before(grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); + match(input, 27, FOLLOW_27_in_rule__WeightedMetric__Group__0__Impl3651); + this.after(grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__0__Impl" @@ -4831,7 +4735,7 @@ public final void rule__WeightedMetric__Group__0__Impl() throws RecognitionExcep // rule__WeightedMetric__Group__2 ; public final void rule__WeightedMetric__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1866:1: @@ -4839,27 +4743,26 @@ public final void rule__WeightedMetric__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1867:2: // rule__WeightedMetric__Group__1__Impl rule__WeightedMetric__Group__2 { - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__1__Impl_in_rule__WeightedMetric__Group__13682); - this.rule__WeightedMetric__Group__1__Impl(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__1__Impl_in_rule__WeightedMetric__Group__13682); + rule__WeightedMetric__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__2_in_rule__WeightedMetric__Group__13685); - this.rule__WeightedMetric__Group__2(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__2_in_rule__WeightedMetric__Group__13685); + rule__WeightedMetric__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__1" @@ -4868,7 +4771,7 @@ public final void rule__WeightedMetric__Group__1() throws RecognitionException { // rule__WeightedMetric__Group__1__Impl : ( '{' ) ; public final void rule__WeightedMetric__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1878:1: @@ -4881,23 +4784,22 @@ public final void rule__WeightedMetric__Group__1__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1880:1: // '{' { - this.before(this.grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); - this.match(this.input, 13, FOLLOW_13_in_rule__WeightedMetric__Group__1__Impl3713); - this.after(this.grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); + this.before(grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); + match(input, 13, FOLLOW_13_in_rule__WeightedMetric__Group__1__Impl3713); + this.after(grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__1__Impl" @@ -4907,7 +4809,7 @@ public final void rule__WeightedMetric__Group__1__Impl() throws RecognitionExcep // rule__WeightedMetric__Group__3 ; public final void rule__WeightedMetric__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1897:1: @@ -4915,37 +4817,37 @@ public final void rule__WeightedMetric__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1898:2: // rule__WeightedMetric__Group__2__Impl rule__WeightedMetric__Group__3 { - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__2__Impl_in_rule__WeightedMetric__Group__23744); - this.rule__WeightedMetric__Group__2__Impl(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__2__Impl_in_rule__WeightedMetric__Group__23744); + rule__WeightedMetric__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__3_in_rule__WeightedMetric__Group__23747); - this.rule__WeightedMetric__Group__3(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__3_in_rule__WeightedMetric__Group__23747); + rule__WeightedMetric__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__2" // $ANTLR start "rule__WeightedMetric__Group__2__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1905:1: - // rule__WeightedMetric__Group__2__Impl : ( ( ( rule__WeightedMetric__WeightsAssignment_2 ) ) ( + // rule__WeightedMetric__Group__2__Impl : ( ( ( + // rule__WeightedMetric__WeightsAssignment_2 ) ) ( // ( rule__WeightedMetric__WeightsAssignment_2 )* ) ) ; public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1909:1: @@ -4967,21 +4869,21 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1912:1: // ( rule__WeightedMetric__WeightsAssignment_2 ) { - this.before(this.grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); + this.before(grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1913:1: // ( rule__WeightedMetric__WeightsAssignment_2 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1913:2: // rule__WeightedMetric__WeightsAssignment_2 { - this.pushFollow( + pushFollow( FOLLOW_rule__WeightedMetric__WeightsAssignment_2_in_rule__WeightedMetric__Group__2__Impl3776); - this.rule__WeightedMetric__WeightsAssignment_2(); + rule__WeightedMetric__WeightsAssignment_2(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); + this.after(grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); } @@ -4990,12 +4892,12 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1917:1: // ( rule__WeightedMetric__WeightsAssignment_2 )* { - this.before(this.grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); + this.before(grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1918:1: // ( rule__WeightedMetric__WeightsAssignment_2 )* loop8: do { int alt8 = 2; - final int LA8_0 = this.input.LA(1); + final int LA8_0 = input.LA(1); if ((LA8_0 == 33)) { alt8 = 1; @@ -5006,11 +4908,11 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1918:2: // rule__WeightedMetric__WeightsAssignment_2 { - this.pushFollow( + pushFollow( FOLLOW_rule__WeightedMetric__WeightsAssignment_2_in_rule__WeightedMetric__Group__2__Impl3788); - this.rule__WeightedMetric__WeightsAssignment_2(); + rule__WeightedMetric__WeightsAssignment_2(); - this.state._fsp--; + state._fsp--; } break; @@ -5020,7 +4922,7 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep } } while (true); - this.after(this.grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); + this.after(grammarAccess.getWeightedMetricAccess().getWeightsAssignment_2()); } @@ -5029,14 +4931,13 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__2__Impl" @@ -5045,7 +4946,7 @@ public final void rule__WeightedMetric__Group__2__Impl() throws RecognitionExcep // rule__WeightedMetric__Group__3 : rule__WeightedMetric__Group__3__Impl ; public final void rule__WeightedMetric__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1933:1: @@ -5053,22 +4954,21 @@ public final void rule__WeightedMetric__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1934:2: // rule__WeightedMetric__Group__3__Impl { - this.pushFollow(FOLLOW_rule__WeightedMetric__Group__3__Impl_in_rule__WeightedMetric__Group__33821); - this.rule__WeightedMetric__Group__3__Impl(); + pushFollow(FOLLOW_rule__WeightedMetric__Group__3__Impl_in_rule__WeightedMetric__Group__33821); + rule__WeightedMetric__Group__3__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__3" @@ -5077,7 +4977,7 @@ public final void rule__WeightedMetric__Group__3() throws RecognitionException { // rule__WeightedMetric__Group__3__Impl : ( '}' ) ; public final void rule__WeightedMetric__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1944:1: @@ -5090,23 +4990,22 @@ public final void rule__WeightedMetric__Group__3__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1946:1: // '}' { - this.before(this.grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); - this.match(this.input, 14, FOLLOW_14_in_rule__WeightedMetric__Group__3__Impl3849); - this.after(this.grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); + this.before(grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); + match(input, 14, FOLLOW_14_in_rule__WeightedMetric__Group__3__Impl3849); + this.after(grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__Group__3__Impl" @@ -5116,7 +5015,7 @@ public final void rule__WeightedMetric__Group__3__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__1 ; public final void rule__StepwiseMetric__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1971:1: @@ -5124,27 +5023,26 @@ public final void rule__StepwiseMetric__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1972:2: // rule__StepwiseMetric__Group__0__Impl rule__StepwiseMetric__Group__1 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__0__Impl_in_rule__StepwiseMetric__Group__03888); - this.rule__StepwiseMetric__Group__0__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__0__Impl_in_rule__StepwiseMetric__Group__03888); + rule__StepwiseMetric__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__1_in_rule__StepwiseMetric__Group__03891); - this.rule__StepwiseMetric__Group__1(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__1_in_rule__StepwiseMetric__Group__03891); + rule__StepwiseMetric__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__0" @@ -5153,7 +5051,7 @@ public final void rule__StepwiseMetric__Group__0() throws RecognitionException { // rule__StepwiseMetric__Group__0__Impl : ( 'Stepwise' ) ; public final void rule__StepwiseMetric__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1983:1: @@ -5166,23 +5064,22 @@ public final void rule__StepwiseMetric__Group__0__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:1985:1: // 'Stepwise' { - this.before(this.grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); - this.match(this.input, 28, FOLLOW_28_in_rule__StepwiseMetric__Group__0__Impl3919); - this.after(this.grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); + this.before(grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); + match(input, 28, FOLLOW_28_in_rule__StepwiseMetric__Group__0__Impl3919); + this.after(grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__0__Impl" @@ -5192,7 +5089,7 @@ public final void rule__StepwiseMetric__Group__0__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__2 ; public final void rule__StepwiseMetric__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2002:1: @@ -5200,27 +5097,26 @@ public final void rule__StepwiseMetric__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2003:2: // rule__StepwiseMetric__Group__1__Impl rule__StepwiseMetric__Group__2 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__1__Impl_in_rule__StepwiseMetric__Group__13950); - this.rule__StepwiseMetric__Group__1__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__1__Impl_in_rule__StepwiseMetric__Group__13950); + rule__StepwiseMetric__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__2_in_rule__StepwiseMetric__Group__13953); - this.rule__StepwiseMetric__Group__2(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__2_in_rule__StepwiseMetric__Group__13953); + rule__StepwiseMetric__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__1" @@ -5229,7 +5125,7 @@ public final void rule__StepwiseMetric__Group__1() throws RecognitionException { // rule__StepwiseMetric__Group__1__Impl : ( '[' ) ; public final void rule__StepwiseMetric__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2014:1: @@ -5242,23 +5138,22 @@ public final void rule__StepwiseMetric__Group__1__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2016:1: // '[' { - this.before(this.grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); - this.match(this.input, 29, FOLLOW_29_in_rule__StepwiseMetric__Group__1__Impl3981); - this.after(this.grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); + this.before(grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); + match(input, 29, FOLLOW_29_in_rule__StepwiseMetric__Group__1__Impl3981); + this.after(grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__1__Impl" @@ -5268,7 +5163,7 @@ public final void rule__StepwiseMetric__Group__1__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__3 ; public final void rule__StepwiseMetric__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2033:1: @@ -5276,37 +5171,37 @@ public final void rule__StepwiseMetric__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2034:2: // rule__StepwiseMetric__Group__2__Impl rule__StepwiseMetric__Group__3 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__2__Impl_in_rule__StepwiseMetric__Group__24012); - this.rule__StepwiseMetric__Group__2__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__2__Impl_in_rule__StepwiseMetric__Group__24012); + rule__StepwiseMetric__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__3_in_rule__StepwiseMetric__Group__24015); - this.rule__StepwiseMetric__Group__3(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__3_in_rule__StepwiseMetric__Group__24015); + rule__StepwiseMetric__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__2" // $ANTLR start "rule__StepwiseMetric__Group__2__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2041:1: - // rule__StepwiseMetric__Group__2__Impl : ( ( rule__StepwiseMetric__InnerMetricAssignment_2 ) ) + // rule__StepwiseMetric__Group__2__Impl : ( ( + // rule__StepwiseMetric__InnerMetricAssignment_2 ) ) // ; public final void rule__StepwiseMetric__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2045:1: @@ -5319,35 +5214,34 @@ public final void rule__StepwiseMetric__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2047:1: // ( rule__StepwiseMetric__InnerMetricAssignment_2 ) { - this.before(this.grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2()); + this.before(grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2048:1: // ( rule__StepwiseMetric__InnerMetricAssignment_2 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2048:2: // rule__StepwiseMetric__InnerMetricAssignment_2 { - this.pushFollow( + pushFollow( FOLLOW_rule__StepwiseMetric__InnerMetricAssignment_2_in_rule__StepwiseMetric__Group__2__Impl4042); - this.rule__StepwiseMetric__InnerMetricAssignment_2(); + rule__StepwiseMetric__InnerMetricAssignment_2(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2()); + this.after(grammarAccess.getStepwiseMetricAccess().getInnerMetricAssignment_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__2__Impl" @@ -5357,7 +5251,7 @@ public final void rule__StepwiseMetric__Group__2__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__4 ; public final void rule__StepwiseMetric__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2062:1: @@ -5365,27 +5259,26 @@ public final void rule__StepwiseMetric__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2063:2: // rule__StepwiseMetric__Group__3__Impl rule__StepwiseMetric__Group__4 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__3__Impl_in_rule__StepwiseMetric__Group__34072); - this.rule__StepwiseMetric__Group__3__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__3__Impl_in_rule__StepwiseMetric__Group__34072); + rule__StepwiseMetric__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__4_in_rule__StepwiseMetric__Group__34075); - this.rule__StepwiseMetric__Group__4(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__4_in_rule__StepwiseMetric__Group__34075); + rule__StepwiseMetric__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__3" @@ -5394,7 +5287,7 @@ public final void rule__StepwiseMetric__Group__3() throws RecognitionException { // rule__StepwiseMetric__Group__3__Impl : ( ']' ) ; public final void rule__StepwiseMetric__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2074:1: @@ -5407,23 +5300,22 @@ public final void rule__StepwiseMetric__Group__3__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2076:1: // ']' { - this.before(this.grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); - this.match(this.input, 30, FOLLOW_30_in_rule__StepwiseMetric__Group__3__Impl4103); - this.after(this.grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); + this.before(grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); + match(input, 30, FOLLOW_30_in_rule__StepwiseMetric__Group__3__Impl4103); + this.after(grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__3__Impl" @@ -5433,7 +5325,7 @@ public final void rule__StepwiseMetric__Group__3__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__5 ; public final void rule__StepwiseMetric__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2093:1: @@ -5441,27 +5333,26 @@ public final void rule__StepwiseMetric__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2094:2: // rule__StepwiseMetric__Group__4__Impl rule__StepwiseMetric__Group__5 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__4__Impl_in_rule__StepwiseMetric__Group__44134); - this.rule__StepwiseMetric__Group__4__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__4__Impl_in_rule__StepwiseMetric__Group__44134); + rule__StepwiseMetric__Group__4__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__5_in_rule__StepwiseMetric__Group__44137); - this.rule__StepwiseMetric__Group__5(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__5_in_rule__StepwiseMetric__Group__44137); + rule__StepwiseMetric__Group__5(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__4" @@ -5470,7 +5361,7 @@ public final void rule__StepwiseMetric__Group__4() throws RecognitionException { // rule__StepwiseMetric__Group__4__Impl : ( '{' ) ; public final void rule__StepwiseMetric__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2105:1: @@ -5483,23 +5374,22 @@ public final void rule__StepwiseMetric__Group__4__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2107:1: // '{' { - this.before(this.grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); - this.match(this.input, 13, FOLLOW_13_in_rule__StepwiseMetric__Group__4__Impl4165); - this.after(this.grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); + this.before(grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); + match(input, 13, FOLLOW_13_in_rule__StepwiseMetric__Group__4__Impl4165); + this.after(grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__4__Impl" @@ -5509,7 +5399,7 @@ public final void rule__StepwiseMetric__Group__4__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__6 ; public final void rule__StepwiseMetric__Group__5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2124:1: @@ -5517,36 +5407,36 @@ public final void rule__StepwiseMetric__Group__5() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2125:2: // rule__StepwiseMetric__Group__5__Impl rule__StepwiseMetric__Group__6 { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__5__Impl_in_rule__StepwiseMetric__Group__54196); - this.rule__StepwiseMetric__Group__5__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__5__Impl_in_rule__StepwiseMetric__Group__54196); + rule__StepwiseMetric__Group__5__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__6_in_rule__StepwiseMetric__Group__54199); - this.rule__StepwiseMetric__Group__6(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__6_in_rule__StepwiseMetric__Group__54199); + rule__StepwiseMetric__Group__6(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__5" // $ANTLR start "rule__StepwiseMetric__Group__5__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2132:1: - // rule__StepwiseMetric__Group__5__Impl : ( ( rule__StepwiseMetric__StepsAssignment_5 )* ) ; + // rule__StepwiseMetric__Group__5__Impl : ( ( + // rule__StepwiseMetric__StepsAssignment_5 )* ) ; public final void rule__StepwiseMetric__Group__5__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2136:1: @@ -5559,12 +5449,12 @@ public final void rule__StepwiseMetric__Group__5__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2138:1: // ( rule__StepwiseMetric__StepsAssignment_5 )* { - this.before(this.grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5()); + this.before(grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2139:1: // ( rule__StepwiseMetric__StepsAssignment_5 )* loop9: do { int alt9 = 2; - final int LA9_0 = this.input.LA(1); + final int LA9_0 = input.LA(1); if ((LA9_0 == 33)) { alt9 = 1; @@ -5575,11 +5465,11 @@ public final void rule__StepwiseMetric__Group__5__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2139:2: // rule__StepwiseMetric__StepsAssignment_5 { - this.pushFollow( + pushFollow( FOLLOW_rule__StepwiseMetric__StepsAssignment_5_in_rule__StepwiseMetric__Group__5__Impl4226); - this.rule__StepwiseMetric__StepsAssignment_5(); + rule__StepwiseMetric__StepsAssignment_5(); - this.state._fsp--; + state._fsp--; } break; @@ -5589,21 +5479,20 @@ public final void rule__StepwiseMetric__Group__5__Impl() throws RecognitionExcep } } while (true); - this.after(this.grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5()); + this.after(grammarAccess.getStepwiseMetricAccess().getStepsAssignment_5()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__5__Impl" @@ -5612,7 +5501,7 @@ public final void rule__StepwiseMetric__Group__5__Impl() throws RecognitionExcep // rule__StepwiseMetric__Group__6 : rule__StepwiseMetric__Group__6__Impl ; public final void rule__StepwiseMetric__Group__6() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2153:1: @@ -5620,22 +5509,21 @@ public final void rule__StepwiseMetric__Group__6() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2154:2: // rule__StepwiseMetric__Group__6__Impl { - this.pushFollow(FOLLOW_rule__StepwiseMetric__Group__6__Impl_in_rule__StepwiseMetric__Group__64257); - this.rule__StepwiseMetric__Group__6__Impl(); + pushFollow(FOLLOW_rule__StepwiseMetric__Group__6__Impl_in_rule__StepwiseMetric__Group__64257); + rule__StepwiseMetric__Group__6__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__6" @@ -5644,7 +5532,7 @@ public final void rule__StepwiseMetric__Group__6() throws RecognitionException { // rule__StepwiseMetric__Group__6__Impl : ( '}' ) ; public final void rule__StepwiseMetric__Group__6__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2164:1: @@ -5657,32 +5545,32 @@ public final void rule__StepwiseMetric__Group__6__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2166:1: // '}' { - this.before(this.grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); - this.match(this.input, 14, FOLLOW_14_in_rule__StepwiseMetric__Group__6__Impl4285); - this.after(this.grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); + this.before(grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); + match(input, 14, FOLLOW_14_in_rule__StepwiseMetric__Group__6__Impl4285); + this.after(grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__Group__6__Impl" // $ANTLR start "rule__RatioMetric__Group__0" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2193:1: - // rule__RatioMetric__Group__0 : rule__RatioMetric__Group__0__Impl rule__RatioMetric__Group__1 ; + // rule__RatioMetric__Group__0 : rule__RatioMetric__Group__0__Impl + // rule__RatioMetric__Group__1 ; public final void rule__RatioMetric__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2197:1: @@ -5690,27 +5578,26 @@ public final void rule__RatioMetric__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2198:2: // rule__RatioMetric__Group__0__Impl rule__RatioMetric__Group__1 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__0__Impl_in_rule__RatioMetric__Group__04330); - this.rule__RatioMetric__Group__0__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__0__Impl_in_rule__RatioMetric__Group__04330); + rule__RatioMetric__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__RatioMetric__Group__1_in_rule__RatioMetric__Group__04333); - this.rule__RatioMetric__Group__1(); + pushFollow(FOLLOW_rule__RatioMetric__Group__1_in_rule__RatioMetric__Group__04333); + rule__RatioMetric__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__0" @@ -5719,7 +5606,7 @@ public final void rule__RatioMetric__Group__0() throws RecognitionException { // rule__RatioMetric__Group__0__Impl : ( 'Ratio' ) ; public final void rule__RatioMetric__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2209:1: @@ -5732,32 +5619,32 @@ public final void rule__RatioMetric__Group__0__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2211:1: // 'Ratio' { - this.before(this.grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); - this.match(this.input, 31, FOLLOW_31_in_rule__RatioMetric__Group__0__Impl4361); - this.after(this.grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); + this.before(grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); + match(input, 31, FOLLOW_31_in_rule__RatioMetric__Group__0__Impl4361); + this.after(grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__0__Impl" // $ANTLR start "rule__RatioMetric__Group__1" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2224:1: - // rule__RatioMetric__Group__1 : rule__RatioMetric__Group__1__Impl rule__RatioMetric__Group__2 ; + // rule__RatioMetric__Group__1 : rule__RatioMetric__Group__1__Impl + // rule__RatioMetric__Group__2 ; public final void rule__RatioMetric__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2228:1: @@ -5765,27 +5652,26 @@ public final void rule__RatioMetric__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2229:2: // rule__RatioMetric__Group__1__Impl rule__RatioMetric__Group__2 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__1__Impl_in_rule__RatioMetric__Group__14392); - this.rule__RatioMetric__Group__1__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__1__Impl_in_rule__RatioMetric__Group__14392); + rule__RatioMetric__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__RatioMetric__Group__2_in_rule__RatioMetric__Group__14395); - this.rule__RatioMetric__Group__2(); + pushFollow(FOLLOW_rule__RatioMetric__Group__2_in_rule__RatioMetric__Group__14395); + rule__RatioMetric__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__1" @@ -5794,7 +5680,7 @@ public final void rule__RatioMetric__Group__1() throws RecognitionException { // rule__RatioMetric__Group__1__Impl : ( '{' ) ; public final void rule__RatioMetric__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2240:1: @@ -5807,32 +5693,32 @@ public final void rule__RatioMetric__Group__1__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2242:1: // '{' { - this.before(this.grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); - this.match(this.input, 13, FOLLOW_13_in_rule__RatioMetric__Group__1__Impl4423); - this.after(this.grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); + this.before(grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); + match(input, 13, FOLLOW_13_in_rule__RatioMetric__Group__1__Impl4423); + this.after(grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__1__Impl" // $ANTLR start "rule__RatioMetric__Group__2" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2255:1: - // rule__RatioMetric__Group__2 : rule__RatioMetric__Group__2__Impl rule__RatioMetric__Group__3 ; + // rule__RatioMetric__Group__2 : rule__RatioMetric__Group__2__Impl + // rule__RatioMetric__Group__3 ; public final void rule__RatioMetric__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2259:1: @@ -5840,36 +5726,36 @@ public final void rule__RatioMetric__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2260:2: // rule__RatioMetric__Group__2__Impl rule__RatioMetric__Group__3 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__2__Impl_in_rule__RatioMetric__Group__24454); - this.rule__RatioMetric__Group__2__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__2__Impl_in_rule__RatioMetric__Group__24454); + rule__RatioMetric__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__RatioMetric__Group__3_in_rule__RatioMetric__Group__24457); - this.rule__RatioMetric__Group__3(); + pushFollow(FOLLOW_rule__RatioMetric__Group__3_in_rule__RatioMetric__Group__24457); + rule__RatioMetric__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__2" // $ANTLR start "rule__RatioMetric__Group__2__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2267:1: - // rule__RatioMetric__Group__2__Impl : ( ( rule__RatioMetric__NominatorMetricAssignment_2 ) ) ; + // rule__RatioMetric__Group__2__Impl : ( ( + // rule__RatioMetric__NominatorMetricAssignment_2 ) ) ; public final void rule__RatioMetric__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2271:1: @@ -5882,44 +5768,44 @@ public final void rule__RatioMetric__Group__2__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2273:1: // ( rule__RatioMetric__NominatorMetricAssignment_2 ) { - this.before(this.grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2()); + this.before(grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2274:1: // ( rule__RatioMetric__NominatorMetricAssignment_2 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2274:2: // rule__RatioMetric__NominatorMetricAssignment_2 { - this.pushFollow( + pushFollow( FOLLOW_rule__RatioMetric__NominatorMetricAssignment_2_in_rule__RatioMetric__Group__2__Impl4484); - this.rule__RatioMetric__NominatorMetricAssignment_2(); + rule__RatioMetric__NominatorMetricAssignment_2(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2()); + this.after(grammarAccess.getRatioMetricAccess().getNominatorMetricAssignment_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__2__Impl" // $ANTLR start "rule__RatioMetric__Group__3" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2284:1: - // rule__RatioMetric__Group__3 : rule__RatioMetric__Group__3__Impl rule__RatioMetric__Group__4 ; + // rule__RatioMetric__Group__3 : rule__RatioMetric__Group__3__Impl + // rule__RatioMetric__Group__4 ; public final void rule__RatioMetric__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2288:1: @@ -5927,27 +5813,26 @@ public final void rule__RatioMetric__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2289:2: // rule__RatioMetric__Group__3__Impl rule__RatioMetric__Group__4 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__3__Impl_in_rule__RatioMetric__Group__34514); - this.rule__RatioMetric__Group__3__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__3__Impl_in_rule__RatioMetric__Group__34514); + rule__RatioMetric__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__RatioMetric__Group__4_in_rule__RatioMetric__Group__34517); - this.rule__RatioMetric__Group__4(); + pushFollow(FOLLOW_rule__RatioMetric__Group__4_in_rule__RatioMetric__Group__34517); + rule__RatioMetric__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__3" @@ -5956,7 +5841,7 @@ public final void rule__RatioMetric__Group__3() throws RecognitionException { // rule__RatioMetric__Group__3__Impl : ( '/' ) ; public final void rule__RatioMetric__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2300:1: @@ -5969,32 +5854,32 @@ public final void rule__RatioMetric__Group__3__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2302:1: // '/' { - this.before(this.grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); - this.match(this.input, 32, FOLLOW_32_in_rule__RatioMetric__Group__3__Impl4545); - this.after(this.grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); + this.before(grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); + match(input, 32, FOLLOW_32_in_rule__RatioMetric__Group__3__Impl4545); + this.after(grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__3__Impl" // $ANTLR start "rule__RatioMetric__Group__4" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2315:1: - // rule__RatioMetric__Group__4 : rule__RatioMetric__Group__4__Impl rule__RatioMetric__Group__5 ; + // rule__RatioMetric__Group__4 : rule__RatioMetric__Group__4__Impl + // rule__RatioMetric__Group__5 ; public final void rule__RatioMetric__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2319:1: @@ -6002,37 +5887,37 @@ public final void rule__RatioMetric__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2320:2: // rule__RatioMetric__Group__4__Impl rule__RatioMetric__Group__5 { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__4__Impl_in_rule__RatioMetric__Group__44576); - this.rule__RatioMetric__Group__4__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__4__Impl_in_rule__RatioMetric__Group__44576); + rule__RatioMetric__Group__4__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__RatioMetric__Group__5_in_rule__RatioMetric__Group__44579); - this.rule__RatioMetric__Group__5(); + pushFollow(FOLLOW_rule__RatioMetric__Group__5_in_rule__RatioMetric__Group__44579); + rule__RatioMetric__Group__5(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__4" // $ANTLR start "rule__RatioMetric__Group__4__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2327:1: - // rule__RatioMetric__Group__4__Impl : ( ( rule__RatioMetric__DenominatorMetricAssignment_4 ) ) + // rule__RatioMetric__Group__4__Impl : ( ( + // rule__RatioMetric__DenominatorMetricAssignment_4 ) ) // ; public final void rule__RatioMetric__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2331:1: @@ -6045,35 +5930,34 @@ public final void rule__RatioMetric__Group__4__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2333:1: // ( rule__RatioMetric__DenominatorMetricAssignment_4 ) { - this.before(this.grammarAccess.getRatioMetricAccess().getDenominatorMetricAssignment_4()); + this.before(grammarAccess.getRatioMetricAccess().getDenominatorMetricAssignment_4()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2334:1: // ( rule__RatioMetric__DenominatorMetricAssignment_4 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2334:2: // rule__RatioMetric__DenominatorMetricAssignment_4 { - this.pushFollow( + pushFollow( FOLLOW_rule__RatioMetric__DenominatorMetricAssignment_4_in_rule__RatioMetric__Group__4__Impl4606); - this.rule__RatioMetric__DenominatorMetricAssignment_4(); + rule__RatioMetric__DenominatorMetricAssignment_4(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getRatioMetricAccess().getDenominatorMetricAssignment_4()); + this.after(grammarAccess.getRatioMetricAccess().getDenominatorMetricAssignment_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__4__Impl" @@ -6082,7 +5966,7 @@ public final void rule__RatioMetric__Group__4__Impl() throws RecognitionExceptio // rule__RatioMetric__Group__5 : rule__RatioMetric__Group__5__Impl ; public final void rule__RatioMetric__Group__5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2348:1: @@ -6090,22 +5974,21 @@ public final void rule__RatioMetric__Group__5() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2349:2: // rule__RatioMetric__Group__5__Impl { - this.pushFollow(FOLLOW_rule__RatioMetric__Group__5__Impl_in_rule__RatioMetric__Group__54636); - this.rule__RatioMetric__Group__5__Impl(); + pushFollow(FOLLOW_rule__RatioMetric__Group__5__Impl_in_rule__RatioMetric__Group__54636); + rule__RatioMetric__Group__5__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__5" @@ -6114,7 +5997,7 @@ public final void rule__RatioMetric__Group__5() throws RecognitionException { // rule__RatioMetric__Group__5__Impl : ( '}' ) ; public final void rule__RatioMetric__Group__5__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2359:1: @@ -6127,23 +6010,22 @@ public final void rule__RatioMetric__Group__5__Impl() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2361:1: // '}' { - this.before(this.grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); - this.match(this.input, 14, FOLLOW_14_in_rule__RatioMetric__Group__5__Impl4664); - this.after(this.grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); + this.before(grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); + match(input, 14, FOLLOW_14_in_rule__RatioMetric__Group__5__Impl4664); + this.after(grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__Group__5__Impl" @@ -6153,7 +6035,7 @@ public final void rule__RatioMetric__Group__5__Impl() throws RecognitionExceptio // rule__BoundAndWeight__Group__1 ; public final void rule__BoundAndWeight__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2390:1: @@ -6161,27 +6043,26 @@ public final void rule__BoundAndWeight__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2391:2: // rule__BoundAndWeight__Group__0__Impl rule__BoundAndWeight__Group__1 { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__0__Impl_in_rule__BoundAndWeight__Group__04707); - this.rule__BoundAndWeight__Group__0__Impl(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__0__Impl_in_rule__BoundAndWeight__Group__04707); + rule__BoundAndWeight__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__1_in_rule__BoundAndWeight__Group__04710); - this.rule__BoundAndWeight__Group__1(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__1_in_rule__BoundAndWeight__Group__04710); + rule__BoundAndWeight__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__0" @@ -6190,7 +6071,7 @@ public final void rule__BoundAndWeight__Group__0() throws RecognitionException { // rule__BoundAndWeight__Group__0__Impl : ( '<' ) ; public final void rule__BoundAndWeight__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2402:1: @@ -6203,23 +6084,22 @@ public final void rule__BoundAndWeight__Group__0__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2404:1: // '<' { - this.before(this.grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); - this.match(this.input, 33, FOLLOW_33_in_rule__BoundAndWeight__Group__0__Impl4738); - this.after(this.grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); + this.before(grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); + match(input, 33, FOLLOW_33_in_rule__BoundAndWeight__Group__0__Impl4738); + this.after(grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__0__Impl" @@ -6229,7 +6109,7 @@ public final void rule__BoundAndWeight__Group__0__Impl() throws RecognitionExcep // rule__BoundAndWeight__Group__2 ; public final void rule__BoundAndWeight__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2421:1: @@ -6237,36 +6117,36 @@ public final void rule__BoundAndWeight__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2422:2: // rule__BoundAndWeight__Group__1__Impl rule__BoundAndWeight__Group__2 { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__1__Impl_in_rule__BoundAndWeight__Group__14769); - this.rule__BoundAndWeight__Group__1__Impl(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__1__Impl_in_rule__BoundAndWeight__Group__14769); + rule__BoundAndWeight__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__2_in_rule__BoundAndWeight__Group__14772); - this.rule__BoundAndWeight__Group__2(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__2_in_rule__BoundAndWeight__Group__14772); + rule__BoundAndWeight__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__1" // $ANTLR start "rule__BoundAndWeight__Group__1__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2429:1: - // rule__BoundAndWeight__Group__1__Impl : ( ( rule__BoundAndWeight__UpperBoundAssignment_1 ) ) ; + // rule__BoundAndWeight__Group__1__Impl : ( ( + // rule__BoundAndWeight__UpperBoundAssignment_1 ) ) ; public final void rule__BoundAndWeight__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2433:1: @@ -6279,35 +6159,34 @@ public final void rule__BoundAndWeight__Group__1__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2435:1: // ( rule__BoundAndWeight__UpperBoundAssignment_1 ) { - this.before(this.grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1()); + this.before(grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2436:1: // ( rule__BoundAndWeight__UpperBoundAssignment_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2436:2: // rule__BoundAndWeight__UpperBoundAssignment_1 { - this.pushFollow( + pushFollow( FOLLOW_rule__BoundAndWeight__UpperBoundAssignment_1_in_rule__BoundAndWeight__Group__1__Impl4799); - this.rule__BoundAndWeight__UpperBoundAssignment_1(); + rule__BoundAndWeight__UpperBoundAssignment_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1()); + this.after(grammarAccess.getBoundAndWeightAccess().getUpperBoundAssignment_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__1__Impl" @@ -6317,7 +6196,7 @@ public final void rule__BoundAndWeight__Group__1__Impl() throws RecognitionExcep // rule__BoundAndWeight__Group__3 ; public final void rule__BoundAndWeight__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2450:1: @@ -6325,27 +6204,26 @@ public final void rule__BoundAndWeight__Group__2() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2451:2: // rule__BoundAndWeight__Group__2__Impl rule__BoundAndWeight__Group__3 { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__2__Impl_in_rule__BoundAndWeight__Group__24829); - this.rule__BoundAndWeight__Group__2__Impl(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__2__Impl_in_rule__BoundAndWeight__Group__24829); + rule__BoundAndWeight__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__3_in_rule__BoundAndWeight__Group__24832); - this.rule__BoundAndWeight__Group__3(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__3_in_rule__BoundAndWeight__Group__24832); + rule__BoundAndWeight__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__2" @@ -6354,7 +6232,7 @@ public final void rule__BoundAndWeight__Group__2() throws RecognitionException { // rule__BoundAndWeight__Group__2__Impl : ( ',' ) ; public final void rule__BoundAndWeight__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2462:1: @@ -6367,23 +6245,22 @@ public final void rule__BoundAndWeight__Group__2__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2464:1: // ',' { - this.before(this.grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); - this.match(this.input, 20, FOLLOW_20_in_rule__BoundAndWeight__Group__2__Impl4860); - this.after(this.grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); + this.before(grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); + match(input, 20, FOLLOW_20_in_rule__BoundAndWeight__Group__2__Impl4860); + this.after(grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__2__Impl" @@ -6393,7 +6270,7 @@ public final void rule__BoundAndWeight__Group__2__Impl() throws RecognitionExcep // rule__BoundAndWeight__Group__4 ; public final void rule__BoundAndWeight__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2481:1: @@ -6401,36 +6278,36 @@ public final void rule__BoundAndWeight__Group__3() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2482:2: // rule__BoundAndWeight__Group__3__Impl rule__BoundAndWeight__Group__4 { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__3__Impl_in_rule__BoundAndWeight__Group__34891); - this.rule__BoundAndWeight__Group__3__Impl(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__3__Impl_in_rule__BoundAndWeight__Group__34891); + rule__BoundAndWeight__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__4_in_rule__BoundAndWeight__Group__34894); - this.rule__BoundAndWeight__Group__4(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__4_in_rule__BoundAndWeight__Group__34894); + rule__BoundAndWeight__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__3" // $ANTLR start "rule__BoundAndWeight__Group__3__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2489:1: - // rule__BoundAndWeight__Group__3__Impl : ( ( rule__BoundAndWeight__WeightAssignment_3 ) ) ; + // rule__BoundAndWeight__Group__3__Impl : ( ( + // rule__BoundAndWeight__WeightAssignment_3 ) ) ; public final void rule__BoundAndWeight__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2493:1: @@ -6443,35 +6320,34 @@ public final void rule__BoundAndWeight__Group__3__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2495:1: // ( rule__BoundAndWeight__WeightAssignment_3 ) { - this.before(this.grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3()); + this.before(grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2496:1: // ( rule__BoundAndWeight__WeightAssignment_3 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2496:2: // rule__BoundAndWeight__WeightAssignment_3 { - this.pushFollow( + pushFollow( FOLLOW_rule__BoundAndWeight__WeightAssignment_3_in_rule__BoundAndWeight__Group__3__Impl4921); - this.rule__BoundAndWeight__WeightAssignment_3(); + rule__BoundAndWeight__WeightAssignment_3(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3()); + this.after(grammarAccess.getBoundAndWeightAccess().getWeightAssignment_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__3__Impl" @@ -6480,7 +6356,7 @@ public final void rule__BoundAndWeight__Group__3__Impl() throws RecognitionExcep // rule__BoundAndWeight__Group__4 : rule__BoundAndWeight__Group__4__Impl ; public final void rule__BoundAndWeight__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2510:1: @@ -6488,22 +6364,21 @@ public final void rule__BoundAndWeight__Group__4() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2511:2: // rule__BoundAndWeight__Group__4__Impl { - this.pushFollow(FOLLOW_rule__BoundAndWeight__Group__4__Impl_in_rule__BoundAndWeight__Group__44951); - this.rule__BoundAndWeight__Group__4__Impl(); + pushFollow(FOLLOW_rule__BoundAndWeight__Group__4__Impl_in_rule__BoundAndWeight__Group__44951); + rule__BoundAndWeight__Group__4__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__4" @@ -6512,7 +6387,7 @@ public final void rule__BoundAndWeight__Group__4() throws RecognitionException { // rule__BoundAndWeight__Group__4__Impl : ( '>' ) ; public final void rule__BoundAndWeight__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2521:1: @@ -6525,23 +6400,22 @@ public final void rule__BoundAndWeight__Group__4__Impl() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2523:1: // '>' { - this.before(this.grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); - this.match(this.input, 34, FOLLOW_34_in_rule__BoundAndWeight__Group__4__Impl4979); - this.after(this.grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); + this.before(grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); + match(input, 34, FOLLOW_34_in_rule__BoundAndWeight__Group__4__Impl4979); + this.after(grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__Group__4__Impl" @@ -6551,7 +6425,7 @@ public final void rule__BoundAndWeight__Group__4__Impl() throws RecognitionExcep // rule__MetricAndWeight__Group__1 ; public final void rule__MetricAndWeight__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2550:1: @@ -6559,27 +6433,26 @@ public final void rule__MetricAndWeight__Group__0() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2551:2: // rule__MetricAndWeight__Group__0__Impl rule__MetricAndWeight__Group__1 { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__0__Impl_in_rule__MetricAndWeight__Group__05020); - this.rule__MetricAndWeight__Group__0__Impl(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__0__Impl_in_rule__MetricAndWeight__Group__05020); + rule__MetricAndWeight__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__1_in_rule__MetricAndWeight__Group__05023); - this.rule__MetricAndWeight__Group__1(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__1_in_rule__MetricAndWeight__Group__05023); + rule__MetricAndWeight__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__0" @@ -6588,7 +6461,7 @@ public final void rule__MetricAndWeight__Group__0() throws RecognitionException // rule__MetricAndWeight__Group__0__Impl : ( '<' ) ; public final void rule__MetricAndWeight__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2562:1: @@ -6601,23 +6474,22 @@ public final void rule__MetricAndWeight__Group__0__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2564:1: // '<' { - this.before(this.grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); - this.match(this.input, 33, FOLLOW_33_in_rule__MetricAndWeight__Group__0__Impl5051); - this.after(this.grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); + this.before(grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); + match(input, 33, FOLLOW_33_in_rule__MetricAndWeight__Group__0__Impl5051); + this.after(grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__0__Impl" @@ -6627,7 +6499,7 @@ public final void rule__MetricAndWeight__Group__0__Impl() throws RecognitionExce // rule__MetricAndWeight__Group__2 ; public final void rule__MetricAndWeight__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2581:1: @@ -6635,36 +6507,36 @@ public final void rule__MetricAndWeight__Group__1() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2582:2: // rule__MetricAndWeight__Group__1__Impl rule__MetricAndWeight__Group__2 { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__1__Impl_in_rule__MetricAndWeight__Group__15082); - this.rule__MetricAndWeight__Group__1__Impl(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__1__Impl_in_rule__MetricAndWeight__Group__15082); + rule__MetricAndWeight__Group__1__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__2_in_rule__MetricAndWeight__Group__15085); - this.rule__MetricAndWeight__Group__2(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__2_in_rule__MetricAndWeight__Group__15085); + rule__MetricAndWeight__Group__2(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__1" // $ANTLR start "rule__MetricAndWeight__Group__1__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2589:1: - // rule__MetricAndWeight__Group__1__Impl : ( ( rule__MetricAndWeight__MetricAssignment_1 ) ) ; + // rule__MetricAndWeight__Group__1__Impl : ( ( + // rule__MetricAndWeight__MetricAssignment_1 ) ) ; public final void rule__MetricAndWeight__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2593:1: @@ -6677,35 +6549,34 @@ public final void rule__MetricAndWeight__Group__1__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2595:1: // ( rule__MetricAndWeight__MetricAssignment_1 ) { - this.before(this.grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1()); + this.before(grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2596:1: // ( rule__MetricAndWeight__MetricAssignment_1 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2596:2: // rule__MetricAndWeight__MetricAssignment_1 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricAndWeight__MetricAssignment_1_in_rule__MetricAndWeight__Group__1__Impl5112); - this.rule__MetricAndWeight__MetricAssignment_1(); + rule__MetricAndWeight__MetricAssignment_1(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1()); + this.after(grammarAccess.getMetricAndWeightAccess().getMetricAssignment_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__1__Impl" @@ -6715,7 +6586,7 @@ public final void rule__MetricAndWeight__Group__1__Impl() throws RecognitionExce // rule__MetricAndWeight__Group__3 ; public final void rule__MetricAndWeight__Group__2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2610:1: @@ -6723,27 +6594,26 @@ public final void rule__MetricAndWeight__Group__2() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2611:2: // rule__MetricAndWeight__Group__2__Impl rule__MetricAndWeight__Group__3 { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__2__Impl_in_rule__MetricAndWeight__Group__25142); - this.rule__MetricAndWeight__Group__2__Impl(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__2__Impl_in_rule__MetricAndWeight__Group__25142); + rule__MetricAndWeight__Group__2__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__3_in_rule__MetricAndWeight__Group__25145); - this.rule__MetricAndWeight__Group__3(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__3_in_rule__MetricAndWeight__Group__25145); + rule__MetricAndWeight__Group__3(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__2" @@ -6752,7 +6622,7 @@ public final void rule__MetricAndWeight__Group__2() throws RecognitionException // rule__MetricAndWeight__Group__2__Impl : ( ',' ) ; public final void rule__MetricAndWeight__Group__2__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2622:1: @@ -6765,23 +6635,22 @@ public final void rule__MetricAndWeight__Group__2__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2624:1: // ',' { - this.before(this.grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); - this.match(this.input, 20, FOLLOW_20_in_rule__MetricAndWeight__Group__2__Impl5173); - this.after(this.grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); + this.before(grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); + match(input, 20, FOLLOW_20_in_rule__MetricAndWeight__Group__2__Impl5173); + this.after(grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__2__Impl" @@ -6791,7 +6660,7 @@ public final void rule__MetricAndWeight__Group__2__Impl() throws RecognitionExce // rule__MetricAndWeight__Group__4 ; public final void rule__MetricAndWeight__Group__3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2641:1: @@ -6799,36 +6668,36 @@ public final void rule__MetricAndWeight__Group__3() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2642:2: // rule__MetricAndWeight__Group__3__Impl rule__MetricAndWeight__Group__4 { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__3__Impl_in_rule__MetricAndWeight__Group__35204); - this.rule__MetricAndWeight__Group__3__Impl(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__3__Impl_in_rule__MetricAndWeight__Group__35204); + rule__MetricAndWeight__Group__3__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__4_in_rule__MetricAndWeight__Group__35207); - this.rule__MetricAndWeight__Group__4(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__4_in_rule__MetricAndWeight__Group__35207); + rule__MetricAndWeight__Group__4(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__3" // $ANTLR start "rule__MetricAndWeight__Group__3__Impl" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2649:1: - // rule__MetricAndWeight__Group__3__Impl : ( ( rule__MetricAndWeight__WeightAssignment_3 ) ) ; + // rule__MetricAndWeight__Group__3__Impl : ( ( + // rule__MetricAndWeight__WeightAssignment_3 ) ) ; public final void rule__MetricAndWeight__Group__3__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2653:1: @@ -6841,35 +6710,34 @@ public final void rule__MetricAndWeight__Group__3__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2655:1: // ( rule__MetricAndWeight__WeightAssignment_3 ) { - this.before(this.grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3()); + this.before(grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2656:1: // ( rule__MetricAndWeight__WeightAssignment_3 ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2656:2: // rule__MetricAndWeight__WeightAssignment_3 { - this.pushFollow( + pushFollow( FOLLOW_rule__MetricAndWeight__WeightAssignment_3_in_rule__MetricAndWeight__Group__3__Impl5234); - this.rule__MetricAndWeight__WeightAssignment_3(); + rule__MetricAndWeight__WeightAssignment_3(); - this.state._fsp--; + state._fsp--; } - this.after(this.grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3()); + this.after(grammarAccess.getMetricAndWeightAccess().getWeightAssignment_3()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__3__Impl" @@ -6878,7 +6746,7 @@ public final void rule__MetricAndWeight__Group__3__Impl() throws RecognitionExce // rule__MetricAndWeight__Group__4 : rule__MetricAndWeight__Group__4__Impl ; public final void rule__MetricAndWeight__Group__4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2670:1: @@ -6886,22 +6754,21 @@ public final void rule__MetricAndWeight__Group__4() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2671:2: // rule__MetricAndWeight__Group__4__Impl { - this.pushFollow(FOLLOW_rule__MetricAndWeight__Group__4__Impl_in_rule__MetricAndWeight__Group__45264); - this.rule__MetricAndWeight__Group__4__Impl(); + pushFollow(FOLLOW_rule__MetricAndWeight__Group__4__Impl_in_rule__MetricAndWeight__Group__45264); + rule__MetricAndWeight__Group__4__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__4" @@ -6910,7 +6777,7 @@ public final void rule__MetricAndWeight__Group__4() throws RecognitionException // rule__MetricAndWeight__Group__4__Impl : ( '>' ) ; public final void rule__MetricAndWeight__Group__4__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2681:1: @@ -6923,23 +6790,22 @@ public final void rule__MetricAndWeight__Group__4__Impl() throws RecognitionExce // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2683:1: // '>' { - this.before(this.grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); - this.match(this.input, 34, FOLLOW_34_in_rule__MetricAndWeight__Group__4__Impl5292); - this.after(this.grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); + this.before(grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); + match(input, 34, FOLLOW_34_in_rule__MetricAndWeight__Group__4__Impl5292); + this.after(grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__Group__4__Impl" @@ -6948,7 +6814,7 @@ public final void rule__MetricAndWeight__Group__4__Impl() throws RecognitionExce // rule__MYID__Group__0 : rule__MYID__Group__0__Impl rule__MYID__Group__1 ; public final void rule__MYID__Group__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2710:1: @@ -6956,27 +6822,26 @@ public final void rule__MYID__Group__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2711:2: // rule__MYID__Group__0__Impl rule__MYID__Group__1 { - this.pushFollow(FOLLOW_rule__MYID__Group__0__Impl_in_rule__MYID__Group__05333); - this.rule__MYID__Group__0__Impl(); + pushFollow(FOLLOW_rule__MYID__Group__0__Impl_in_rule__MYID__Group__05333); + rule__MYID__Group__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MYID__Group__1_in_rule__MYID__Group__05336); - this.rule__MYID__Group__1(); + pushFollow(FOLLOW_rule__MYID__Group__1_in_rule__MYID__Group__05336); + rule__MYID__Group__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group__0" @@ -6985,7 +6850,7 @@ public final void rule__MYID__Group__0() throws RecognitionException { // rule__MYID__Group__0__Impl : ( RULE_ID ) ; public final void rule__MYID__Group__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2722:1: @@ -6998,23 +6863,22 @@ public final void rule__MYID__Group__0__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2724:1: // RULE_ID { - this.before(this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); - this.match(this.input, RULE_ID, FOLLOW_RULE_ID_in_rule__MYID__Group__0__Impl5363); - this.after(this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); + this.before(grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); + match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__MYID__Group__0__Impl5363); + this.after(grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group__0__Impl" @@ -7023,7 +6887,7 @@ public final void rule__MYID__Group__0__Impl() throws RecognitionException { // rule__MYID__Group__1 : rule__MYID__Group__1__Impl ; public final void rule__MYID__Group__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2739:1: @@ -7031,22 +6895,21 @@ public final void rule__MYID__Group__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2740:2: // rule__MYID__Group__1__Impl { - this.pushFollow(FOLLOW_rule__MYID__Group__1__Impl_in_rule__MYID__Group__15392); - this.rule__MYID__Group__1__Impl(); + pushFollow(FOLLOW_rule__MYID__Group__1__Impl_in_rule__MYID__Group__15392); + rule__MYID__Group__1__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group__1" @@ -7055,7 +6918,7 @@ public final void rule__MYID__Group__1() throws RecognitionException { // rule__MYID__Group__1__Impl : ( ( rule__MYID__Group_1__0 )* ) ; public final void rule__MYID__Group__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2750:1: @@ -7068,12 +6931,12 @@ public final void rule__MYID__Group__1__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2752:1: // ( rule__MYID__Group_1__0 )* { - this.before(this.grammarAccess.getMYIDAccess().getGroup_1()); + this.before(grammarAccess.getMYIDAccess().getGroup_1()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2753:1: // ( rule__MYID__Group_1__0 )* loop10: do { int alt10 = 2; - final int LA10_0 = this.input.LA(1); + final int LA10_0 = input.LA(1); if ((LA10_0 == 35)) { alt10 = 1; @@ -7084,10 +6947,10 @@ public final void rule__MYID__Group__1__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2753:2: // rule__MYID__Group_1__0 { - this.pushFollow(FOLLOW_rule__MYID__Group_1__0_in_rule__MYID__Group__1__Impl5419); - this.rule__MYID__Group_1__0(); + pushFollow(FOLLOW_rule__MYID__Group_1__0_in_rule__MYID__Group__1__Impl5419); + rule__MYID__Group_1__0(); - this.state._fsp--; + state._fsp--; } break; @@ -7097,30 +6960,30 @@ public final void rule__MYID__Group__1__Impl() throws RecognitionException { } } while (true); - this.after(this.grammarAccess.getMYIDAccess().getGroup_1()); + this.after(grammarAccess.getMYIDAccess().getGroup_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group__1__Impl" // $ANTLR start "rule__MYID__Group_1__0" // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2767:1: - // rule__MYID__Group_1__0 : rule__MYID__Group_1__0__Impl rule__MYID__Group_1__1 ; + // rule__MYID__Group_1__0 : rule__MYID__Group_1__0__Impl rule__MYID__Group_1__1 + // ; public final void rule__MYID__Group_1__0() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2771:1: @@ -7128,27 +6991,26 @@ public final void rule__MYID__Group_1__0() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2772:2: // rule__MYID__Group_1__0__Impl rule__MYID__Group_1__1 { - this.pushFollow(FOLLOW_rule__MYID__Group_1__0__Impl_in_rule__MYID__Group_1__05454); - this.rule__MYID__Group_1__0__Impl(); + pushFollow(FOLLOW_rule__MYID__Group_1__0__Impl_in_rule__MYID__Group_1__05454); + rule__MYID__Group_1__0__Impl(); - this.state._fsp--; + state._fsp--; - this.pushFollow(FOLLOW_rule__MYID__Group_1__1_in_rule__MYID__Group_1__05457); - this.rule__MYID__Group_1__1(); + pushFollow(FOLLOW_rule__MYID__Group_1__1_in_rule__MYID__Group_1__05457); + rule__MYID__Group_1__1(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group_1__0" @@ -7157,7 +7019,7 @@ public final void rule__MYID__Group_1__0() throws RecognitionException { // rule__MYID__Group_1__0__Impl : ( '.' ) ; public final void rule__MYID__Group_1__0__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2783:1: @@ -7170,23 +7032,22 @@ public final void rule__MYID__Group_1__0__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2785:1: // '.' { - this.before(this.grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); - this.match(this.input, 35, FOLLOW_35_in_rule__MYID__Group_1__0__Impl5485); - this.after(this.grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); + this.before(grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); + match(input, 35, FOLLOW_35_in_rule__MYID__Group_1__0__Impl5485); + this.after(grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group_1__0__Impl" @@ -7195,7 +7056,7 @@ public final void rule__MYID__Group_1__0__Impl() throws RecognitionException { // rule__MYID__Group_1__1 : rule__MYID__Group_1__1__Impl ; public final void rule__MYID__Group_1__1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2802:1: @@ -7203,22 +7064,21 @@ public final void rule__MYID__Group_1__1() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2803:2: // rule__MYID__Group_1__1__Impl { - this.pushFollow(FOLLOW_rule__MYID__Group_1__1__Impl_in_rule__MYID__Group_1__15516); - this.rule__MYID__Group_1__1__Impl(); + pushFollow(FOLLOW_rule__MYID__Group_1__1__Impl_in_rule__MYID__Group_1__15516); + rule__MYID__Group_1__1__Impl(); - this.state._fsp--; + state._fsp--; } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group_1__1" @@ -7227,7 +7087,7 @@ public final void rule__MYID__Group_1__1() throws RecognitionException { // rule__MYID__Group_1__1__Impl : ( RULE_ID ) ; public final void rule__MYID__Group_1__1__Impl() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2813:1: @@ -7240,23 +7100,22 @@ public final void rule__MYID__Group_1__1__Impl() throws RecognitionException { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2815:1: // RULE_ID { - this.before(this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); - this.match(this.input, RULE_ID, FOLLOW_RULE_ID_in_rule__MYID__Group_1__1__Impl5543); - this.after(this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); + this.before(grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); + match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__MYID__Group_1__1__Impl5543); + this.after(grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MYID__Group_1__1__Impl" @@ -7265,7 +7124,7 @@ public final void rule__MYID__Group_1__1__Impl() throws RecognitionException { // rule__MetricModel__ImportURIAssignment_0_1 : ( RULE_STRING ) ; public final void rule__MetricModel__ImportURIAssignment_0_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2835:1: @@ -7278,24 +7137,22 @@ public final void rule__MetricModel__ImportURIAssignment_0_1() throws Recognitio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2837:1: // RULE_STRING { - this.before(this.grammarAccess.getMetricModelAccess().getImportURISTRINGTerminalRuleCall_0_1_0()); - this.match(this.input, RULE_STRING, - FOLLOW_RULE_STRING_in_rule__MetricModel__ImportURIAssignment_0_15581); - this.after(this.grammarAccess.getMetricModelAccess().getImportURISTRINGTerminalRuleCall_0_1_0()); + this.before(grammarAccess.getMetricModelAccess().getImportURISTRINGTerminalRuleCall_0_1_0()); + match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__MetricModel__ImportURIAssignment_0_15581); + this.after(grammarAccess.getMetricModelAccess().getImportURISTRINGTerminalRuleCall_0_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__ImportURIAssignment_0_1" @@ -7304,7 +7161,7 @@ public final void rule__MetricModel__ImportURIAssignment_0_1() throws Recognitio // rule__MetricModel__MetricsAssignment_1_1 : ( ruleExternalMetric ) ; public final void rule__MetricModel__MetricsAssignment_1_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2850:1: @@ -7317,29 +7174,26 @@ public final void rule__MetricModel__MetricsAssignment_1_1() throws RecognitionE // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2852:1: // ruleExternalMetric { - this.before( - this.grammarAccess.getMetricModelAccess().getMetricsExternalMetricParserRuleCall_1_1_0()); - this.pushFollow(FOLLOW_ruleExternalMetric_in_rule__MetricModel__MetricsAssignment_1_15612); - this.ruleExternalMetric(); + this.before(grammarAccess.getMetricModelAccess().getMetricsExternalMetricParserRuleCall_1_1_0()); + pushFollow(FOLLOW_ruleExternalMetric_in_rule__MetricModel__MetricsAssignment_1_15612); + ruleExternalMetric(); - this.state._fsp--; + state._fsp--; - this.after( - this.grammarAccess.getMetricModelAccess().getMetricsExternalMetricParserRuleCall_1_1_0()); + this.after(grammarAccess.getMetricModelAccess().getMetricsExternalMetricParserRuleCall_1_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__MetricsAssignment_1_1" @@ -7348,7 +7202,7 @@ public final void rule__MetricModel__MetricsAssignment_1_1() throws RecognitionE // rule__MetricModel__MetricsAssignment_4 : ( ruleInternalMetric ) ; public final void rule__MetricModel__MetricsAssignment_4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2865:1: @@ -7361,27 +7215,26 @@ public final void rule__MetricModel__MetricsAssignment_4() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2867:1: // ruleInternalMetric { - this.before(this.grammarAccess.getMetricModelAccess().getMetricsInternalMetricParserRuleCall_4_0()); - this.pushFollow(FOLLOW_ruleInternalMetric_in_rule__MetricModel__MetricsAssignment_45643); - this.ruleInternalMetric(); + this.before(grammarAccess.getMetricModelAccess().getMetricsInternalMetricParserRuleCall_4_0()); + pushFollow(FOLLOW_ruleInternalMetric_in_rule__MetricModel__MetricsAssignment_45643); + ruleInternalMetric(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricModelAccess().getMetricsInternalMetricParserRuleCall_4_0()); + this.after(grammarAccess.getMetricModelAccess().getMetricsInternalMetricParserRuleCall_4_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricModel__MetricsAssignment_4" @@ -7390,7 +7243,7 @@ public final void rule__MetricModel__MetricsAssignment_4() throws RecognitionExc // rule__ExternalMetric__NameAssignment : ( ruleMYID ) ; public final void rule__ExternalMetric__NameAssignment() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2880:1: @@ -7403,27 +7256,26 @@ public final void rule__ExternalMetric__NameAssignment() throws RecognitionExcep // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2882:1: // ruleMYID { - this.before(this.grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__ExternalMetric__NameAssignment5674); - this.ruleMYID(); + this.before(grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); + pushFollow(FOLLOW_ruleMYID_in_rule__ExternalMetric__NameAssignment5674); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); + this.after(grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__ExternalMetric__NameAssignment" @@ -7432,7 +7284,7 @@ public final void rule__ExternalMetric__NameAssignment() throws RecognitionExcep // rule__InternalMetric__NameAssignment_1 : ( ruleMYID ) ; public final void rule__InternalMetric__NameAssignment_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2895:1: @@ -7445,27 +7297,26 @@ public final void rule__InternalMetric__NameAssignment_1() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2897:1: // ruleMYID { - this.before(this.grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__InternalMetric__NameAssignment_15705); - this.ruleMYID(); + this.before(grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); + pushFollow(FOLLOW_ruleMYID_in_rule__InternalMetric__NameAssignment_15705); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); + this.after(grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__NameAssignment_1" @@ -7474,7 +7325,7 @@ public final void rule__InternalMetric__NameAssignment_1() throws RecognitionExc // rule__InternalMetric__ShortNameAssignment_3 : ( RULE_STRING ) ; public final void rule__InternalMetric__ShortNameAssignment_3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2910:1: @@ -7487,24 +7338,22 @@ public final void rule__InternalMetric__ShortNameAssignment_3() throws Recogniti // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2912:1: // RULE_STRING { - this.before(this.grammarAccess.getInternalMetricAccess().getShortNameSTRINGTerminalRuleCall_3_0()); - this.match(this.input, RULE_STRING, - FOLLOW_RULE_STRING_in_rule__InternalMetric__ShortNameAssignment_35736); - this.after(this.grammarAccess.getInternalMetricAccess().getShortNameSTRINGTerminalRuleCall_3_0()); + this.before(grammarAccess.getInternalMetricAccess().getShortNameSTRINGTerminalRuleCall_3_0()); + match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__InternalMetric__ShortNameAssignment_35736); + this.after(grammarAccess.getInternalMetricAccess().getShortNameSTRINGTerminalRuleCall_3_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__ShortNameAssignment_3" @@ -7513,7 +7362,7 @@ public final void rule__InternalMetric__ShortNameAssignment_3() throws Recogniti // rule__InternalMetric__DescriptionAssignment_5 : ( RULE_STRING ) ; public final void rule__InternalMetric__DescriptionAssignment_5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2925:1: @@ -7526,25 +7375,22 @@ public final void rule__InternalMetric__DescriptionAssignment_5() throws Recogni // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2927:1: // RULE_STRING { - this.before( - this.grammarAccess.getInternalMetricAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); - this.match(this.input, RULE_STRING, - FOLLOW_RULE_STRING_in_rule__InternalMetric__DescriptionAssignment_55767); - this.after(this.grammarAccess.getInternalMetricAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); + this.before(grammarAccess.getInternalMetricAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); + match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__InternalMetric__DescriptionAssignment_55767); + this.after(grammarAccess.getInternalMetricAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__DescriptionAssignment_5" @@ -7553,7 +7399,7 @@ public final void rule__InternalMetric__DescriptionAssignment_5() throws Recogni // rule__InternalMetric__ParameterAssignment_8_2 : ( ruleNumber ) ; public final void rule__InternalMetric__ParameterAssignment_8_2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2940:1: @@ -7566,27 +7412,26 @@ public final void rule__InternalMetric__ParameterAssignment_8_2() throws Recogni // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2942:1: // ruleNumber { - this.before(this.grammarAccess.getInternalMetricAccess().getParameterNumberParserRuleCall_8_2_0()); - this.pushFollow(FOLLOW_ruleNumber_in_rule__InternalMetric__ParameterAssignment_8_25798); - this.ruleNumber(); + this.before(grammarAccess.getInternalMetricAccess().getParameterNumberParserRuleCall_8_2_0()); + pushFollow(FOLLOW_ruleNumber_in_rule__InternalMetric__ParameterAssignment_8_25798); + ruleNumber(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getInternalMetricAccess().getParameterNumberParserRuleCall_8_2_0()); + this.after(grammarAccess.getInternalMetricAccess().getParameterNumberParserRuleCall_8_2_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__ParameterAssignment_8_2" @@ -7595,7 +7440,7 @@ public final void rule__InternalMetric__ParameterAssignment_8_2() throws Recogni // rule__InternalMetric__DefinitionAssignment_9 : ( ruleMetricDefinition ) ; public final void rule__InternalMetric__DefinitionAssignment_9() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2955:1: @@ -7608,29 +7453,28 @@ public final void rule__InternalMetric__DefinitionAssignment_9() throws Recognit // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2957:1: // ruleMetricDefinition { - this.before(this.grammarAccess.getInternalMetricAccess() - .getDefinitionMetricDefinitionParserRuleCall_9_0()); - this.pushFollow(FOLLOW_ruleMetricDefinition_in_rule__InternalMetric__DefinitionAssignment_95829); - this.ruleMetricDefinition(); + this.before( + grammarAccess.getInternalMetricAccess().getDefinitionMetricDefinitionParserRuleCall_9_0()); + pushFollow(FOLLOW_ruleMetricDefinition_in_rule__InternalMetric__DefinitionAssignment_95829); + ruleMetricDefinition(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getInternalMetricAccess() - .getDefinitionMetricDefinitionParserRuleCall_9_0()); + this.after( + grammarAccess.getInternalMetricAccess().getDefinitionMetricDefinitionParserRuleCall_9_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__InternalMetric__DefinitionAssignment_9" @@ -7639,7 +7483,7 @@ public final void rule__InternalMetric__DefinitionAssignment_9() throws Recognit // rule__Parameter__NameAssignment_1 : ( ruleMYID ) ; public final void rule__Parameter__NameAssignment_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2970:1: @@ -7652,27 +7496,26 @@ public final void rule__Parameter__NameAssignment_1() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2972:1: // ruleMYID { - this.before(this.grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__Parameter__NameAssignment_15860); - this.ruleMYID(); + this.before(grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); + pushFollow(FOLLOW_ruleMYID_in_rule__Parameter__NameAssignment_15860); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); + this.after(grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__NameAssignment_1" @@ -7681,7 +7524,7 @@ public final void rule__Parameter__NameAssignment_1() throws RecognitionExceptio // rule__Parameter__ShortnameAssignment_3 : ( RULE_STRING ) ; public final void rule__Parameter__ShortnameAssignment_3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2985:1: @@ -7694,24 +7537,22 @@ public final void rule__Parameter__ShortnameAssignment_3() throws RecognitionExc // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:2987:1: // RULE_STRING { - this.before(this.grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); - this.match(this.input, RULE_STRING, - FOLLOW_RULE_STRING_in_rule__Parameter__ShortnameAssignment_35891); - this.after(this.grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); + this.before(grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); + match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__Parameter__ShortnameAssignment_35891); + this.after(grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__ShortnameAssignment_3" @@ -7720,7 +7561,7 @@ public final void rule__Parameter__ShortnameAssignment_3() throws RecognitionExc // rule__Parameter__DescriptionAssignment_5 : ( RULE_STRING ) ; public final void rule__Parameter__DescriptionAssignment_5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3000:1: @@ -7733,24 +7574,22 @@ public final void rule__Parameter__DescriptionAssignment_5() throws RecognitionE // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3002:1: // RULE_STRING { - this.before(this.grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); - this.match(this.input, RULE_STRING, - FOLLOW_RULE_STRING_in_rule__Parameter__DescriptionAssignment_55922); - this.after(this.grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); + this.before(grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); + match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__Parameter__DescriptionAssignment_55922); + this.after(grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__DescriptionAssignment_5" @@ -7759,7 +7598,7 @@ public final void rule__Parameter__DescriptionAssignment_5() throws RecognitionE // rule__Parameter__DefaultValueAssignment_7 : ( RULE_DOUBLE ) ; public final void rule__Parameter__DefaultValueAssignment_7() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3015:1: @@ -7772,24 +7611,22 @@ public final void rule__Parameter__DefaultValueAssignment_7() throws Recognition // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3017:1: // RULE_DOUBLE { - this.before(this.grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0()); - this.match(this.input, RULE_DOUBLE, - FOLLOW_RULE_DOUBLE_in_rule__Parameter__DefaultValueAssignment_75953); - this.after(this.grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0()); + this.before(grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0()); + match(input, RULE_DOUBLE, FOLLOW_RULE_DOUBLE_in_rule__Parameter__DefaultValueAssignment_75953); + this.after(grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Parameter__DefaultValueAssignment_7" @@ -7798,7 +7635,7 @@ public final void rule__Parameter__DefaultValueAssignment_7() throws Recognition // rule__Constant__NameAssignment_1 : ( ruleMYID ) ; public final void rule__Constant__NameAssignment_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3030:1: @@ -7811,27 +7648,26 @@ public final void rule__Constant__NameAssignment_1() throws RecognitionException // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3032:1: // ruleMYID { - this.before(this.grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__Constant__NameAssignment_15984); - this.ruleMYID(); + this.before(grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); + pushFollow(FOLLOW_ruleMYID_in_rule__Constant__NameAssignment_15984); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); + this.after(grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__NameAssignment_1" @@ -7840,7 +7676,7 @@ public final void rule__Constant__NameAssignment_1() throws RecognitionException // rule__Constant__ValueAssignment_3 : ( RULE_DOUBLE ) ; public final void rule__Constant__ValueAssignment_3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3045:1: @@ -7853,23 +7689,22 @@ public final void rule__Constant__ValueAssignment_3() throws RecognitionExceptio // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3047:1: // RULE_DOUBLE { - this.before(this.grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); - this.match(this.input, RULE_DOUBLE, FOLLOW_RULE_DOUBLE_in_rule__Constant__ValueAssignment_36015); - this.after(this.grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); + this.before(grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); + match(input, RULE_DOUBLE, FOLLOW_RULE_DOUBLE_in_rule__Constant__ValueAssignment_36015); + this.after(grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__Constant__ValueAssignment_3" @@ -7878,7 +7713,7 @@ public final void rule__Constant__ValueAssignment_3() throws RecognitionExceptio // rule__WeightedMetric__WeightsAssignment_2 : ( ruleMetricAndWeight ) ; public final void rule__WeightedMetric__WeightsAssignment_2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3060:1: @@ -7891,29 +7726,26 @@ public final void rule__WeightedMetric__WeightsAssignment_2() throws Recognition // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3062:1: // ruleMetricAndWeight { - this.before( - this.grammarAccess.getWeightedMetricAccess().getWeightsMetricAndWeightParserRuleCall_2_0()); - this.pushFollow(FOLLOW_ruleMetricAndWeight_in_rule__WeightedMetric__WeightsAssignment_26046); - this.ruleMetricAndWeight(); + this.before(grammarAccess.getWeightedMetricAccess().getWeightsMetricAndWeightParserRuleCall_2_0()); + pushFollow(FOLLOW_ruleMetricAndWeight_in_rule__WeightedMetric__WeightsAssignment_26046); + ruleMetricAndWeight(); - this.state._fsp--; + state._fsp--; - this.after( - this.grammarAccess.getWeightedMetricAccess().getWeightsMetricAndWeightParserRuleCall_2_0()); + this.after(grammarAccess.getWeightedMetricAccess().getWeightsMetricAndWeightParserRuleCall_2_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__WeightedMetric__WeightsAssignment_2" @@ -7922,7 +7754,7 @@ public final void rule__WeightedMetric__WeightsAssignment_2() throws Recognition // rule__StepwiseMetric__InnerMetricAssignment_2 : ( ( ruleMYID ) ) ; public final void rule__StepwiseMetric__InnerMetricAssignment_2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3075:1: @@ -7935,39 +7767,38 @@ public final void rule__StepwiseMetric__InnerMetricAssignment_2() throws Recogni // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3077:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricCrossReference_2_0()); + this.before(grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricCrossReference_2_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3078:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3079:1: // ruleMYID { - this.before(this.grammarAccess.getStepwiseMetricAccess() - .getInnerMetricMetricMYIDParserRuleCall_2_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__StepwiseMetric__InnerMetricAssignment_26081); - this.ruleMYID(); + this.before( + grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricMYIDParserRuleCall_2_0_1()); + pushFollow(FOLLOW_ruleMYID_in_rule__StepwiseMetric__InnerMetricAssignment_26081); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getStepwiseMetricAccess() - .getInnerMetricMetricMYIDParserRuleCall_2_0_1()); + this.after( + grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricMYIDParserRuleCall_2_0_1()); } - this.after(this.grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricCrossReference_2_0()); + this.after(grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricCrossReference_2_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__InnerMetricAssignment_2" @@ -7976,7 +7807,7 @@ public final void rule__StepwiseMetric__InnerMetricAssignment_2() throws Recogni // rule__StepwiseMetric__StepsAssignment_5 : ( ruleBoundAndWeight ) ; public final void rule__StepwiseMetric__StepsAssignment_5() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3094:1: @@ -7989,28 +7820,26 @@ public final void rule__StepwiseMetric__StepsAssignment_5() throws RecognitionEx // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3096:1: // ruleBoundAndWeight { - this.before( - this.grammarAccess.getStepwiseMetricAccess().getStepsBoundAndWeightParserRuleCall_5_0()); - this.pushFollow(FOLLOW_ruleBoundAndWeight_in_rule__StepwiseMetric__StepsAssignment_56116); - this.ruleBoundAndWeight(); + this.before(grammarAccess.getStepwiseMetricAccess().getStepsBoundAndWeightParserRuleCall_5_0()); + pushFollow(FOLLOW_ruleBoundAndWeight_in_rule__StepwiseMetric__StepsAssignment_56116); + ruleBoundAndWeight(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getStepwiseMetricAccess().getStepsBoundAndWeightParserRuleCall_5_0()); + this.after(grammarAccess.getStepwiseMetricAccess().getStepsBoundAndWeightParserRuleCall_5_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__StepwiseMetric__StepsAssignment_5" @@ -8019,7 +7848,7 @@ public final void rule__StepwiseMetric__StepsAssignment_5() throws RecognitionEx // rule__RatioMetric__NominatorMetricAssignment_2 : ( ( ruleMYID ) ) ; public final void rule__RatioMetric__NominatorMetricAssignment_2() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3109:1: @@ -8032,39 +7861,38 @@ public final void rule__RatioMetric__NominatorMetricAssignment_2() throws Recogn // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3111:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getRatioMetricAccess().getNominatorMetricMetricCrossReference_2_0()); + this.before(grammarAccess.getRatioMetricAccess().getNominatorMetricMetricCrossReference_2_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3112:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3113:1: // ruleMYID { - this.before(this.grammarAccess.getRatioMetricAccess() + this.before(grammarAccess.getRatioMetricAccess() .getNominatorMetricMetricMYIDParserRuleCall_2_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__RatioMetric__NominatorMetricAssignment_26151); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_rule__RatioMetric__NominatorMetricAssignment_26151); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getRatioMetricAccess() + this.after(grammarAccess.getRatioMetricAccess() .getNominatorMetricMetricMYIDParserRuleCall_2_0_1()); } - this.after(this.grammarAccess.getRatioMetricAccess().getNominatorMetricMetricCrossReference_2_0()); + this.after(grammarAccess.getRatioMetricAccess().getNominatorMetricMetricCrossReference_2_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__NominatorMetricAssignment_2" @@ -8073,7 +7901,7 @@ public final void rule__RatioMetric__NominatorMetricAssignment_2() throws Recogn // rule__RatioMetric__DenominatorMetricAssignment_4 : ( ( ruleMYID ) ) ; public final void rule__RatioMetric__DenominatorMetricAssignment_4() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3128:1: @@ -8086,41 +7914,38 @@ public final void rule__RatioMetric__DenominatorMetricAssignment_4() throws Reco // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3130:1: // ( ruleMYID ) { - this.before( - this.grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricCrossReference_4_0()); + this.before(grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricCrossReference_4_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3131:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3132:1: // ruleMYID { - this.before(this.grammarAccess.getRatioMetricAccess() + this.before(grammarAccess.getRatioMetricAccess() .getDenominatorMetricMetricMYIDParserRuleCall_4_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__RatioMetric__DenominatorMetricAssignment_46190); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_rule__RatioMetric__DenominatorMetricAssignment_46190); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getRatioMetricAccess() + this.after(grammarAccess.getRatioMetricAccess() .getDenominatorMetricMetricMYIDParserRuleCall_4_0_1()); } - this.after( - this.grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricCrossReference_4_0()); + this.after(grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricCrossReference_4_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__RatioMetric__DenominatorMetricAssignment_4" @@ -8129,7 +7954,7 @@ public final void rule__RatioMetric__DenominatorMetricAssignment_4() throws Reco // rule__BoundAndWeight__UpperBoundAssignment_1 : ( ( ruleMYID ) ) ; public final void rule__BoundAndWeight__UpperBoundAssignment_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3147:1: @@ -8142,39 +7967,38 @@ public final void rule__BoundAndWeight__UpperBoundAssignment_1() throws Recognit // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3149:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberCrossReference_1_0()); + this.before(grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberCrossReference_1_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3150:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3151:1: // ruleMYID { - this.before(this.grammarAccess.getBoundAndWeightAccess() - .getUpperBoundNumberMYIDParserRuleCall_1_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__BoundAndWeight__UpperBoundAssignment_16229); - this.ruleMYID(); + this.before( + grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberMYIDParserRuleCall_1_0_1()); + pushFollow(FOLLOW_ruleMYID_in_rule__BoundAndWeight__UpperBoundAssignment_16229); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getBoundAndWeightAccess() - .getUpperBoundNumberMYIDParserRuleCall_1_0_1()); + this.after( + grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberMYIDParserRuleCall_1_0_1()); } - this.after(this.grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberCrossReference_1_0()); + this.after(grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberCrossReference_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__UpperBoundAssignment_1" @@ -8183,7 +8007,7 @@ public final void rule__BoundAndWeight__UpperBoundAssignment_1() throws Recognit // rule__BoundAndWeight__WeightAssignment_3 : ( ( ruleMYID ) ) ; public final void rule__BoundAndWeight__WeightAssignment_3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3166:1: @@ -8196,39 +8020,36 @@ public final void rule__BoundAndWeight__WeightAssignment_3() throws RecognitionE // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3168:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); + this.before(grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3169:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3170:1: // ruleMYID { - this.before( - this.grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__BoundAndWeight__WeightAssignment_36268); - this.ruleMYID(); + this.before(grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); + pushFollow(FOLLOW_ruleMYID_in_rule__BoundAndWeight__WeightAssignment_36268); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after( - this.grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); + this.after(grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); } - this.after(this.grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); + this.after(grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__BoundAndWeight__WeightAssignment_3" @@ -8237,7 +8058,7 @@ public final void rule__BoundAndWeight__WeightAssignment_3() throws RecognitionE // rule__MetricAndWeight__MetricAssignment_1 : ( ( ruleMYID ) ) ; public final void rule__MetricAndWeight__MetricAssignment_1() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3185:1: @@ -8250,39 +8071,36 @@ public final void rule__MetricAndWeight__MetricAssignment_1() throws Recognition // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3187:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); + this.before(grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3188:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3189:1: // ruleMYID { - this.before(this.grammarAccess.getMetricAndWeightAccess() - .getMetricMetricMYIDParserRuleCall_1_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__MetricAndWeight__MetricAssignment_16307); - this.ruleMYID(); + this.before(grammarAccess.getMetricAndWeightAccess().getMetricMetricMYIDParserRuleCall_1_0_1()); + pushFollow(FOLLOW_ruleMYID_in_rule__MetricAndWeight__MetricAssignment_16307); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricAndWeightAccess() - .getMetricMetricMYIDParserRuleCall_1_0_1()); + this.after(grammarAccess.getMetricAndWeightAccess().getMetricMetricMYIDParserRuleCall_1_0_1()); } - this.after(this.grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); + this.after(grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__MetricAssignment_1" @@ -8291,7 +8109,7 @@ public final void rule__MetricAndWeight__MetricAssignment_1() throws Recognition // rule__MetricAndWeight__WeightAssignment_3 : ( ( ruleMYID ) ) ; public final void rule__MetricAndWeight__WeightAssignment_3() throws RecognitionException { - final int stackSize = this.keepStackSize(); + final int stackSize = keepStackSize(); try { // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3204:1: @@ -8304,39 +8122,36 @@ public final void rule__MetricAndWeight__WeightAssignment_3() throws Recognition // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3206:1: // ( ruleMYID ) { - this.before(this.grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); + this.before(grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3207:1: // ( ruleMYID ) // ../org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/contentassist/antlr/internal/InternalMetricDSL.g:3208:1: // ruleMYID { - this.before(this.grammarAccess.getMetricAndWeightAccess() - .getWeightNumberMYIDParserRuleCall_3_0_1()); - this.pushFollow(FOLLOW_ruleMYID_in_rule__MetricAndWeight__WeightAssignment_36346); - this.ruleMYID(); + this.before(grammarAccess.getMetricAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); + pushFollow(FOLLOW_ruleMYID_in_rule__MetricAndWeight__WeightAssignment_36346); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.after(this.grammarAccess.getMetricAndWeightAccess() - .getWeightNumberMYIDParserRuleCall_3_0_1()); + this.after(grammarAccess.getMetricAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1()); } - this.after(this.grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); + this.after(grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); } } } catch (final RecognitionException re) { - this.reportError(re); - this.recover(this.input, re); + reportError(re); + recover(input, re); } finally { - this.restoreStackSize(stackSize); + restoreStackSize(stackSize); } - return; } // $ANTLR end "rule__MetricAndWeight__WeightAssignment_3" diff --git a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/internal/MetricDSLActivator.java b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/internal/MetricDSLActivator.java index 1f07d8f..846edb0 100644 --- a/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/internal/MetricDSLActivator.java +++ b/bundles/org.somox.metrics.dsl.ui/src-gen/org/somox/metrics/dsl/ui/internal/MetricDSLActivator.java @@ -18,7 +18,8 @@ import com.google.inject.Module; /** - * This class was generated. Customizations should only happen in a newly introduced subclass. + * This class was generated. Customizations should only happen in a newly + * introduced subclass. */ public class MetricDSLActivator extends AbstractUIPlugin { @@ -29,7 +30,7 @@ public class MetricDSLActivator extends AbstractUIPlugin { private static MetricDSLActivator INSTANCE; private final Map injectors = Collections - .synchronizedMap(Maps. newHashMapWithExpectedSize(1)); + .synchronizedMap(Maps.newHashMapWithExpectedSize(1)); @Override public void start(final BundleContext context) throws Exception { @@ -39,7 +40,7 @@ public void start(final BundleContext context) throws Exception { @Override public void stop(final BundleContext context) throws Exception { - this.injectors.clear(); + injectors.clear(); INSTANCE = null; super.stop(context); } @@ -49,10 +50,10 @@ public static MetricDSLActivator getInstance() { } public Injector getInjector(final String language) { - synchronized (this.injectors) { - Injector injector = this.injectors.get(language); + synchronized (injectors) { + Injector injector = injectors.get(language); if (injector == null) { - this.injectors.put(language, injector = this.createInjector(language)); + injectors.put(language, injector = createInjector(language)); } return injector; } @@ -60,9 +61,9 @@ public Injector getInjector(final String language) { protected Injector createInjector(final String language) { try { - final Module runtimeModule = this.getRuntimeModule(language); - final Module sharedStateModule = this.getSharedStateModule(); - final Module uiModule = this.getUiModule(language); + final Module runtimeModule = getRuntimeModule(language); + final Module sharedStateModule = getSharedStateModule(); + final Module uiModule = getUiModule(language); final Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); return Guice.createInjector(mergedModule); } catch (final Exception e) { diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/AbstractMetricDSLRuntimeModule.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/AbstractMetricDSLRuntimeModule.java index 585963d..fb96067 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/AbstractMetricDSLRuntimeModule.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/AbstractMetricDSLRuntimeModule.java @@ -21,7 +21,7 @@ public abstract class AbstractMetricDSLRuntimeModule extends DefaultRuntimeModul @Override public void configure(final Binder binder) { - this.properties = this.tryBindProperties(binder, "org/somox/metrics/dsl/MetricDSL.properties"); + properties = tryBindProperties(binder, "org/somox/metrics/dsl/MetricDSL.properties"); super.configure(binder); } @@ -31,12 +31,13 @@ public void configureLanguageName(final Binder binder) { } public void configureFileExtensions(final Binder binder) { - if (this.properties == null || this.properties.getProperty(Constants.FILE_EXTENSIONS) == null) { + if ((properties == null) || (properties.getProperty(Constants.FILE_EXTENSIONS) == null)) { binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("metrics"); } } - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment + // contributed by + // org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment public Class bindIGrammarAccess() { return org.somox.metrics.dsl.services.MetricDSLGrammarAccess.class; } @@ -58,41 +59,48 @@ public Class bindISerializer return org.eclipse.xtext.serializer.impl.Serializer.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public Class bindIParser() { return org.somox.metrics.dsl.parser.antlr.MetricDSLParser.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment @Override public Class bindITokenToStringConverter() { return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public Class bindIAntlrTokenFileProvider() { return org.somox.metrics.dsl.parser.antlr.MetricDSLAntlrTokenFileProvider.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public Class bindLexer() { return org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLLexer.class; } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public com.google.inject.Provider provideInternalMetricDSLLexer() { return org.eclipse.xtext.parser.antlr.LexerProvider .create(org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLLexer.class); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment public void configureRuntimeLexer(final com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class) .annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)) .to(org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLLexer.class); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment + // contributed by + // org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment @Override public Class bindITokenDefProvider() { return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class; diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/MetricDSLStandaloneSetupGenerated.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/MetricDSLStandaloneSetupGenerated.java index e1ae580..565d81f 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/MetricDSLStandaloneSetupGenerated.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/MetricDSLStandaloneSetupGenerated.java @@ -20,8 +20,8 @@ public class MetricDSLStandaloneSetupGenerated implements ISetup { public Injector createInjectorAndDoEMFRegistration() { org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup(); - final Injector injector = this.createInjector(); - this.register(injector); + final Injector injector = createInjector(); + register(injector); return injector; } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/BoundAndWeight.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/BoundAndWeight.java index 61c9ee5..dbf7932 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/BoundAndWeight.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/BoundAndWeight.java @@ -5,15 +5,16 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Bound And Weight'. - * + * A representation of the model object 'Bound + * And Weight'. * *

* The following features are supported: *

    - *
  • {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound Upper Bound} - *
    • - *
  • {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight Weight}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound + * Upper Bound}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight + * Weight}
    • *
*

* @@ -23,10 +24,11 @@ */ public interface BoundAndWeight extends EObject { /** - * Returns the value of the 'Upper Bound' reference. + * Returns the value of the 'Upper Bound' reference. *

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

* * @@ -39,21 +41,23 @@ public interface BoundAndWeight extends EObject { org.somox.metrics.dsl.metricDSL.Number getUpperBound(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound - * Upper Bound}' reference. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound + * Upper Bound}' reference. * - * @param value - * the new value of the 'Upper Bound' reference. + * @param value the new value of the 'Upper Bound' reference. * @see #getUpperBound() * @generated */ void setUpperBound(org.somox.metrics.dsl.metricDSL.Number value); /** - * Returns the value of the 'Weight' reference. + * Returns the value of the 'Weight' reference. *

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

* * @@ -66,11 +70,11 @@ public interface BoundAndWeight extends EObject { org.somox.metrics.dsl.metricDSL.Number getWeight(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight * Weight}' reference. * - * @param value - * the new value of the 'Weight' reference. + * @param value the new value of the 'Weight' reference. * @see #getWeight() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Constant.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Constant.java index 6e8aa79..84ca259 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Constant.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Constant.java @@ -3,13 +3,14 @@ package org.somox.metrics.dsl.metricDSL; /** - * A representation of the model object 'Constant'. + * A representation of the model object + * 'Constant'. * *

* The following features are supported: *

    - *
  • {@link org.somox.metrics.dsl.metricDSL.Constant#getValue Value}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.Constant#getValue + * Value}
    • *
*

* @@ -19,10 +20,11 @@ */ public interface Constant extends org.somox.metrics.dsl.metricDSL.Number { /** - * Returns the value of the 'Value' attribute. + * Returns the value of the 'Value' attribute. *

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

* * @@ -35,11 +37,11 @@ public interface Constant extends org.somox.metrics.dsl.metricDSL.Number { double getValue(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Constant#getValue - * Value}' attribute. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.Constant#getValue Value}' + * attribute. * - * @param value - * the new value of the 'Value' attribute. + * @param value the new value of the 'Value' attribute. * @see #getValue() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/ExternalMetric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/ExternalMetric.java index ad13ef7..cb8212b 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/ExternalMetric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/ExternalMetric.java @@ -3,8 +3,8 @@ package org.somox.metrics.dsl.metricDSL; /** - * A representation of the model object 'External Metric'. - * + * A representation of the model object 'External + * Metric'. * * * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage#getExternalMetric() diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/InternalMetric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/InternalMetric.java index 5b44e5d..eb24350 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/InternalMetric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/InternalMetric.java @@ -5,17 +5,20 @@ import org.eclipse.emf.common.util.EList; /** - * A representation of the model object 'Internal Metric'. - * + * A representation of the model object 'Internal + * Metric'. * *

* The following features are supported: *

    - *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName Short Name}
    • - *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription Description} - *
    • - *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getParameter Parameter}
    • - *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition Definition}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName + * Short Name}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription + * Description}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getParameter + * Parameter}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition + * Definition}
    • *
*

* @@ -25,10 +28,11 @@ */ public interface InternalMetric extends Metric { /** - * Returns the value of the 'Short Name' attribute. + * Returns the value of the 'Short Name' attribute. *

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

* * @@ -41,21 +45,22 @@ public interface InternalMetric extends Metric { String getShortName(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName - * Short Name}' attribute. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName Short + * Name}' attribute. * - * @param value - * the new value of the 'Short Name' attribute. + * @param value the new value of the 'Short Name' attribute. * @see #getShortName() * @generated */ void setShortName(String value); /** - * Returns the value of the 'Description' attribute. + * Returns the value of the 'Description' attribute. *

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

* * @@ -68,22 +73,24 @@ public interface InternalMetric extends Metric { String getDescription(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription - * Description}' attribute. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription + * Description}' attribute. * - * @param value - * the new value of the 'Description' attribute. + * @param value the new value of the 'Description' attribute. * @see #getDescription() * @generated */ void setDescription(String value); /** - * Returns the value of the 'Parameter' containment reference list. The list - * contents are of type {@link org.somox.metrics.dsl.metricDSL.Number}. + * Returns the value of the 'Parameter' containment reference + * list. The list contents are of type + * {@link org.somox.metrics.dsl.metricDSL.Number}. *

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

* * @@ -95,11 +102,11 @@ public interface InternalMetric extends Metric { EList getParameter(); /** - * Returns the value of the 'Definition' containment reference. + * Returns the value of the 'Definition' containment reference. + * *

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

* * @@ -112,11 +119,13 @@ public interface InternalMetric extends Metric { MetricDefinition getDefinition(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition - * Definition}' containment reference. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition + * Definition}' containment reference. * - * @param value - * the new value of the 'Definition' containment reference. + * @param value the new value of the 'Definition' containment + * reference. * @see #getDefinition() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Metric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Metric.java index 8263eb1..a1b411b 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Metric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Metric.java @@ -5,8 +5,8 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Metric'. + * A representation of the model object + * 'Metric'. * *

* The following features are supported: @@ -21,10 +21,11 @@ */ public interface Metric extends EObject { /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Name' attribute. *

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

* * @@ -37,11 +38,10 @@ public interface Metric extends EObject { String getName(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Metric#getName Name}' - * attribute. + * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Metric#getName + * Name}' attribute. * - * @param value - * the new value of the 'Name' attribute. + * @param value the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricAndWeight.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricAndWeight.java index 5248a77..ddb552b 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricAndWeight.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricAndWeight.java @@ -5,14 +5,16 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Metric And Weight'. - * + * A representation of the model object 'Metric + * And Weight'. * *

* The following features are supported: *

    - *
  • {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric Metric}
    • - *
  • {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight Weight}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric + * Metric}
    • + *
  • {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight + * Weight}
    • *
*

* @@ -22,10 +24,11 @@ */ public interface MetricAndWeight extends EObject { /** - * Returns the value of the 'Metric' reference. + * Returns the value of the 'Metric' reference. *

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

* * @@ -38,21 +41,22 @@ public interface MetricAndWeight extends EObject { Metric getMetric(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric * Metric}' reference. * - * @param value - * the new value of the 'Metric' reference. + * @param value the new value of the 'Metric' reference. * @see #getMetric() * @generated */ void setMetric(Metric value); /** - * Returns the value of the 'Weight' reference. + * Returns the value of the 'Weight' reference. *

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

* * @@ -65,11 +69,11 @@ public interface MetricAndWeight extends EObject { org.somox.metrics.dsl.metricDSL.Number getWeight(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight * Weight}' reference. * - * @param value - * the new value of the 'Weight' reference. + * @param value the new value of the 'Weight' reference. * @see #getWeight() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLFactory.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLFactory.java index 229abf6..6a5acb0 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLFactory.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLFactory.java @@ -5,23 +5,24 @@ import org.eclipse.emf.ecore.EFactory; /** - * The Factory for the model. It provides a create method for each - * non-abstract class of the model. + * The Factory for the model. It provides a + * create method for each non-abstract class of the model. * * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage * @generated */ public interface MetricDSLFactory extends EFactory { /** - * The singleton instance of the factory. + * The singleton instance of the factory. * * @generated */ MetricDSLFactory eINSTANCE = org.somox.metrics.dsl.metricDSL.impl.MetricDSLFactoryImpl.init(); /** - * Returns a new object of class 'Metric Model'. + * Returns a new object of class 'Metric Model'. * * @return a new object of class 'Metric Model'. * @generated @@ -29,8 +30,8 @@ public interface MetricDSLFactory extends EFactory { MetricModel createMetricModel(); /** - * Returns a new object of class 'Metric'. + * Returns a new object of class 'Metric'. * * @return a new object of class 'Metric'. * @generated @@ -38,8 +39,8 @@ public interface MetricDSLFactory extends EFactory { Metric createMetric(); /** - * Returns a new object of class 'External Metric'. + * Returns a new object of class 'External Metric'. * * @return a new object of class 'External Metric'. * @generated @@ -47,8 +48,8 @@ public interface MetricDSLFactory extends EFactory { ExternalMetric createExternalMetric(); /** - * Returns a new object of class 'Internal Metric'. + * Returns a new object of class 'Internal Metric'. * * @return a new object of class 'Internal Metric'. * @generated @@ -56,8 +57,8 @@ public interface MetricDSLFactory extends EFactory { InternalMetric createInternalMetric(); /** - * Returns a new object of class 'Number'. + * Returns a new object of class 'Number'. * * @return a new object of class 'Number'. * @generated @@ -65,8 +66,8 @@ public interface MetricDSLFactory extends EFactory { Number createNumber(); /** - * Returns a new object of class 'Parameter'. + * Returns a new object of class 'Parameter'. + * * * @return a new object of class 'Parameter'. * @generated @@ -74,8 +75,8 @@ public interface MetricDSLFactory extends EFactory { Parameter createParameter(); /** - * Returns a new object of class 'Constant'. + * Returns a new object of class 'Constant'. + * * * @return a new object of class 'Constant'. * @generated @@ -83,8 +84,8 @@ public interface MetricDSLFactory extends EFactory { Constant createConstant(); /** - * Returns a new object of class 'Metric Definition'. + * Returns a new object of class 'Metric Definition'. * * @return a new object of class 'Metric Definition'. * @generated @@ -92,8 +93,8 @@ public interface MetricDSLFactory extends EFactory { MetricDefinition createMetricDefinition(); /** - * Returns a new object of class 'Weighted Metric'. + * Returns a new object of class 'Weighted Metric'. * * @return a new object of class 'Weighted Metric'. * @generated @@ -101,8 +102,8 @@ public interface MetricDSLFactory extends EFactory { WeightedMetric createWeightedMetric(); /** - * Returns a new object of class 'Stepwise Metric'. + * Returns a new object of class 'Stepwise Metric'. * * @return a new object of class 'Stepwise Metric'. * @generated @@ -110,8 +111,8 @@ public interface MetricDSLFactory extends EFactory { StepwiseMetric createStepwiseMetric(); /** - * Returns a new object of class 'Ratio Metric'. + * Returns a new object of class 'Ratio Metric'. * * @return a new object of class 'Ratio Metric'. * @generated @@ -119,8 +120,8 @@ public interface MetricDSLFactory extends EFactory { RatioMetric createRatioMetric(); /** - * Returns a new object of class 'Bound And Weight'. + * Returns a new object of class 'Bound And Weight'. * * @return a new object of class 'Bound And Weight'. * @generated @@ -128,8 +129,8 @@ public interface MetricDSLFactory extends EFactory { BoundAndWeight createBoundAndWeight(); /** - * Returns a new object of class 'Metric And Weight'. + * Returns a new object of class 'Metric And Weight'. * * @return a new object of class 'Metric And Weight'. * @generated @@ -137,7 +138,8 @@ public interface MetricDSLFactory extends EFactory { MetricAndWeight createMetricAndWeight(); /** - * Returns the package supported by this factory. + * Returns the package supported by this factory. * * @return the package supported by this factory. * @generated diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLPackage.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLPackage.java index 9e4c3c8..db002fe 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLPackage.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDSLPackage.java @@ -8,8 +8,8 @@ import org.eclipse.emf.ecore.EReference; /** - * The Package for the model. It contains accessors for the meta - * objects to represent + * The Package for the model. It contains + * accessors for the meta objects to represent *
    *
  • each class,
    • *
  • each feature of each class,
    • @@ -45,15 +45,17 @@ public interface MetricDSLPackage extends EPackage { String eNS_PREFIX = "metricDSL"; /** - * The singleton instance of the package. + * The singleton instance of the package. * * @generated */ MetricDSLPackage eINSTANCE = org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl.init(); /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl - * Metric Model}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl Metric + * Model}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricModel() @@ -62,8 +64,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_MODEL = 0; /** - * The feature id for the 'Import URI' attribute list. - * + * The feature id for the 'Import URI' attribute list. * * @generated * @ordered @@ -71,8 +73,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_MODEL__IMPORT_URI = 0; /** - * The feature id for the 'Metrics' containment reference list. + * The feature id for the 'Metrics' containment reference list. + * * * @generated * @ordered @@ -80,8 +82,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_MODEL__METRICS = 1; /** - * The number of structural features of the 'Metric Model' class. + * The number of structural features of the 'Metric Model' class. * * @generated * @ordered @@ -89,8 +91,9 @@ public interface MetricDSLPackage extends EPackage { int METRIC_MODEL_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl - * Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl Metric}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetric() @@ -99,8 +102,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC = 1; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -108,8 +111,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC__NAME = 0; /** - * The number of structural features of the 'Metric' class. - * + * The number of structural features of the 'Metric' class. * * @generated * @ordered @@ -117,8 +120,9 @@ public interface MetricDSLPackage extends EPackage { int METRIC_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl - * External Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl External + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getExternalMetric() @@ -127,8 +131,8 @@ public interface MetricDSLPackage extends EPackage { int EXTERNAL_METRIC = 2; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -136,8 +140,8 @@ public interface MetricDSLPackage extends EPackage { int EXTERNAL_METRIC__NAME = METRIC__NAME; /** - * The number of structural features of the 'External Metric' class. + * The number of structural features of the 'External Metric' class. + * * * @generated * @ordered @@ -145,8 +149,9 @@ public interface MetricDSLPackage extends EPackage { int EXTERNAL_METRIC_FEATURE_COUNT = METRIC_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl - * Internal Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl Internal + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getInternalMetric() @@ -155,8 +160,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC = 3; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -164,8 +169,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC__NAME = METRIC__NAME; /** - * The feature id for the 'Short Name' attribute. + * The feature id for the 'Short Name' attribute. * * @generated * @ordered @@ -173,8 +178,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC__SHORT_NAME = METRIC_FEATURE_COUNT + 0; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Description' attribute. * * @generated * @ordered @@ -182,8 +187,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC__DESCRIPTION = METRIC_FEATURE_COUNT + 1; /** - * The feature id for the 'Parameter' containment reference list. + * The feature id for the 'Parameter' containment reference + * list. * * @generated * @ordered @@ -191,8 +196,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC__PARAMETER = METRIC_FEATURE_COUNT + 2; /** - * The feature id for the 'Definition' containment reference. + * The feature id for the 'Definition' containment reference. + * * * @generated * @ordered @@ -200,8 +205,8 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC__DEFINITION = METRIC_FEATURE_COUNT + 3; /** - * The number of structural features of the 'Internal Metric' class. + * The number of structural features of the 'Internal Metric' class. + * * * @generated * @ordered @@ -209,8 +214,9 @@ public interface MetricDSLPackage extends EPackage { int INTERNAL_METRIC_FEATURE_COUNT = METRIC_FEATURE_COUNT + 4; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl - * Number}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl Number}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.NumberImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getNumber() @@ -219,8 +225,8 @@ public interface MetricDSLPackage extends EPackage { int NUMBER = 4; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -228,8 +234,8 @@ public interface MetricDSLPackage extends EPackage { int NUMBER__NAME = 0; /** - * The number of structural features of the 'Number' class. - * + * The number of structural features of the 'Number' class. * * @generated * @ordered @@ -237,7 +243,8 @@ public interface MetricDSLPackage extends EPackage { int NUMBER_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl * Parameter}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.ParameterImpl @@ -247,8 +254,8 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER = 5; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -256,8 +263,8 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER__NAME = NUMBER__NAME; /** - * The feature id for the 'Shortname' attribute. + * The feature id for the 'Shortname' attribute. * * @generated * @ordered @@ -265,8 +272,8 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER__SHORTNAME = NUMBER_FEATURE_COUNT + 0; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Description' attribute. * * @generated * @ordered @@ -274,8 +281,8 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER__DESCRIPTION = NUMBER_FEATURE_COUNT + 1; /** - * The feature id for the 'Default Value' attribute. - * + * The feature id for the 'Default Value' attribute. * * @generated * @ordered @@ -283,8 +290,8 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER__DEFAULT_VALUE = NUMBER_FEATURE_COUNT + 2; /** - * The number of structural features of the 'Parameter' class. - * + * The number of structural features of the 'Parameter' class. * * @generated * @ordered @@ -292,8 +299,9 @@ public interface MetricDSLPackage extends EPackage { int PARAMETER_FEATURE_COUNT = NUMBER_FEATURE_COUNT + 3; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl - * Constant}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl Constant}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.ConstantImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getConstant() @@ -302,8 +310,8 @@ public interface MetricDSLPackage extends EPackage { int CONSTANT = 6; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. * * @generated * @ordered @@ -311,8 +319,8 @@ public interface MetricDSLPackage extends EPackage { int CONSTANT__NAME = NUMBER__NAME; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Value' attribute. * * @generated * @ordered @@ -320,8 +328,8 @@ public interface MetricDSLPackage extends EPackage { int CONSTANT__VALUE = NUMBER_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Constant' class. - * + * The number of structural features of the 'Constant' class. * * @generated * @ordered @@ -329,8 +337,9 @@ public interface MetricDSLPackage extends EPackage { int CONSTANT_FEATURE_COUNT = NUMBER_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl - * Metric Definition}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl Metric + * Definition}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricDefinition() @@ -339,8 +348,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_DEFINITION = 7; /** - * The number of structural features of the 'Metric Definition' class. + * The number of structural features of the 'Metric Definition' class. + * * * @generated * @ordered @@ -348,8 +357,9 @@ public interface MetricDSLPackage extends EPackage { int METRIC_DEFINITION_FEATURE_COUNT = 0; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl - * Weighted Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl Weighted + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getWeightedMetric() @@ -358,8 +368,8 @@ public interface MetricDSLPackage extends EPackage { int WEIGHTED_METRIC = 8; /** - * The feature id for the 'Weights' containment reference list. + * The feature id for the 'Weights' containment reference list. + * * * @generated * @ordered @@ -367,8 +377,8 @@ public interface MetricDSLPackage extends EPackage { int WEIGHTED_METRIC__WEIGHTS = METRIC_DEFINITION_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Weighted Metric' class. + * The number of structural features of the 'Weighted Metric' class. + * * * @generated * @ordered @@ -376,8 +386,9 @@ public interface MetricDSLPackage extends EPackage { int WEIGHTED_METRIC_FEATURE_COUNT = METRIC_DEFINITION_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl - * Stepwise Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl Stepwise + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getStepwiseMetric() @@ -386,8 +397,8 @@ public interface MetricDSLPackage extends EPackage { int STEPWISE_METRIC = 9; /** - * The feature id for the 'Inner Metric' reference. + * The feature id for the 'Inner Metric' reference. * * @generated * @ordered @@ -395,8 +406,8 @@ public interface MetricDSLPackage extends EPackage { int STEPWISE_METRIC__INNER_METRIC = METRIC_DEFINITION_FEATURE_COUNT + 0; /** - * The feature id for the 'Steps' containment reference list. + * The feature id for the 'Steps' containment reference list. + * * * @generated * @ordered @@ -404,8 +415,8 @@ public interface MetricDSLPackage extends EPackage { int STEPWISE_METRIC__STEPS = METRIC_DEFINITION_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Stepwise Metric' class. + * The number of structural features of the 'Stepwise Metric' class. + * * * @generated * @ordered @@ -413,8 +424,9 @@ public interface MetricDSLPackage extends EPackage { int STEPWISE_METRIC_FEATURE_COUNT = METRIC_DEFINITION_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl - * Ratio Metric}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl Ratio + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getRatioMetric() @@ -423,8 +435,8 @@ public interface MetricDSLPackage extends EPackage { int RATIO_METRIC = 10; /** - * The feature id for the 'Nominator Metric' reference. - * + * The feature id for the 'Nominator Metric' reference. * * @generated * @ordered @@ -432,8 +444,8 @@ public interface MetricDSLPackage extends EPackage { int RATIO_METRIC__NOMINATOR_METRIC = METRIC_DEFINITION_FEATURE_COUNT + 0; /** - * The feature id for the 'Denominator Metric' reference. + * The feature id for the 'Denominator Metric' reference. * * @generated * @ordered @@ -441,8 +453,8 @@ public interface MetricDSLPackage extends EPackage { int RATIO_METRIC__DENOMINATOR_METRIC = METRIC_DEFINITION_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Ratio Metric' class. + * The number of structural features of the 'Ratio Metric' class. * * @generated * @ordered @@ -450,8 +462,9 @@ public interface MetricDSLPackage extends EPackage { int RATIO_METRIC_FEATURE_COUNT = METRIC_DEFINITION_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl - * Bound And Weight}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl Bound And + * Weight}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getBoundAndWeight() @@ -460,8 +473,8 @@ public interface MetricDSLPackage extends EPackage { int BOUND_AND_WEIGHT = 11; /** - * The feature id for the 'Upper Bound' reference. + * The feature id for the 'Upper Bound' reference. * * @generated * @ordered @@ -469,8 +482,8 @@ public interface MetricDSLPackage extends EPackage { int BOUND_AND_WEIGHT__UPPER_BOUND = 0; /** - * The feature id for the 'Weight' reference. + * The feature id for the 'Weight' reference. * * @generated * @ordered @@ -478,8 +491,8 @@ public interface MetricDSLPackage extends EPackage { int BOUND_AND_WEIGHT__WEIGHT = 1; /** - * The number of structural features of the 'Bound And Weight' class. + * The number of structural features of the 'Bound And Weight' class. + * * * @generated * @ordered @@ -487,8 +500,9 @@ public interface MetricDSLPackage extends EPackage { int BOUND_AND_WEIGHT_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl - * Metric And Weight}' class. + * The meta object id for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl Metric + * And Weight}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricAndWeight() @@ -497,8 +511,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_AND_WEIGHT = 12; /** - * The feature id for the 'Metric' reference. + * The feature id for the 'Metric' reference. * * @generated * @ordered @@ -506,8 +520,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_AND_WEIGHT__METRIC = 0; /** - * The feature id for the 'Weight' reference. + * The feature id for the 'Weight' reference. * * @generated * @ordered @@ -515,8 +529,8 @@ public interface MetricDSLPackage extends EPackage { int METRIC_AND_WEIGHT__WEIGHT = 1; /** - * The number of structural features of the 'Metric And Weight' class. + * The number of structural features of the 'Metric And Weight' class. + * * * @generated * @ordered @@ -524,8 +538,9 @@ public interface MetricDSLPackage extends EPackage { int METRIC_AND_WEIGHT_FEATURE_COUNT = 2; /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.MetricModel - * Metric Model}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.MetricModel Metric Model}'. + * * * @return the meta object for class 'Metric Model'. * @see org.somox.metrics.dsl.metricDSL.MetricModel @@ -535,8 +550,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute list ' - * {@link org.somox.metrics.dsl.metricDSL.MetricModel#getImportURI Import URI}'. + * {@link org.somox.metrics.dsl.metricDSL.MetricModel#getImportURI Import + * URI}'. * * @return the meta object for the attribute list 'Import URI'. * @see org.somox.metrics.dsl.metricDSL.MetricModel#getImportURI() @@ -547,10 +562,11 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.somox.metrics.dsl.metricDSL.MetricModel#getMetrics Metrics}'. + * {@link org.somox.metrics.dsl.metricDSL.MetricModel#getMetrics + * Metrics}'. * - * @return the meta object for the containment reference list 'Metrics'. + * @return the meta object for the containment reference list + * 'Metrics'. * @see org.somox.metrics.dsl.metricDSL.MetricModel#getMetrics() * @see #getMetricModel() * @generated @@ -558,8 +574,9 @@ public interface MetricDSLPackage extends EPackage { EReference getMetricModel_Metrics(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.Metric - * Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.Metric Metric}'. * * @return the meta object for class 'Metric'. * @see org.somox.metrics.dsl.metricDSL.Metric @@ -569,8 +586,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Metric#getName Name}'. + * {@link org.somox.metrics.dsl.metricDSL.Metric#getName Name}'. * * @return the meta object for the attribute 'Name'. * @see org.somox.metrics.dsl.metricDSL.Metric#getName() @@ -580,8 +597,9 @@ public interface MetricDSLPackage extends EPackage { EAttribute getMetric_Name(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.ExternalMetric - * External Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.ExternalMetric External + * Metric}'. * * @return the meta object for class 'External Metric'. * @see org.somox.metrics.dsl.metricDSL.ExternalMetric @@ -590,8 +608,9 @@ public interface MetricDSLPackage extends EPackage { EClass getExternalMetric(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.InternalMetric - * Internal Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.InternalMetric Internal + * Metric}'. * * @return the meta object for class 'Internal Metric'. * @see org.somox.metrics.dsl.metricDSL.InternalMetric @@ -601,8 +620,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName Short Name}'. - * + * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName Short + * Name}'. * * @return the meta object for the attribute 'Short Name'. * @see org.somox.metrics.dsl.metricDSL.InternalMetric#getShortName() @@ -613,8 +632,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription Description}'. - * + * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription + * Description}'. * * @return the meta object for the attribute 'Description'. * @see org.somox.metrics.dsl.metricDSL.InternalMetric#getDescription() @@ -625,10 +644,11 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getParameter Parameter}'. + * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getParameter + * Parameter}'. * - * @return the meta object for the containment reference list 'Parameter'. + * @return the meta object for the containment reference list + * 'Parameter'. * @see org.somox.metrics.dsl.metricDSL.InternalMetric#getParameter() * @see #getInternalMetric() * @generated @@ -637,8 +657,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the containment reference ' - * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition Definition}'. - * + * {@link org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition + * Definition}'. * * @return the meta object for the containment reference 'Definition'. * @see org.somox.metrics.dsl.metricDSL.InternalMetric#getDefinition() @@ -648,8 +668,9 @@ public interface MetricDSLPackage extends EPackage { EReference getInternalMetric_Definition(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.Number - * Number}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.Number Number}'. * * @return the meta object for class 'Number'. * @see org.somox.metrics.dsl.metricDSL.Number @@ -659,8 +680,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Number#getName Name}'. + * {@link org.somox.metrics.dsl.metricDSL.Number#getName Name}'. * * @return the meta object for the attribute 'Name'. * @see org.somox.metrics.dsl.metricDSL.Number#getName() @@ -670,8 +691,9 @@ public interface MetricDSLPackage extends EPackage { EAttribute getNumber_Name(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.Parameter - * Parameter}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.Parameter Parameter}'. * * @return the meta object for class 'Parameter'. * @see org.somox.metrics.dsl.metricDSL.Parameter @@ -681,8 +703,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname Shortname}'. + * {@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname + * Shortname}'. * * @return the meta object for the attribute 'Shortname'. * @see org.somox.metrics.dsl.metricDSL.Parameter#getShortname() @@ -693,8 +715,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription Description}'. + * {@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription + * Description}'. * * @return the meta object for the attribute 'Description'. * @see org.somox.metrics.dsl.metricDSL.Parameter#getDescription() @@ -705,8 +727,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue Default Value}'. - * + * {@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue Default + * Value}'. * * @return the meta object for the attribute 'Default Value'. * @see org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue() @@ -716,8 +738,9 @@ public interface MetricDSLPackage extends EPackage { EAttribute getParameter_DefaultValue(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.Constant - * Constant}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.Constant Constant}'. * * @return the meta object for class 'Constant'. * @see org.somox.metrics.dsl.metricDSL.Constant @@ -727,8 +750,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.somox.metrics.dsl.metricDSL.Constant#getValue Value}'. + * {@link org.somox.metrics.dsl.metricDSL.Constant#getValue Value}'. + * * * @return the meta object for the attribute 'Value'. * @see org.somox.metrics.dsl.metricDSL.Constant#getValue() @@ -738,8 +761,9 @@ public interface MetricDSLPackage extends EPackage { EAttribute getConstant_Value(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.MetricDefinition - * Metric Definition}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.MetricDefinition Metric + * Definition}'. * * @return the meta object for class 'Metric Definition'. * @see org.somox.metrics.dsl.metricDSL.MetricDefinition @@ -748,8 +772,9 @@ public interface MetricDSLPackage extends EPackage { EClass getMetricDefinition(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.WeightedMetric - * Weighted Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.WeightedMetric Weighted + * Metric}'. * * @return the meta object for class 'Weighted Metric'. * @see org.somox.metrics.dsl.metricDSL.WeightedMetric @@ -759,10 +784,11 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.somox.metrics.dsl.metricDSL.WeightedMetric#getWeights Weights}'. + * {@link org.somox.metrics.dsl.metricDSL.WeightedMetric#getWeights + * Weights}'. * - * @return the meta object for the containment reference list 'Weights'. + * @return the meta object for the containment reference list + * 'Weights'. * @see org.somox.metrics.dsl.metricDSL.WeightedMetric#getWeights() * @see #getWeightedMetric() * @generated @@ -770,8 +796,9 @@ public interface MetricDSLPackage extends EPackage { EReference getWeightedMetric_Weights(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.StepwiseMetric - * Stepwise Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.StepwiseMetric Stepwise + * Metric}'. * * @return the meta object for class 'Stepwise Metric'. * @see org.somox.metrics.dsl.metricDSL.StepwiseMetric @@ -781,8 +808,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the reference ' - * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric Inner Metric}'. - * + * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric + * Inner Metric}'. * * @return the meta object for the reference 'Inner Metric'. * @see org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric() @@ -793,8 +820,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getSteps Steps}'. + * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getSteps + * Steps}'. * * @return the meta object for the containment reference list 'Steps'. * @see org.somox.metrics.dsl.metricDSL.StepwiseMetric#getSteps() @@ -804,8 +831,9 @@ public interface MetricDSLPackage extends EPackage { EReference getStepwiseMetric_Steps(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.RatioMetric - * Ratio Metric}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.RatioMetric Ratio Metric}'. + * * * @return the meta object for class 'Ratio Metric'. * @see org.somox.metrics.dsl.metricDSL.RatioMetric @@ -838,8 +866,9 @@ public interface MetricDSLPackage extends EPackage { EReference getRatioMetric_DenominatorMetric(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight - * Bound And Weight}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.BoundAndWeight Bound And + * Weight}'. * * @return the meta object for class 'Bound And Weight'. * @see org.somox.metrics.dsl.metricDSL.BoundAndWeight @@ -849,8 +878,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the reference ' - * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound Upper Bound}'. - * + * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound Upper + * Bound}'. * * @return the meta object for the reference 'Upper Bound'. * @see org.somox.metrics.dsl.metricDSL.BoundAndWeight#getUpperBound() @@ -861,8 +890,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the reference ' - * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight Weight}'. + * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight + * Weight}'. * * @return the meta object for the reference 'Weight'. * @see org.somox.metrics.dsl.metricDSL.BoundAndWeight#getWeight() @@ -872,8 +901,9 @@ public interface MetricDSLPackage extends EPackage { EReference getBoundAndWeight_Weight(); /** - * Returns the meta object for class '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight - * Metric And Weight}'. + * Returns the meta object for class + * '{@link org.somox.metrics.dsl.metricDSL.MetricAndWeight Metric And + * Weight}'. * * @return the meta object for class 'Metric And Weight'. * @see org.somox.metrics.dsl.metricDSL.MetricAndWeight @@ -883,8 +913,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the reference ' - * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric Metric}'. + * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric + * Metric}'. * * @return the meta object for the reference 'Metric'. * @see org.somox.metrics.dsl.metricDSL.MetricAndWeight#getMetric() @@ -895,8 +925,8 @@ public interface MetricDSLPackage extends EPackage { /** * Returns the meta object for the reference ' - * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight Weight}'. + * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight + * Weight}'. * * @return the meta object for the reference 'Weight'. * @see org.somox.metrics.dsl.metricDSL.MetricAndWeight#getWeight() @@ -906,8 +936,8 @@ public interface MetricDSLPackage extends EPackage { EReference getMetricAndWeight_Weight(); /** - * Returns the factory that creates the instances of the model. + * Returns the factory that creates the instances of the model. * * @return the factory that creates the instances of the model. * @generated @@ -929,8 +959,8 @@ public interface MetricDSLPackage extends EPackage { interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl Metric Model}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl Metric + * Model}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricModel() @@ -939,24 +969,25 @@ interface Literals { EClass METRIC_MODEL = eINSTANCE.getMetricModel(); /** - * The meta object literal for the 'Import URI' attribute list feature. + * The meta object literal for the 'Import URI' attribute list + * feature. * * @generated */ EAttribute METRIC_MODEL__IMPORT_URI = eINSTANCE.getMetricModel_ImportURI(); /** - * The meta object literal for the 'Metrics' containment reference list - * feature. + * The meta object literal for the 'Metrics' containment + * reference list feature. * * @generated */ EReference METRIC_MODEL__METRICS = eINSTANCE.getMetricModel_Metrics(); /** - * The meta object literal for the '{@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl - * Metric}' class. + * The meta object literal for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl Metric}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetric() @@ -965,8 +996,8 @@ interface Literals { EClass METRIC = eINSTANCE.getMetric(); /** - * The meta object literal for the 'Name' attribute feature. + * The meta object literal for the 'Name' attribute feature. + * * * @generated */ @@ -974,8 +1005,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl External Metric}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl External + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.ExternalMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getExternalMetric() @@ -985,8 +1016,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl Internal Metric}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl Internal + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.InternalMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getInternalMetric() @@ -995,40 +1026,41 @@ interface Literals { EClass INTERNAL_METRIC = eINSTANCE.getInternalMetric(); /** - * The meta object literal for the 'Short Name' attribute feature. + * The meta object literal for the 'Short Name' attribute + * feature. * * @generated */ EAttribute INTERNAL_METRIC__SHORT_NAME = eINSTANCE.getInternalMetric_ShortName(); /** - * The meta object literal for the 'Description' attribute feature. + * The meta object literal for the 'Description' attribute + * feature. * * @generated */ EAttribute INTERNAL_METRIC__DESCRIPTION = eINSTANCE.getInternalMetric_Description(); /** - * The meta object literal for the 'Parameter' containment reference list - * feature. + * The meta object literal for the 'Parameter' containment + * reference list feature. * * @generated */ EReference INTERNAL_METRIC__PARAMETER = eINSTANCE.getInternalMetric_Parameter(); /** - * The meta object literal for the 'Definition' containment reference - * feature. + * The meta object literal for the 'Definition' containment + * reference feature. * * @generated */ EReference INTERNAL_METRIC__DEFINITION = eINSTANCE.getInternalMetric_Definition(); /** - * The meta object literal for the '{@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl - * Number}' class. + * The meta object literal for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl Number}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.NumberImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getNumber() @@ -1037,8 +1069,8 @@ interface Literals { EClass NUMBER = eINSTANCE.getNumber(); /** - * The meta object literal for the 'Name' attribute feature. + * The meta object literal for the 'Name' attribute feature. + * * * @generated */ @@ -1046,8 +1078,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl Parameter}' class. - * + * {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl + * Parameter}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.ParameterImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getParameter() @@ -1056,32 +1088,33 @@ interface Literals { EClass PARAMETER = eINSTANCE.getParameter(); /** - * The meta object literal for the 'Shortname' attribute feature. + * The meta object literal for the 'Shortname' attribute + * feature. * * @generated */ EAttribute PARAMETER__SHORTNAME = eINSTANCE.getParameter_Shortname(); /** - * The meta object literal for the 'Description' attribute feature. + * The meta object literal for the 'Description' attribute + * feature. * * @generated */ EAttribute PARAMETER__DESCRIPTION = eINSTANCE.getParameter_Description(); /** - * The meta object literal for the 'Default Value' attribute feature. + * The meta object literal for the 'Default Value' attribute + * feature. * * @generated */ EAttribute PARAMETER__DEFAULT_VALUE = eINSTANCE.getParameter_DefaultValue(); /** - * The meta object literal for the '{@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl - * Constant}' class. + * The meta object literal for the + * '{@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl Constant}' + * class. * * @see org.somox.metrics.dsl.metricDSL.impl.ConstantImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getConstant() @@ -1090,8 +1123,8 @@ interface Literals { EClass CONSTANT = eINSTANCE.getConstant(); /** - * The meta object literal for the 'Value' attribute feature. + * The meta object literal for the 'Value' attribute feature. + * * * @generated */ @@ -1099,8 +1132,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl - * Metric Definition}' class. + * {@link org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl Metric + * Definition}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricDefinitionImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricDefinition() @@ -1110,8 +1143,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl Weighted Metric}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl Weighted + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getWeightedMetric() @@ -1120,8 +1153,8 @@ interface Literals { EClass WEIGHTED_METRIC = eINSTANCE.getWeightedMetric(); /** - * The meta object literal for the 'Weights' containment reference list - * feature. + * The meta object literal for the 'Weights' containment + * reference list feature. * * @generated */ @@ -1129,8 +1162,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl Stepwise Metric}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl Stepwise + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getStepwiseMetric() @@ -1139,16 +1172,16 @@ interface Literals { EClass STEPWISE_METRIC = eINSTANCE.getStepwiseMetric(); /** - * The meta object literal for the 'Inner Metric' reference feature. + * The meta object literal for the 'Inner Metric' reference + * feature. * * @generated */ EReference STEPWISE_METRIC__INNER_METRIC = eINSTANCE.getStepwiseMetric_InnerMetric(); /** - * The meta object literal for the 'Steps' containment reference list - * feature. + * The meta object literal for the 'Steps' containment reference + * list feature. * * @generated */ @@ -1156,8 +1189,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl Ratio Metric}' - * class. + * {@link org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl Ratio + * Metric}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.RatioMetricImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getRatioMetric() @@ -1166,16 +1199,16 @@ interface Literals { EClass RATIO_METRIC = eINSTANCE.getRatioMetric(); /** - * The meta object literal for the 'Nominator Metric' reference feature. - * + * The meta object literal for the 'Nominator Metric' reference + * feature. * * @generated */ EReference RATIO_METRIC__NOMINATOR_METRIC = eINSTANCE.getRatioMetric_NominatorMetric(); /** - * The meta object literal for the 'Denominator Metric' reference feature. - * + * The meta object literal for the 'Denominator Metric' + * reference feature. * * @generated */ @@ -1183,8 +1216,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl Bound And Weight} - * ' class. + * {@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl Bound And + * Weight} ' class. * * @see org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getBoundAndWeight() @@ -1193,16 +1226,16 @@ interface Literals { EClass BOUND_AND_WEIGHT = eINSTANCE.getBoundAndWeight(); /** - * The meta object literal for the 'Upper Bound' reference feature. + * The meta object literal for the 'Upper Bound' reference + * feature. * * @generated */ EReference BOUND_AND_WEIGHT__UPPER_BOUND = eINSTANCE.getBoundAndWeight_UpperBound(); /** - * The meta object literal for the 'Weight' reference feature. + * The meta object literal for the 'Weight' reference feature. + * * * @generated */ @@ -1210,8 +1243,8 @@ interface Literals { /** * The meta object literal for the ' - * {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl - * Metric And Weight}' class. + * {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl Metric + * And Weight}' class. * * @see org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl * @see org.somox.metrics.dsl.metricDSL.impl.MetricDSLPackageImpl#getMetricAndWeight() @@ -1220,16 +1253,16 @@ interface Literals { EClass METRIC_AND_WEIGHT = eINSTANCE.getMetricAndWeight(); /** - * The meta object literal for the 'Metric' reference feature. + * The meta object literal for the 'Metric' reference feature. + * * * @generated */ EReference METRIC_AND_WEIGHT__METRIC = eINSTANCE.getMetricAndWeight_Metric(); /** - * The meta object literal for the 'Weight' reference feature. + * The meta object literal for the 'Weight' reference feature. + * * * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDefinition.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDefinition.java index f85baba..8005304 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDefinition.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricDefinition.java @@ -5,8 +5,8 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Metric Definition'. - * + * A representation of the model object 'Metric + * Definition'. * * * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage#getMetricDefinition() diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricModel.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricModel.java index 1ef40c0..29b0d13 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricModel.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/MetricModel.java @@ -6,14 +6,16 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Metric Model'. + * A representation of the model object 'Metric + * Model'. * *

    * The following features are supported: *

      - *
    • {@link org.somox.metrics.dsl.metricDSL.MetricModel#getImportURI Import URI}
      • - *
    • {@link org.somox.metrics.dsl.metricDSL.MetricModel#getMetrics Metrics}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.MetricModel#getImportURI + * Import URI}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.MetricModel#getMetrics + * Metrics}
      • *
    *

    * @@ -23,11 +25,11 @@ */ public interface MetricModel extends EObject { /** - * Returns the value of the 'Import URI' attribute list. The list contents are - * of type {@link java.lang.String}. + * Returns the value of the 'Import URI' attribute list. The + * list contents are of type {@link java.lang.String}. *

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

    * * @@ -39,11 +41,12 @@ public interface MetricModel extends EObject { EList getImportURI(); /** - * Returns the value of the 'Metrics' containment reference list. The list - * contents are of type {@link org.somox.metrics.dsl.metricDSL.Metric}. + * Returns the value of the 'Metrics' containment reference + * list. The list contents are of type + * {@link org.somox.metrics.dsl.metricDSL.Metric}. *

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

    * * diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Number.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Number.java index 7d2760e..e8c037a 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Number.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Number.java @@ -5,8 +5,8 @@ import org.eclipse.emf.ecore.EObject; /** - * A representation of the model object 'Number'. + * A representation of the model object + * 'Number'. * *

    * The following features are supported: @@ -21,10 +21,11 @@ */ public interface Number extends EObject { /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Name' attribute. *

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

    * * @@ -37,11 +38,10 @@ public interface Number extends EObject { String getName(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Number#getName Name}' - * attribute. + * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Number#getName + * Name}' attribute. * - * @param value - * the new value of the 'Name' attribute. + * @param value the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Parameter.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Parameter.java index a05c798..4df5d7c 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Parameter.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/Parameter.java @@ -3,15 +3,18 @@ package org.somox.metrics.dsl.metricDSL; /** - * A representation of the model object 'Parameter'. + * A representation of the model object + * 'Parameter'. * *

    * The following features are supported: *

      - *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname Shortname}
      • - *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription Description}
      • - *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue Default Value}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname + * Shortname}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription + * Description}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue + * Default Value}
      • *
    *

    * @@ -21,10 +24,11 @@ */ public interface Parameter extends org.somox.metrics.dsl.metricDSL.Number { /** - * Returns the value of the 'Shortname' attribute. + * Returns the value of the 'Shortname' attribute. *

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

    * * @@ -37,21 +41,22 @@ public interface Parameter extends org.somox.metrics.dsl.metricDSL.Number { String getShortname(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.Parameter#getShortname * Shortname}' attribute. * - * @param value - * the new value of the 'Shortname' attribute. + * @param value the new value of the 'Shortname' attribute. * @see #getShortname() * @generated */ void setShortname(String value); /** - * Returns the value of the 'Description' attribute. + * Returns the value of the 'Description' attribute. *

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

    * * @@ -64,21 +69,23 @@ public interface Parameter extends org.somox.metrics.dsl.metricDSL.Number { String getDescription(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription - * Description}' attribute. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.Parameter#getDescription + * Description}' attribute. * - * @param value - * the new value of the 'Description' attribute. + * @param value the new value of the 'Description' attribute. * @see #getDescription() * @generated */ void setDescription(String value); /** - * Returns the value of the 'Default Value' attribute. + * Returns the value of the 'Default Value' attribute. *

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

    * * @@ -91,11 +98,11 @@ public interface Parameter extends org.somox.metrics.dsl.metricDSL.Number { double getDefaultValue(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue - * Default Value}' attribute. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.Parameter#getDefaultValue Default + * Value}' attribute. * - * @param value - * the new value of the 'Default Value' attribute. + * @param value the new value of the 'Default Value' attribute. * @see #getDefaultValue() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/RatioMetric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/RatioMetric.java index 287e0cf..10eaa4a 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/RatioMetric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/RatioMetric.java @@ -3,8 +3,8 @@ package org.somox.metrics.dsl.metricDSL; /** - * A representation of the model object 'Ratio Metric'. + * A representation of the model object 'Ratio + * Metric'. * *

    * The following features are supported: @@ -22,11 +22,11 @@ */ public interface RatioMetric extends MetricDefinition { /** - * Returns the value of the 'Nominator Metric' reference. + * Returns the value of the 'Nominator Metric' reference. *

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

    * * @@ -39,22 +39,23 @@ public interface RatioMetric extends MetricDefinition { Metric getNominatorMetric(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.RatioMetric#getNominatorMetric - * Nominator Metric}' reference. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.RatioMetric#getNominatorMetric + * Nominator Metric}' reference. * - * @param value - * the new value of the 'Nominator Metric' reference. + * @param value the new value of the 'Nominator Metric' reference. * @see #getNominatorMetric() * @generated */ void setNominatorMetric(Metric value); /** - * Returns the value of the 'Denominator Metric' reference. + * Returns the value of the 'Denominator Metric' reference. *

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

    * * @@ -69,10 +70,10 @@ public interface RatioMetric extends MetricDefinition { /** * Sets the value of the ' * {@link org.somox.metrics.dsl.metricDSL.RatioMetric#getDenominatorMetric - * Denominator Metric}' reference. + * Denominator Metric}' reference. * - * @param value - * the new value of the 'Denominator Metric' reference. + * @param value the new value of the 'Denominator Metric' reference. * @see #getDenominatorMetric() * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/StepwiseMetric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/StepwiseMetric.java index 1cedf2c..d1dfbed 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/StepwiseMetric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/StepwiseMetric.java @@ -5,15 +5,16 @@ import org.eclipse.emf.common.util.EList; /** - * A representation of the model object 'Stepwise Metric'. - * + * A representation of the model object 'Stepwise + * Metric'. * *

    * The following features are supported: *

      - *
    • {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric Inner Metric} - *
      • - *
    • {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getSteps Steps}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric + * Inner Metric}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getSteps + * Steps}
      • *
    *

    * @@ -23,10 +24,11 @@ */ public interface StepwiseMetric extends MetricDefinition { /** - * Returns the value of the 'Inner Metric' reference. + * Returns the value of the 'Inner Metric' reference. *

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

    * * @@ -39,23 +41,25 @@ public interface StepwiseMetric extends MetricDefinition { Metric getInnerMetric(); /** - * Sets the value of the '{@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric - * Inner Metric}' reference. + * Sets the value of the + * '{@link org.somox.metrics.dsl.metricDSL.StepwiseMetric#getInnerMetric + * Inner Metric}' reference. * - * @param value - * the new value of the 'Inner Metric' reference. + * @param value the new value of the 'Inner Metric' reference. * @see #getInnerMetric() * @generated */ void setInnerMetric(Metric value); /** - * Returns the value of the 'Steps' containment reference list. The list - * contents are of type {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight}. + * Returns the value of the 'Steps' containment reference list. + * The list contents are of type + * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight}. *

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

    * * diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/WeightedMetric.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/WeightedMetric.java index 9c8cfc6..be255e7 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/WeightedMetric.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/WeightedMetric.java @@ -5,13 +5,14 @@ import org.eclipse.emf.common.util.EList; /** - * A representation of the model object 'Weighted Metric'. - * + * A representation of the model object 'Weighted + * Metric'. * *

    * The following features are supported: *

      - *
    • {@link org.somox.metrics.dsl.metricDSL.WeightedMetric#getWeights Weights}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.WeightedMetric#getWeights + * Weights}
      • *
    *

    * @@ -21,12 +22,13 @@ */ public interface WeightedMetric extends MetricDefinition { /** - * Returns the value of the 'Weights' containment reference list. The list - * contents are of type {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight}. + * Returns the value of the 'Weights' containment reference + * list. The list contents are of type + * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight}. *

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

    * * diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/BoundAndWeightImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/BoundAndWeightImpl.java index 3779014..1812172 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/BoundAndWeightImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/BoundAndWeightImpl.java @@ -11,15 +11,15 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'Bound And Weight'. - * + * An implementation of the model object 'Bound + * And Weight'. *

    * The following features are implemented: *

      *
    • {@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl#getUpperBound * Upper Bound}
      • - *
    • {@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl#getWeight Weight} - *
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.impl.BoundAndWeightImpl#getWeight + * Weight}
      • *
    *

    * @@ -27,8 +27,8 @@ */ public class BoundAndWeightImpl extends MinimalEObjectImpl.Container implements BoundAndWeight { /** - * The cached value of the '{@link #getUpperBound() Upper Bound}' reference. + * The cached value of the '{@link #getUpperBound() Upper Bound}' + * reference. * * @see #getUpperBound() * @generated @@ -37,8 +37,8 @@ public class BoundAndWeightImpl extends MinimalEObjectImpl.Container implements protected org.somox.metrics.dsl.metricDSL.Number upperBound; /** - * The cached value of the '{@link #getWeight() Weight}' reference. + * The cached value of the '{@link #getWeight() Weight}' reference. + * * * @see #getWeight() * @generated @@ -52,7 +52,6 @@ public class BoundAndWeightImpl extends MinimalEObjectImpl.Container implements * @generated */ protected BoundAndWeightImpl() { - super(); } /** @@ -72,17 +71,15 @@ protected EClass eStaticClass() { */ @Override public org.somox.metrics.dsl.metricDSL.Number getUpperBound() { - if (this.upperBound != null && this.upperBound.eIsProxy()) { - final InternalEObject oldUpperBound = (InternalEObject) this.upperBound; - this.upperBound = (org.somox.metrics.dsl.metricDSL.Number) this.eResolveProxy(oldUpperBound); - if (this.upperBound != oldUpperBound) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND, oldUpperBound, this.upperBound)); - } + if ((upperBound != null) && upperBound.eIsProxy()) { + final InternalEObject oldUpperBound = (InternalEObject) upperBound; + upperBound = (org.somox.metrics.dsl.metricDSL.Number) eResolveProxy(oldUpperBound); + if ((upperBound != oldUpperBound) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, + MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND, oldUpperBound, upperBound)); } } - return this.upperBound; + return upperBound; } /** @@ -91,7 +88,7 @@ public org.somox.metrics.dsl.metricDSL.Number getUpperBound() { * @generated */ public org.somox.metrics.dsl.metricDSL.Number basicGetUpperBound() { - return this.upperBound; + return upperBound; } /** @@ -101,11 +98,11 @@ public org.somox.metrics.dsl.metricDSL.Number basicGetUpperBound() { */ @Override public void setUpperBound(final org.somox.metrics.dsl.metricDSL.Number newUpperBound) { - final org.somox.metrics.dsl.metricDSL.Number oldUpperBound = this.upperBound; - this.upperBound = newUpperBound; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND, - oldUpperBound, this.upperBound)); + final org.somox.metrics.dsl.metricDSL.Number oldUpperBound = upperBound; + upperBound = newUpperBound; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND, + oldUpperBound, upperBound)); } } @@ -116,17 +113,15 @@ public void setUpperBound(final org.somox.metrics.dsl.metricDSL.Number newUpperB */ @Override public org.somox.metrics.dsl.metricDSL.Number getWeight() { - if (this.weight != null && this.weight.eIsProxy()) { - final InternalEObject oldWeight = (InternalEObject) this.weight; - this.weight = (org.somox.metrics.dsl.metricDSL.Number) this.eResolveProxy(oldWeight); - if (this.weight != oldWeight) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT, oldWeight, this.weight)); - } + if ((weight != null) && weight.eIsProxy()) { + final InternalEObject oldWeight = (InternalEObject) weight; + weight = (org.somox.metrics.dsl.metricDSL.Number) eResolveProxy(oldWeight); + if ((weight != oldWeight) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT, + oldWeight, weight)); } } - return this.weight; + return weight; } /** @@ -135,7 +130,7 @@ public org.somox.metrics.dsl.metricDSL.Number getWeight() { * @generated */ public org.somox.metrics.dsl.metricDSL.Number basicGetWeight() { - return this.weight; + return weight; } /** @@ -145,11 +140,11 @@ public org.somox.metrics.dsl.metricDSL.Number basicGetWeight() { */ @Override public void setWeight(final org.somox.metrics.dsl.metricDSL.Number newWeight) { - final org.somox.metrics.dsl.metricDSL.Number oldWeight = this.weight; - this.weight = newWeight; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT, - oldWeight, this.weight)); + final org.somox.metrics.dsl.metricDSL.Number oldWeight = weight; + weight = newWeight; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT, oldWeight, + weight)); } } @@ -163,14 +158,14 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor switch (featureID) { case MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND: if (resolve) { - return this.getUpperBound(); + return getUpperBound(); } - return this.basicGetUpperBound(); + return basicGetUpperBound(); case MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT: if (resolve) { - return this.getWeight(); + return getWeight(); } - return this.basicGetWeight(); + return basicGetWeight(); } return super.eGet(featureID, resolve, coreType); } @@ -184,10 +179,10 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND: - this.setUpperBound((org.somox.metrics.dsl.metricDSL.Number) newValue); + setUpperBound((org.somox.metrics.dsl.metricDSL.Number) newValue); return; case MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT: - this.setWeight((org.somox.metrics.dsl.metricDSL.Number) newValue); + setWeight((org.somox.metrics.dsl.metricDSL.Number) newValue); return; } super.eSet(featureID, newValue); @@ -202,10 +197,10 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND: - this.setUpperBound((org.somox.metrics.dsl.metricDSL.Number) null); + setUpperBound((org.somox.metrics.dsl.metricDSL.Number) null); return; case MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT: - this.setWeight((org.somox.metrics.dsl.metricDSL.Number) null); + setWeight((org.somox.metrics.dsl.metricDSL.Number) null); return; } super.eUnset(featureID); @@ -220,9 +215,9 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.BOUND_AND_WEIGHT__UPPER_BOUND: - return this.upperBound != null; + return upperBound != null; case MetricDSLPackage.BOUND_AND_WEIGHT__WEIGHT: - return this.weight != null; + return weight != null; } return super.eIsSet(featureID); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ConstantImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ConstantImpl.java index 390127e..a62c34a 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ConstantImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ConstantImpl.java @@ -9,12 +9,13 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'Constant'. + * An implementation of the model object + * 'Constant'. *

    * The following features are implemented: *

      - *
    • {@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl#getValue Value}
      • + *
    • {@link org.somox.metrics.dsl.metricDSL.impl.ConstantImpl#getValue + * Value}
      • *
    *

    * @@ -22,8 +23,8 @@ */ public class ConstantImpl extends NumberImpl implements Constant { /** - * The default value of the '{@link #getValue() Value}' attribute. + * The default value of the '{@link #getValue() Value}' attribute. * * @see #getValue() * @generated @@ -32,8 +33,8 @@ public class ConstantImpl extends NumberImpl implements Constant { protected static final double VALUE_EDEFAULT = 0.0; /** - * The cached value of the '{@link #getValue() Value}' attribute. + * The cached value of the '{@link #getValue() Value}' attribute. * * @see #getValue() * @generated @@ -47,7 +48,6 @@ public class ConstantImpl extends NumberImpl implements Constant { * @generated */ protected ConstantImpl() { - super(); } /** @@ -67,7 +67,7 @@ protected EClass eStaticClass() { */ @Override public double getValue() { - return this.value; + return value; } /** @@ -77,11 +77,10 @@ public double getValue() { */ @Override public void setValue(final double newValue) { - final double oldValue = this.value; - this.value = newValue; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.CONSTANT__VALUE, oldValue, - this.value)); + final double oldValue = value; + value = newValue; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.CONSTANT__VALUE, oldValue, value)); } } @@ -94,7 +93,7 @@ public void setValue(final double newValue) { public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.CONSTANT__VALUE: - return this.getValue(); + return getValue(); } return super.eGet(featureID, resolve, coreType); } @@ -108,7 +107,7 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.CONSTANT__VALUE: - this.setValue((Double) newValue); + setValue((Double) newValue); return; } super.eSet(featureID, newValue); @@ -123,7 +122,7 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.CONSTANT__VALUE: - this.setValue(VALUE_EDEFAULT); + setValue(VALUE_EDEFAULT); return; } super.eUnset(featureID); @@ -138,7 +137,7 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.CONSTANT__VALUE: - return this.value != VALUE_EDEFAULT; + return value != VALUE_EDEFAULT; } return super.eIsSet(featureID); } @@ -150,13 +149,13 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); - result.append(this.value); + result.append(value); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ExternalMetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ExternalMetricImpl.java index e7fbe45..36ab277 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ExternalMetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ExternalMetricImpl.java @@ -7,8 +7,8 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'External Metric'. - * + * An implementation of the model object + * 'External Metric'. *

    *

    * @@ -21,7 +21,6 @@ public class ExternalMetricImpl extends MetricImpl implements ExternalMetric { * @generated */ protected ExternalMetricImpl() { - super(); } /** diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/InternalMetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/InternalMetricImpl.java index 4198081..0714b87 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/InternalMetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/InternalMetricImpl.java @@ -17,8 +17,8 @@ import org.somox.metrics.dsl.metricDSL.MetricDefinition; /** - * An implementation of the model object 'Internal Metric'. - * + * An implementation of the model object + * 'Internal Metric'. *

    * The following features are implemented: *

      @@ -37,8 +37,8 @@ */ public class InternalMetricImpl extends MetricImpl implements InternalMetric { /** - * The default value of the '{@link #getShortName() Short Name}' attribute. + * The default value of the '{@link #getShortName() Short Name}' + * attribute. * * @see #getShortName() * @generated @@ -47,8 +47,8 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { protected static final String SHORT_NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getShortName() Short Name}' attribute. + * The cached value of the '{@link #getShortName() Short Name}' + * attribute. * * @see #getShortName() * @generated @@ -57,8 +57,8 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { protected String shortName = SHORT_NAME_EDEFAULT; /** - * The default value of the '{@link #getDescription() Description}' attribute. + * The default value of the '{@link #getDescription() Description}' + * attribute. * * @see #getDescription() * @generated @@ -67,8 +67,8 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { protected static final String DESCRIPTION_EDEFAULT = null; /** - * The cached value of the '{@link #getDescription() Description}' attribute. + * The cached value of the '{@link #getDescription() Description}' + * attribute. * * @see #getDescription() * @generated @@ -77,8 +77,8 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { protected String description = DESCRIPTION_EDEFAULT; /** - * The cached value of the '{@link #getParameter() Parameter}' containment reference - * list. + * The cached value of the '{@link #getParameter() Parameter}' + * containment reference list. * * @see #getParameter() * @generated @@ -87,8 +87,8 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { protected EList parameter; /** - * The cached value of the '{@link #getDefinition() Definition}' containment reference. - * + * The cached value of the '{@link #getDefinition() Definition}' + * containment reference. * * @see #getDefinition() * @generated @@ -102,7 +102,6 @@ public class InternalMetricImpl extends MetricImpl implements InternalMetric { * @generated */ protected InternalMetricImpl() { - super(); } /** @@ -122,7 +121,7 @@ protected EClass eStaticClass() { */ @Override public String getShortName() { - return this.shortName; + return shortName; } /** @@ -132,11 +131,11 @@ public String getShortName() { */ @Override public void setShortName(final String newShortName) { - final String oldShortName = this.shortName; - this.shortName = newShortName; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME, - oldShortName, this.shortName)); + final String oldShortName = shortName; + shortName = newShortName; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME, + oldShortName, shortName)); } } @@ -147,7 +146,7 @@ public void setShortName(final String newShortName) { */ @Override public String getDescription() { - return this.description; + return description; } /** @@ -157,11 +156,11 @@ public String getDescription() { */ @Override public void setDescription(final String newDescription) { - final String oldDescription = this.description; - this.description = newDescription; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION, - oldDescription, this.description)); + final String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION, + oldDescription, description)); } } @@ -172,11 +171,11 @@ public void setDescription(final String newDescription) { */ @Override public EList getParameter() { - if (this.parameter == null) { - this.parameter = new EObjectContainmentEList( - org.somox.metrics.dsl.metricDSL.Number.class, this, MetricDSLPackage.INTERNAL_METRIC__PARAMETER); + if (parameter == null) { + parameter = new EObjectContainmentEList<>(org.somox.metrics.dsl.metricDSL.Number.class, this, + MetricDSLPackage.INTERNAL_METRIC__PARAMETER); } - return this.parameter; + return parameter; } /** @@ -186,7 +185,7 @@ public EList getParameter() { */ @Override public MetricDefinition getDefinition() { - return this.definition; + return definition; } /** @@ -195,9 +194,9 @@ public MetricDefinition getDefinition() { * @generated */ public NotificationChain basicSetDefinition(final MetricDefinition newDefinition, NotificationChain msgs) { - final MetricDefinition oldDefinition = this.definition; - this.definition = newDefinition; - if (this.eNotificationRequired()) { + final MetricDefinition oldDefinition = definition; + definition = newDefinition; + if (eNotificationRequired()) { final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__DEFINITION, oldDefinition, newDefinition); if (msgs == null) { @@ -216,22 +215,22 @@ public NotificationChain basicSetDefinition(final MetricDefinition newDefinition */ @Override public void setDefinition(final MetricDefinition newDefinition) { - if (newDefinition != this.definition) { + if (newDefinition != definition) { NotificationChain msgs = null; - if (this.definition != null) { - msgs = ((InternalEObject) this.definition).eInverseRemove(this, + if (definition != null) { + msgs = ((InternalEObject) definition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MetricDSLPackage.INTERNAL_METRIC__DEFINITION, null, msgs); } if (newDefinition != null) { msgs = ((InternalEObject) newDefinition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MetricDSLPackage.INTERNAL_METRIC__DEFINITION, null, msgs); } - msgs = this.basicSetDefinition(newDefinition, msgs); + msgs = basicSetDefinition(newDefinition, msgs); if (msgs != null) { msgs.dispatch(); } - } else if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__DEFINITION, + } else if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.INTERNAL_METRIC__DEFINITION, newDefinition, newDefinition)); } } @@ -246,9 +245,9 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in final NotificationChain msgs) { switch (featureID) { case MetricDSLPackage.INTERNAL_METRIC__PARAMETER: - return ((InternalEList) this.getParameter()).basicRemove(otherEnd, msgs); + return ((InternalEList) getParameter()).basicRemove(otherEnd, msgs); case MetricDSLPackage.INTERNAL_METRIC__DEFINITION: - return this.basicSetDefinition(null, msgs); + return basicSetDefinition(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -262,13 +261,13 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME: - return this.getShortName(); + return getShortName(); case MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION: - return this.getDescription(); + return getDescription(); case MetricDSLPackage.INTERNAL_METRIC__PARAMETER: - return this.getParameter(); + return getParameter(); case MetricDSLPackage.INTERNAL_METRIC__DEFINITION: - return this.getDefinition(); + return getDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -283,17 +282,17 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME: - this.setShortName((String) newValue); + setShortName((String) newValue); return; case MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION: - this.setDescription((String) newValue); + setDescription((String) newValue); return; case MetricDSLPackage.INTERNAL_METRIC__PARAMETER: - this.getParameter().clear(); - this.getParameter().addAll((Collection) newValue); + getParameter().clear(); + getParameter().addAll((Collection) newValue); return; case MetricDSLPackage.INTERNAL_METRIC__DEFINITION: - this.setDefinition((MetricDefinition) newValue); + setDefinition((MetricDefinition) newValue); return; } super.eSet(featureID, newValue); @@ -308,16 +307,16 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME: - this.setShortName(SHORT_NAME_EDEFAULT); + setShortName(SHORT_NAME_EDEFAULT); return; case MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION: - this.setDescription(DESCRIPTION_EDEFAULT); + setDescription(DESCRIPTION_EDEFAULT); return; case MetricDSLPackage.INTERNAL_METRIC__PARAMETER: - this.getParameter().clear(); + getParameter().clear(); return; case MetricDSLPackage.INTERNAL_METRIC__DEFINITION: - this.setDefinition((MetricDefinition) null); + setDefinition((MetricDefinition) null); return; } super.eUnset(featureID); @@ -332,14 +331,13 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.INTERNAL_METRIC__SHORT_NAME: - return SHORT_NAME_EDEFAULT == null ? this.shortName != null : !SHORT_NAME_EDEFAULT.equals(this.shortName); + return SHORT_NAME_EDEFAULT == null ? shortName != null : !SHORT_NAME_EDEFAULT.equals(shortName); case MetricDSLPackage.INTERNAL_METRIC__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? this.description != null - : !DESCRIPTION_EDEFAULT.equals(this.description); + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case MetricDSLPackage.INTERNAL_METRIC__PARAMETER: - return this.parameter != null && !this.parameter.isEmpty(); + return (parameter != null) && !parameter.isEmpty(); case MetricDSLPackage.INTERNAL_METRIC__DEFINITION: - return this.definition != null; + return definition != null; } return super.eIsSet(featureID); } @@ -351,15 +349,15 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (shortName: "); - result.append(this.shortName); + result.append(shortName); result.append(", description: "); - result.append(this.description); + result.append(description); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricAndWeightImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricAndWeightImpl.java index 597a5b5..03331e3 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricAndWeightImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricAndWeightImpl.java @@ -12,15 +12,15 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'Metric And Weight - * '. + * An implementation of the model object 'Metric + * And Weight '. *

      * The following features are implemented: *

        - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl#getMetric Metric} - *
        • - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl#getWeight Weight} - *
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl#getMetric + * Metric}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricAndWeightImpl#getWeight + * Weight}
        • *
      *

      * @@ -28,8 +28,8 @@ */ public class MetricAndWeightImpl extends MinimalEObjectImpl.Container implements MetricAndWeight { /** - * The cached value of the '{@link #getMetric() Metric}' reference. + * The cached value of the '{@link #getMetric() Metric}' reference. + * * * @see #getMetric() * @generated @@ -38,8 +38,8 @@ public class MetricAndWeightImpl extends MinimalEObjectImpl.Container implements protected Metric metric; /** - * The cached value of the '{@link #getWeight() Weight}' reference. + * The cached value of the '{@link #getWeight() Weight}' reference. + * * * @see #getWeight() * @generated @@ -53,7 +53,6 @@ public class MetricAndWeightImpl extends MinimalEObjectImpl.Container implements * @generated */ protected MetricAndWeightImpl() { - super(); } /** @@ -73,17 +72,15 @@ protected EClass eStaticClass() { */ @Override public Metric getMetric() { - if (this.metric != null && this.metric.eIsProxy()) { - final InternalEObject oldMetric = (InternalEObject) this.metric; - this.metric = (Metric) this.eResolveProxy(oldMetric); - if (this.metric != oldMetric) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.METRIC_AND_WEIGHT__METRIC, oldMetric, this.metric)); - } + if ((metric != null) && metric.eIsProxy()) { + final InternalEObject oldMetric = (InternalEObject) metric; + metric = (Metric) eResolveProxy(oldMetric); + if ((metric != oldMetric) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, MetricDSLPackage.METRIC_AND_WEIGHT__METRIC, + oldMetric, metric)); } } - return this.metric; + return metric; } /** @@ -92,7 +89,7 @@ public Metric getMetric() { * @generated */ public Metric basicGetMetric() { - return this.metric; + return metric; } /** @@ -102,11 +99,11 @@ public Metric basicGetMetric() { */ @Override public void setMetric(final Metric newMetric) { - final Metric oldMetric = this.metric; - this.metric = newMetric; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC_AND_WEIGHT__METRIC, - oldMetric, this.metric)); + final Metric oldMetric = metric; + metric = newMetric; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC_AND_WEIGHT__METRIC, oldMetric, + metric)); } } @@ -117,17 +114,15 @@ public void setMetric(final Metric newMetric) { */ @Override public org.somox.metrics.dsl.metricDSL.Number getWeight() { - if (this.weight != null && this.weight.eIsProxy()) { - final InternalEObject oldWeight = (InternalEObject) this.weight; - this.weight = (org.somox.metrics.dsl.metricDSL.Number) this.eResolveProxy(oldWeight); - if (this.weight != oldWeight) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT, oldWeight, this.weight)); - } + if ((weight != null) && weight.eIsProxy()) { + final InternalEObject oldWeight = (InternalEObject) weight; + weight = (org.somox.metrics.dsl.metricDSL.Number) eResolveProxy(oldWeight); + if ((weight != oldWeight) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT, + oldWeight, weight)); } } - return this.weight; + return weight; } /** @@ -136,7 +131,7 @@ public org.somox.metrics.dsl.metricDSL.Number getWeight() { * @generated */ public org.somox.metrics.dsl.metricDSL.Number basicGetWeight() { - return this.weight; + return weight; } /** @@ -146,11 +141,11 @@ public org.somox.metrics.dsl.metricDSL.Number basicGetWeight() { */ @Override public void setWeight(final org.somox.metrics.dsl.metricDSL.Number newWeight) { - final org.somox.metrics.dsl.metricDSL.Number oldWeight = this.weight; - this.weight = newWeight; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT, - oldWeight, this.weight)); + final org.somox.metrics.dsl.metricDSL.Number oldWeight = weight; + weight = newWeight; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT, oldWeight, + weight)); } } @@ -164,14 +159,14 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor switch (featureID) { case MetricDSLPackage.METRIC_AND_WEIGHT__METRIC: if (resolve) { - return this.getMetric(); + return getMetric(); } - return this.basicGetMetric(); + return basicGetMetric(); case MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT: if (resolve) { - return this.getWeight(); + return getWeight(); } - return this.basicGetWeight(); + return basicGetWeight(); } return super.eGet(featureID, resolve, coreType); } @@ -185,10 +180,10 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.METRIC_AND_WEIGHT__METRIC: - this.setMetric((Metric) newValue); + setMetric((Metric) newValue); return; case MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT: - this.setWeight((org.somox.metrics.dsl.metricDSL.Number) newValue); + setWeight((org.somox.metrics.dsl.metricDSL.Number) newValue); return; } super.eSet(featureID, newValue); @@ -203,10 +198,10 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC_AND_WEIGHT__METRIC: - this.setMetric((Metric) null); + setMetric((Metric) null); return; case MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT: - this.setWeight((org.somox.metrics.dsl.metricDSL.Number) null); + setWeight((org.somox.metrics.dsl.metricDSL.Number) null); return; } super.eUnset(featureID); @@ -221,9 +216,9 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC_AND_WEIGHT__METRIC: - return this.metric != null; + return metric != null; case MetricDSLPackage.METRIC_AND_WEIGHT__WEIGHT: - return this.weight != null; + return weight != null; } return super.eIsSet(featureID); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLFactoryImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLFactoryImpl.java index 64eb198..cfddfcb 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLFactoryImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLFactoryImpl.java @@ -23,13 +23,15 @@ import org.somox.metrics.dsl.metricDSL.WeightedMetric; /** - * An implementation of the model Factory. + * An implementation of the model Factory. * * @generated */ public class MetricDSLFactoryImpl extends EFactoryImpl implements MetricDSLFactory { /** - * Creates the default factory implementation. + * Creates the default factory implementation. * * @generated */ @@ -47,12 +49,12 @@ public static MetricDSLFactory init() { } /** - * Creates an instance of the factory. + * Creates an instance of the factory. * * @generated */ public MetricDSLFactoryImpl() { - super(); } /** @@ -62,36 +64,22 @@ public MetricDSLFactoryImpl() { */ @Override public EObject create(final EClass eClass) { - switch (eClass.getClassifierID()) { - case MetricDSLPackage.METRIC_MODEL: - return this.createMetricModel(); - case MetricDSLPackage.METRIC: - return this.createMetric(); - case MetricDSLPackage.EXTERNAL_METRIC: - return this.createExternalMetric(); - case MetricDSLPackage.INTERNAL_METRIC: - return this.createInternalMetric(); - case MetricDSLPackage.NUMBER: - return this.createNumber(); - case MetricDSLPackage.PARAMETER: - return this.createParameter(); - case MetricDSLPackage.CONSTANT: - return this.createConstant(); - case MetricDSLPackage.METRIC_DEFINITION: - return this.createMetricDefinition(); - case MetricDSLPackage.WEIGHTED_METRIC: - return this.createWeightedMetric(); - case MetricDSLPackage.STEPWISE_METRIC: - return this.createStepwiseMetric(); - case MetricDSLPackage.RATIO_METRIC: - return this.createRatioMetric(); - case MetricDSLPackage.BOUND_AND_WEIGHT: - return this.createBoundAndWeight(); - case MetricDSLPackage.METRIC_AND_WEIGHT: - return this.createMetricAndWeight(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } + return switch (eClass.getClassifierID()) { + case MetricDSLPackage.METRIC_MODEL -> createMetricModel(); + case MetricDSLPackage.METRIC -> createMetric(); + case MetricDSLPackage.EXTERNAL_METRIC -> createExternalMetric(); + case MetricDSLPackage.INTERNAL_METRIC -> createInternalMetric(); + case MetricDSLPackage.NUMBER -> createNumber(); + case MetricDSLPackage.PARAMETER -> createParameter(); + case MetricDSLPackage.CONSTANT -> createConstant(); + case MetricDSLPackage.METRIC_DEFINITION -> createMetricDefinition(); + case MetricDSLPackage.WEIGHTED_METRIC -> createWeightedMetric(); + case MetricDSLPackage.STEPWISE_METRIC -> createStepwiseMetric(); + case MetricDSLPackage.RATIO_METRIC -> createRatioMetric(); + case MetricDSLPackage.BOUND_AND_WEIGHT -> createBoundAndWeight(); + case MetricDSLPackage.METRIC_AND_WEIGHT -> createMetricAndWeight(); + default -> throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + }; } /** @@ -101,8 +89,7 @@ public EObject create(final EClass eClass) { */ @Override public MetricModel createMetricModel() { - final MetricModelImpl metricModel = new MetricModelImpl(); - return metricModel; + return new MetricModelImpl(); } /** @@ -112,8 +99,7 @@ public MetricModel createMetricModel() { */ @Override public Metric createMetric() { - final MetricImpl metric = new MetricImpl(); - return metric; + return new MetricImpl(); } /** @@ -123,8 +109,7 @@ public Metric createMetric() { */ @Override public ExternalMetric createExternalMetric() { - final ExternalMetricImpl externalMetric = new ExternalMetricImpl(); - return externalMetric; + return new ExternalMetricImpl(); } /** @@ -134,8 +119,7 @@ public ExternalMetric createExternalMetric() { */ @Override public InternalMetric createInternalMetric() { - final InternalMetricImpl internalMetric = new InternalMetricImpl(); - return internalMetric; + return new InternalMetricImpl(); } /** @@ -145,8 +129,7 @@ public InternalMetric createInternalMetric() { */ @Override public org.somox.metrics.dsl.metricDSL.Number createNumber() { - final NumberImpl number = new NumberImpl(); - return number; + return new NumberImpl(); } /** @@ -156,8 +139,7 @@ public org.somox.metrics.dsl.metricDSL.Number createNumber() { */ @Override public Parameter createParameter() { - final ParameterImpl parameter = new ParameterImpl(); - return parameter; + return new ParameterImpl(); } /** @@ -167,8 +149,7 @@ public Parameter createParameter() { */ @Override public Constant createConstant() { - final ConstantImpl constant = new ConstantImpl(); - return constant; + return new ConstantImpl(); } /** @@ -178,8 +159,7 @@ public Constant createConstant() { */ @Override public MetricDefinition createMetricDefinition() { - final MetricDefinitionImpl metricDefinition = new MetricDefinitionImpl(); - return metricDefinition; + return new MetricDefinitionImpl(); } /** @@ -189,8 +169,7 @@ public MetricDefinition createMetricDefinition() { */ @Override public WeightedMetric createWeightedMetric() { - final WeightedMetricImpl weightedMetric = new WeightedMetricImpl(); - return weightedMetric; + return new WeightedMetricImpl(); } /** @@ -200,8 +179,7 @@ public WeightedMetric createWeightedMetric() { */ @Override public StepwiseMetric createStepwiseMetric() { - final StepwiseMetricImpl stepwiseMetric = new StepwiseMetricImpl(); - return stepwiseMetric; + return new StepwiseMetricImpl(); } /** @@ -211,8 +189,7 @@ public StepwiseMetric createStepwiseMetric() { */ @Override public RatioMetric createRatioMetric() { - final RatioMetricImpl ratioMetric = new RatioMetricImpl(); - return ratioMetric; + return new RatioMetricImpl(); } /** @@ -222,8 +199,7 @@ public RatioMetric createRatioMetric() { */ @Override public BoundAndWeight createBoundAndWeight() { - final BoundAndWeightImpl boundAndWeight = new BoundAndWeightImpl(); - return boundAndWeight; + return new BoundAndWeightImpl(); } /** @@ -233,8 +209,7 @@ public BoundAndWeight createBoundAndWeight() { */ @Override public MetricAndWeight createMetricAndWeight() { - final MetricAndWeightImpl metricAndWeight = new MetricAndWeightImpl(); - return metricAndWeight; + return new MetricAndWeightImpl(); } /** @@ -244,7 +219,7 @@ public MetricAndWeight createMetricAndWeight() { */ @Override public MetricDSLPackage getMetricDSLPackage() { - return (MetricDSLPackage) this.getEPackage(); + return (MetricDSLPackage) getEPackage(); } /** diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLPackageImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLPackageImpl.java index b1a8411..e415a1f 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLPackageImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDSLPackageImpl.java @@ -23,7 +23,8 @@ import org.somox.metrics.dsl.metricDSL.WeightedMetric; /** - * An implementation of the model Package. + * An implementation of the model Package. * * @generated */ @@ -121,12 +122,13 @@ public class MetricDSLPackageImpl extends EPackageImpl implements MetricDSLPacka /** * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI - * value. + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the + * package package URI value. *

      - * Note: the correct way to create the package is via the static factory method {@link #init - * init()}, which also performs initialization of the package, or returns the registered - * package, if one already exists. + * Note: the correct way to create the package is via the static factory method + * {@link #init init()}, which also performs initialization of the package, or + * returns the registered package, if one already exists. * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage#eNS_URI @@ -145,13 +147,14 @@ private MetricDSLPackageImpl() { private static boolean isInited = false; /** - * Creates, registers, and initializes the Package for this model, and for any others - * upon which it depends. + * Creates, registers, and initializes the Package for this model, and + * for any others upon which it depends. * *

      - * This method is used to initialize {@link MetricDSLPackage#eINSTANCE} when that field is - * accessed. Clients should not invoke it directly. Instead, they should simply access that - * field to obtain the package. + * This method is used to initialize {@link MetricDSLPackage#eINSTANCE} when + * that field is accessed. Clients should not invoke it directly. Instead, they + * should simply access that field to obtain the package. * * @see #eNS_URI * @see #createPackageContents() @@ -191,7 +194,7 @@ public static MetricDSLPackage init() { */ @Override public EClass getMetricModel() { - return this.metricModelEClass; + return metricModelEClass; } /** @@ -201,7 +204,7 @@ public EClass getMetricModel() { */ @Override public EAttribute getMetricModel_ImportURI() { - return (EAttribute) this.metricModelEClass.getEStructuralFeatures().get(0); + return (EAttribute) metricModelEClass.getEStructuralFeatures().get(0); } /** @@ -211,7 +214,7 @@ public EAttribute getMetricModel_ImportURI() { */ @Override public EReference getMetricModel_Metrics() { - return (EReference) this.metricModelEClass.getEStructuralFeatures().get(1); + return (EReference) metricModelEClass.getEStructuralFeatures().get(1); } /** @@ -221,7 +224,7 @@ public EReference getMetricModel_Metrics() { */ @Override public EClass getMetric() { - return this.metricEClass; + return metricEClass; } /** @@ -231,7 +234,7 @@ public EClass getMetric() { */ @Override public EAttribute getMetric_Name() { - return (EAttribute) this.metricEClass.getEStructuralFeatures().get(0); + return (EAttribute) metricEClass.getEStructuralFeatures().get(0); } /** @@ -241,7 +244,7 @@ public EAttribute getMetric_Name() { */ @Override public EClass getExternalMetric() { - return this.externalMetricEClass; + return externalMetricEClass; } /** @@ -251,7 +254,7 @@ public EClass getExternalMetric() { */ @Override public EClass getInternalMetric() { - return this.internalMetricEClass; + return internalMetricEClass; } /** @@ -261,7 +264,7 @@ public EClass getInternalMetric() { */ @Override public EAttribute getInternalMetric_ShortName() { - return (EAttribute) this.internalMetricEClass.getEStructuralFeatures().get(0); + return (EAttribute) internalMetricEClass.getEStructuralFeatures().get(0); } /** @@ -271,7 +274,7 @@ public EAttribute getInternalMetric_ShortName() { */ @Override public EAttribute getInternalMetric_Description() { - return (EAttribute) this.internalMetricEClass.getEStructuralFeatures().get(1); + return (EAttribute) internalMetricEClass.getEStructuralFeatures().get(1); } /** @@ -281,7 +284,7 @@ public EAttribute getInternalMetric_Description() { */ @Override public EReference getInternalMetric_Parameter() { - return (EReference) this.internalMetricEClass.getEStructuralFeatures().get(2); + return (EReference) internalMetricEClass.getEStructuralFeatures().get(2); } /** @@ -291,7 +294,7 @@ public EReference getInternalMetric_Parameter() { */ @Override public EReference getInternalMetric_Definition() { - return (EReference) this.internalMetricEClass.getEStructuralFeatures().get(3); + return (EReference) internalMetricEClass.getEStructuralFeatures().get(3); } /** @@ -301,7 +304,7 @@ public EReference getInternalMetric_Definition() { */ @Override public EClass getNumber() { - return this.numberEClass; + return numberEClass; } /** @@ -311,7 +314,7 @@ public EClass getNumber() { */ @Override public EAttribute getNumber_Name() { - return (EAttribute) this.numberEClass.getEStructuralFeatures().get(0); + return (EAttribute) numberEClass.getEStructuralFeatures().get(0); } /** @@ -321,7 +324,7 @@ public EAttribute getNumber_Name() { */ @Override public EClass getParameter() { - return this.parameterEClass; + return parameterEClass; } /** @@ -331,7 +334,7 @@ public EClass getParameter() { */ @Override public EAttribute getParameter_Shortname() { - return (EAttribute) this.parameterEClass.getEStructuralFeatures().get(0); + return (EAttribute) parameterEClass.getEStructuralFeatures().get(0); } /** @@ -341,7 +344,7 @@ public EAttribute getParameter_Shortname() { */ @Override public EAttribute getParameter_Description() { - return (EAttribute) this.parameterEClass.getEStructuralFeatures().get(1); + return (EAttribute) parameterEClass.getEStructuralFeatures().get(1); } /** @@ -351,7 +354,7 @@ public EAttribute getParameter_Description() { */ @Override public EAttribute getParameter_DefaultValue() { - return (EAttribute) this.parameterEClass.getEStructuralFeatures().get(2); + return (EAttribute) parameterEClass.getEStructuralFeatures().get(2); } /** @@ -361,7 +364,7 @@ public EAttribute getParameter_DefaultValue() { */ @Override public EClass getConstant() { - return this.constantEClass; + return constantEClass; } /** @@ -371,7 +374,7 @@ public EClass getConstant() { */ @Override public EAttribute getConstant_Value() { - return (EAttribute) this.constantEClass.getEStructuralFeatures().get(0); + return (EAttribute) constantEClass.getEStructuralFeatures().get(0); } /** @@ -381,7 +384,7 @@ public EAttribute getConstant_Value() { */ @Override public EClass getMetricDefinition() { - return this.metricDefinitionEClass; + return metricDefinitionEClass; } /** @@ -391,7 +394,7 @@ public EClass getMetricDefinition() { */ @Override public EClass getWeightedMetric() { - return this.weightedMetricEClass; + return weightedMetricEClass; } /** @@ -401,7 +404,7 @@ public EClass getWeightedMetric() { */ @Override public EReference getWeightedMetric_Weights() { - return (EReference) this.weightedMetricEClass.getEStructuralFeatures().get(0); + return (EReference) weightedMetricEClass.getEStructuralFeatures().get(0); } /** @@ -411,7 +414,7 @@ public EReference getWeightedMetric_Weights() { */ @Override public EClass getStepwiseMetric() { - return this.stepwiseMetricEClass; + return stepwiseMetricEClass; } /** @@ -421,7 +424,7 @@ public EClass getStepwiseMetric() { */ @Override public EReference getStepwiseMetric_InnerMetric() { - return (EReference) this.stepwiseMetricEClass.getEStructuralFeatures().get(0); + return (EReference) stepwiseMetricEClass.getEStructuralFeatures().get(0); } /** @@ -431,7 +434,7 @@ public EReference getStepwiseMetric_InnerMetric() { */ @Override public EReference getStepwiseMetric_Steps() { - return (EReference) this.stepwiseMetricEClass.getEStructuralFeatures().get(1); + return (EReference) stepwiseMetricEClass.getEStructuralFeatures().get(1); } /** @@ -441,7 +444,7 @@ public EReference getStepwiseMetric_Steps() { */ @Override public EClass getRatioMetric() { - return this.ratioMetricEClass; + return ratioMetricEClass; } /** @@ -451,7 +454,7 @@ public EClass getRatioMetric() { */ @Override public EReference getRatioMetric_NominatorMetric() { - return (EReference) this.ratioMetricEClass.getEStructuralFeatures().get(0); + return (EReference) ratioMetricEClass.getEStructuralFeatures().get(0); } /** @@ -461,7 +464,7 @@ public EReference getRatioMetric_NominatorMetric() { */ @Override public EReference getRatioMetric_DenominatorMetric() { - return (EReference) this.ratioMetricEClass.getEStructuralFeatures().get(1); + return (EReference) ratioMetricEClass.getEStructuralFeatures().get(1); } /** @@ -471,7 +474,7 @@ public EReference getRatioMetric_DenominatorMetric() { */ @Override public EClass getBoundAndWeight() { - return this.boundAndWeightEClass; + return boundAndWeightEClass; } /** @@ -481,7 +484,7 @@ public EClass getBoundAndWeight() { */ @Override public EReference getBoundAndWeight_UpperBound() { - return (EReference) this.boundAndWeightEClass.getEStructuralFeatures().get(0); + return (EReference) boundAndWeightEClass.getEStructuralFeatures().get(0); } /** @@ -491,7 +494,7 @@ public EReference getBoundAndWeight_UpperBound() { */ @Override public EReference getBoundAndWeight_Weight() { - return (EReference) this.boundAndWeightEClass.getEStructuralFeatures().get(1); + return (EReference) boundAndWeightEClass.getEStructuralFeatures().get(1); } /** @@ -501,7 +504,7 @@ public EReference getBoundAndWeight_Weight() { */ @Override public EClass getMetricAndWeight() { - return this.metricAndWeightEClass; + return metricAndWeightEClass; } /** @@ -511,7 +514,7 @@ public EClass getMetricAndWeight() { */ @Override public EReference getMetricAndWeight_Metric() { - return (EReference) this.metricAndWeightEClass.getEStructuralFeatures().get(0); + return (EReference) metricAndWeightEClass.getEStructuralFeatures().get(0); } /** @@ -521,7 +524,7 @@ public EReference getMetricAndWeight_Metric() { */ @Override public EReference getMetricAndWeight_Weight() { - return (EReference) this.metricAndWeightEClass.getEStructuralFeatures().get(1); + return (EReference) metricAndWeightEClass.getEStructuralFeatures().get(1); } /** @@ -531,7 +534,7 @@ public EReference getMetricAndWeight_Weight() { */ @Override public MetricDSLFactory getMetricDSLFactory() { - return (MetricDSLFactory) this.getEFactoryInstance(); + return (MetricDSLFactory) getEFactoryInstance(); } /** @@ -542,64 +545,65 @@ public MetricDSLFactory getMetricDSLFactory() { private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on - * any invocation but its first. + * Creates the meta-model objects for the package. This method is guarded to + * have no affect on any invocation but its first. * * @generated */ public void createPackageContents() { - if (this.isCreated) { + if (isCreated) { return; } - this.isCreated = true; + isCreated = true; // Create classes and their features - this.metricModelEClass = this.createEClass(METRIC_MODEL); - this.createEAttribute(this.metricModelEClass, METRIC_MODEL__IMPORT_URI); - this.createEReference(this.metricModelEClass, METRIC_MODEL__METRICS); + metricModelEClass = createEClass(METRIC_MODEL); + createEAttribute(metricModelEClass, METRIC_MODEL__IMPORT_URI); + createEReference(metricModelEClass, METRIC_MODEL__METRICS); - this.metricEClass = this.createEClass(METRIC); - this.createEAttribute(this.metricEClass, METRIC__NAME); + metricEClass = createEClass(METRIC); + createEAttribute(metricEClass, METRIC__NAME); - this.externalMetricEClass = this.createEClass(EXTERNAL_METRIC); + externalMetricEClass = createEClass(EXTERNAL_METRIC); - this.internalMetricEClass = this.createEClass(INTERNAL_METRIC); - this.createEAttribute(this.internalMetricEClass, INTERNAL_METRIC__SHORT_NAME); - this.createEAttribute(this.internalMetricEClass, INTERNAL_METRIC__DESCRIPTION); - this.createEReference(this.internalMetricEClass, INTERNAL_METRIC__PARAMETER); - this.createEReference(this.internalMetricEClass, INTERNAL_METRIC__DEFINITION); + internalMetricEClass = createEClass(INTERNAL_METRIC); + createEAttribute(internalMetricEClass, INTERNAL_METRIC__SHORT_NAME); + createEAttribute(internalMetricEClass, INTERNAL_METRIC__DESCRIPTION); + createEReference(internalMetricEClass, INTERNAL_METRIC__PARAMETER); + createEReference(internalMetricEClass, INTERNAL_METRIC__DEFINITION); - this.numberEClass = this.createEClass(NUMBER); - this.createEAttribute(this.numberEClass, NUMBER__NAME); + numberEClass = createEClass(NUMBER); + createEAttribute(numberEClass, NUMBER__NAME); - this.parameterEClass = this.createEClass(PARAMETER); - this.createEAttribute(this.parameterEClass, PARAMETER__SHORTNAME); - this.createEAttribute(this.parameterEClass, PARAMETER__DESCRIPTION); - this.createEAttribute(this.parameterEClass, PARAMETER__DEFAULT_VALUE); + parameterEClass = createEClass(PARAMETER); + createEAttribute(parameterEClass, PARAMETER__SHORTNAME); + createEAttribute(parameterEClass, PARAMETER__DESCRIPTION); + createEAttribute(parameterEClass, PARAMETER__DEFAULT_VALUE); - this.constantEClass = this.createEClass(CONSTANT); - this.createEAttribute(this.constantEClass, CONSTANT__VALUE); + constantEClass = createEClass(CONSTANT); + createEAttribute(constantEClass, CONSTANT__VALUE); - this.metricDefinitionEClass = this.createEClass(METRIC_DEFINITION); + metricDefinitionEClass = createEClass(METRIC_DEFINITION); - this.weightedMetricEClass = this.createEClass(WEIGHTED_METRIC); - this.createEReference(this.weightedMetricEClass, WEIGHTED_METRIC__WEIGHTS); + weightedMetricEClass = createEClass(WEIGHTED_METRIC); + createEReference(weightedMetricEClass, WEIGHTED_METRIC__WEIGHTS); - this.stepwiseMetricEClass = this.createEClass(STEPWISE_METRIC); - this.createEReference(this.stepwiseMetricEClass, STEPWISE_METRIC__INNER_METRIC); - this.createEReference(this.stepwiseMetricEClass, STEPWISE_METRIC__STEPS); + stepwiseMetricEClass = createEClass(STEPWISE_METRIC); + createEReference(stepwiseMetricEClass, STEPWISE_METRIC__INNER_METRIC); + createEReference(stepwiseMetricEClass, STEPWISE_METRIC__STEPS); - this.ratioMetricEClass = this.createEClass(RATIO_METRIC); - this.createEReference(this.ratioMetricEClass, RATIO_METRIC__NOMINATOR_METRIC); - this.createEReference(this.ratioMetricEClass, RATIO_METRIC__DENOMINATOR_METRIC); + ratioMetricEClass = createEClass(RATIO_METRIC); + createEReference(ratioMetricEClass, RATIO_METRIC__NOMINATOR_METRIC); + createEReference(ratioMetricEClass, RATIO_METRIC__DENOMINATOR_METRIC); - this.boundAndWeightEClass = this.createEClass(BOUND_AND_WEIGHT); - this.createEReference(this.boundAndWeightEClass, BOUND_AND_WEIGHT__UPPER_BOUND); - this.createEReference(this.boundAndWeightEClass, BOUND_AND_WEIGHT__WEIGHT); + boundAndWeightEClass = createEClass(BOUND_AND_WEIGHT); + createEReference(boundAndWeightEClass, BOUND_AND_WEIGHT__UPPER_BOUND); + createEReference(boundAndWeightEClass, BOUND_AND_WEIGHT__WEIGHT); - this.metricAndWeightEClass = this.createEClass(METRIC_AND_WEIGHT); - this.createEReference(this.metricAndWeightEClass, METRIC_AND_WEIGHT__METRIC); - this.createEReference(this.metricAndWeightEClass, METRIC_AND_WEIGHT__WEIGHT); + metricAndWeightEClass = createEClass(METRIC_AND_WEIGHT); + createEReference(metricAndWeightEClass, METRIC_AND_WEIGHT__METRIC); + createEReference(metricAndWeightEClass, METRIC_AND_WEIGHT__WEIGHT); } /** @@ -610,139 +614,138 @@ public void createPackageContents() { private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have - * no affect on any invocation but its first. + * Complete the initialization of the package and its meta-model. This method is + * guarded to have no affect on any invocation but its first. * * @generated */ public void initializePackageContents() { - if (this.isInitialized) { + if (isInitialized) { return; } - this.isInitialized = true; + isInitialized = true; // Initialize package - this.setName(eNAME); - this.setNsPrefix(eNS_PREFIX); - this.setNsURI(eNS_URI); + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); // Create type parameters // Set bounds for type parameters // Add supertypes to classes - this.externalMetricEClass.getESuperTypes().add(this.getMetric()); - this.internalMetricEClass.getESuperTypes().add(this.getMetric()); - this.parameterEClass.getESuperTypes().add(this.getNumber()); - this.constantEClass.getESuperTypes().add(this.getNumber()); - this.weightedMetricEClass.getESuperTypes().add(this.getMetricDefinition()); - this.stepwiseMetricEClass.getESuperTypes().add(this.getMetricDefinition()); - this.ratioMetricEClass.getESuperTypes().add(this.getMetricDefinition()); + externalMetricEClass.getESuperTypes().add(getMetric()); + internalMetricEClass.getESuperTypes().add(getMetric()); + parameterEClass.getESuperTypes().add(getNumber()); + constantEClass.getESuperTypes().add(getNumber()); + weightedMetricEClass.getESuperTypes().add(getMetricDefinition()); + stepwiseMetricEClass.getESuperTypes().add(getMetricDefinition()); + ratioMetricEClass.getESuperTypes().add(getMetricDefinition()); // Initialize classes and features; add operations and parameters - this.initEClass(this.metricModelEClass, MetricModel.class, "MetricModel", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(metricModelEClass, MetricModel.class, "MetricModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getMetricModel_ImportURI(), this.ecorePackage.getEString(), "importURI", null, 0, -1, + this.initEAttribute(getMetricModel_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, -1, MetricModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getMetricModel_Metrics(), this.getMetric(), null, "metrics", null, 0, -1, - MetricModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEReference(getMetricModel_Metrics(), getMetric(), null, "metrics", null, 0, -1, MetricModel.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.metricEClass, Metric.class, "Metric", !IS_ABSTRACT, !IS_INTERFACE, - IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getMetric_Name(), this.ecorePackage.getEString(), "name", null, 0, 1, Metric.class, + this.initEClass(metricEClass, Metric.class, "Metric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(getMetric_Name(), ecorePackage.getEString(), "name", null, 0, 1, Metric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.externalMetricEClass, ExternalMetric.class, "ExternalMetric", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(externalMetricEClass, ExternalMetric.class, "ExternalMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEClass(this.internalMetricEClass, InternalMetric.class, "InternalMetric", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(internalMetricEClass, InternalMetric.class, "InternalMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getInternalMetric_ShortName(), this.ecorePackage.getEString(), "shortName", null, 0, 1, + this.initEAttribute(getInternalMetric_ShortName(), ecorePackage.getEString(), "shortName", null, 0, 1, InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getInternalMetric_Description(), this.ecorePackage.getEString(), "description", null, - 0, 1, InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getInternalMetric_Parameter(), this.getNumber(), null, "parameter", null, 0, -1, + this.initEAttribute(getInternalMetric_Description(), ecorePackage.getEString(), "description", null, 0, 1, + InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + this.initEReference(getInternalMetric_Parameter(), getNumber(), null, "parameter", null, 0, -1, + InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEReference(getInternalMetric_Definition(), getMetricDefinition(), null, "definition", null, 0, 1, InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getInternalMetric_Definition(), this.getMetricDefinition(), null, "definition", null, - 0, 1, InternalMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.numberEClass, org.somox.metrics.dsl.metricDSL.Number.class, "Number", !IS_ABSTRACT, + this.initEClass(numberEClass, org.somox.metrics.dsl.metricDSL.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getNumber_Name(), this.ecorePackage.getEString(), "name", null, 0, 1, + this.initEAttribute(getNumber_Name(), ecorePackage.getEString(), "name", null, 0, 1, org.somox.metrics.dsl.metricDSL.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getParameter_Shortname(), this.ecorePackage.getEString(), "shortname", null, 0, 1, + this.initEAttribute(getParameter_Shortname(), ecorePackage.getEString(), "shortname", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getParameter_Description(), this.ecorePackage.getEString(), "description", null, 0, 1, + this.initEAttribute(getParameter_Description(), ecorePackage.getEString(), "description", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getParameter_DefaultValue(), this.ecorePackage.getEDouble(), "defaultValue", null, 0, - 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + this.initEAttribute(getParameter_DefaultValue(), ecorePackage.getEDouble(), "defaultValue", null, 0, 1, + Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.constantEClass, Constant.class, "Constant", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(constantEClass, Constant.class, "Constant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getConstant_Value(), this.ecorePackage.getEDouble(), "value", null, 0, 1, - Constant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + this.initEAttribute(getConstant_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Constant.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.metricDefinitionEClass, MetricDefinition.class, "MetricDefinition", !IS_ABSTRACT, - !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEClass(metricDefinitionEClass, MetricDefinition.class, "MetricDefinition", !IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); - this.initEClass(this.weightedMetricEClass, WeightedMetric.class, "WeightedMetric", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(weightedMetricEClass, WeightedMetric.class, "WeightedMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getWeightedMetric_Weights(), this.getMetricAndWeight(), null, "weights", null, 0, -1, + this.initEReference(getWeightedMetric_Weights(), getMetricAndWeight(), null, "weights", null, 0, -1, WeightedMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.stepwiseMetricEClass, StepwiseMetric.class, "StepwiseMetric", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(stepwiseMetricEClass, StepwiseMetric.class, "StepwiseMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getStepwiseMetric_InnerMetric(), this.getMetric(), null, "innerMetric", null, 0, 1, + this.initEReference(getStepwiseMetric_InnerMetric(), getMetric(), null, "innerMetric", null, 0, 1, StepwiseMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getStepwiseMetric_Steps(), this.getBoundAndWeight(), null, "steps", null, 0, -1, + this.initEReference(getStepwiseMetric_Steps(), getBoundAndWeight(), null, "steps", null, 0, -1, StepwiseMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.ratioMetricEClass, RatioMetric.class, "RatioMetric", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(ratioMetricEClass, RatioMetric.class, "RatioMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getRatioMetric_NominatorMetric(), this.getMetric(), null, "nominatorMetric", null, 0, - 1, RatioMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + this.initEReference(getRatioMetric_NominatorMetric(), getMetric(), null, "nominatorMetric", null, 0, 1, + RatioMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getRatioMetric_DenominatorMetric(), this.getMetric(), null, "denominatorMetric", null, - 0, 1, RatioMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + this.initEReference(getRatioMetric_DenominatorMetric(), getMetric(), null, "denominatorMetric", null, 0, 1, + RatioMetric.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.boundAndWeightEClass, BoundAndWeight.class, "BoundAndWeight", !IS_ABSTRACT, !IS_INTERFACE, + this.initEClass(boundAndWeightEClass, BoundAndWeight.class, "BoundAndWeight", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getBoundAndWeight_UpperBound(), this.getNumber(), null, "upperBound", null, 0, 1, - BoundAndWeight.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getBoundAndWeight_Weight(), this.getNumber(), null, "weight", null, 0, 1, + this.initEReference(getBoundAndWeight_UpperBound(), getNumber(), null, "upperBound", null, 0, 1, BoundAndWeight.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEReference(getBoundAndWeight_Weight(), getNumber(), null, "weight", null, 0, 1, BoundAndWeight.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.metricAndWeightEClass, MetricAndWeight.class, "MetricAndWeight", !IS_ABSTRACT, - !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getMetricAndWeight_Metric(), this.getMetric(), null, "metric", null, 0, 1, - MetricAndWeight.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getMetricAndWeight_Weight(), this.getNumber(), null, "weight", null, 0, 1, - MetricAndWeight.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEClass(metricAndWeightEClass, MetricAndWeight.class, "MetricAndWeight", !IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); + this.initEReference(getMetricAndWeight_Metric(), getMetric(), null, "metric", null, 0, 1, MetricAndWeight.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEReference(getMetricAndWeight_Weight(), getNumber(), null, "weight", null, 0, 1, MetricAndWeight.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource - this.createResource(eNS_URI); + createResource(eNS_URI); } } // MetricDSLPackageImpl diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDefinitionImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDefinitionImpl.java index 35a4730..151c47d 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDefinitionImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricDefinitionImpl.java @@ -8,8 +8,8 @@ import org.somox.metrics.dsl.metricDSL.MetricDefinition; /** - * An implementation of the model object 'Metric Definition - * '. + * An implementation of the model object 'Metric + * Definition '. *

      *

      * @@ -22,7 +22,6 @@ public class MetricDefinitionImpl extends MinimalEObjectImpl.Container implement * @generated */ protected MetricDefinitionImpl() { - super(); } /** diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricImpl.java index 5a9cfb8..5ac31ea 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricImpl.java @@ -10,12 +10,13 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'Metric'. + * An implementation of the model object + * 'Metric'. *

      * The following features are implemented: *

        - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl#getName Name}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricImpl#getName + * Name}
        • *
      *

      * @@ -23,8 +24,8 @@ */ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric { /** - * The default value of the '{@link #getName() Name}' attribute. + * The default value of the '{@link #getName() Name}' attribute. * * @see #getName() * @generated @@ -33,8 +34,8 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric { protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. * * @see #getName() * @generated @@ -48,7 +49,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric { * @generated */ protected MetricImpl() { - super(); } /** @@ -68,7 +68,7 @@ protected EClass eStaticClass() { */ @Override public String getName() { - return this.name; + return name; } /** @@ -78,11 +78,10 @@ public String getName() { */ @Override public void setName(final String newName) { - final String oldName = this.name; - this.name = newName; - if (this.eNotificationRequired()) { - this.eNotify( - new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC__NAME, oldName, this.name)); + final String oldName = name; + name = newName; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.METRIC__NAME, oldName, name)); } } @@ -95,7 +94,7 @@ public void setName(final String newName) { public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.METRIC__NAME: - return this.getName(); + return getName(); } return super.eGet(featureID, resolve, coreType); } @@ -109,7 +108,7 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.METRIC__NAME: - this.setName((String) newValue); + setName((String) newValue); return; } super.eSet(featureID, newValue); @@ -124,7 +123,7 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC__NAME: - this.setName(NAME_EDEFAULT); + setName(NAME_EDEFAULT); return; } super.eUnset(featureID); @@ -139,7 +138,7 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC__NAME: - return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name); + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); } return super.eIsSet(featureID); } @@ -151,13 +150,13 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); - result.append(this.name); + result.append(name); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricModelImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricModelImpl.java index 637b11a..a3d7c26 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricModelImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/MetricModelImpl.java @@ -17,14 +17,15 @@ import org.somox.metrics.dsl.metricDSL.MetricModel; /** - * An implementation of the model object 'Metric Model'. - * + * An implementation of the model object 'Metric + * Model'. *

      * The following features are implemented: *

        - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl#getImportURI Import URI} - *
        • - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl#getMetrics Metrics}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl#getImportURI + * Import URI}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.MetricModelImpl#getMetrics + * Metrics}
        • *
      *

      * @@ -32,8 +33,8 @@ */ public class MetricModelImpl extends MinimalEObjectImpl.Container implements MetricModel { /** - * The cached value of the '{@link #getImportURI() Import URI}' attribute list. + * The cached value of the '{@link #getImportURI() Import URI}' + * attribute list. * * @see #getImportURI() * @generated @@ -42,8 +43,8 @@ public class MetricModelImpl extends MinimalEObjectImpl.Container implements Met protected EList importURI; /** - * The cached value of the '{@link #getMetrics() Metrics}' containment reference list. - * + * The cached value of the '{@link #getMetrics() Metrics}' containment + * reference list. * * @see #getMetrics() * @generated @@ -57,7 +58,6 @@ public class MetricModelImpl extends MinimalEObjectImpl.Container implements Met * @generated */ protected MetricModelImpl() { - super(); } /** @@ -77,10 +77,10 @@ protected EClass eStaticClass() { */ @Override public EList getImportURI() { - if (this.importURI == null) { - this.importURI = new EDataTypeEList(String.class, this, MetricDSLPackage.METRIC_MODEL__IMPORT_URI); + if (importURI == null) { + importURI = new EDataTypeEList<>(String.class, this, MetricDSLPackage.METRIC_MODEL__IMPORT_URI); } - return this.importURI; + return importURI; } /** @@ -90,11 +90,10 @@ public EList getImportURI() { */ @Override public EList getMetrics() { - if (this.metrics == null) { - this.metrics = new EObjectContainmentEList(Metric.class, this, - MetricDSLPackage.METRIC_MODEL__METRICS); + if (metrics == null) { + metrics = new EObjectContainmentEList<>(Metric.class, this, MetricDSLPackage.METRIC_MODEL__METRICS); } - return this.metrics; + return metrics; } /** @@ -107,7 +106,7 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in final NotificationChain msgs) { switch (featureID) { case MetricDSLPackage.METRIC_MODEL__METRICS: - return ((InternalEList) this.getMetrics()).basicRemove(otherEnd, msgs); + return ((InternalEList) getMetrics()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -121,9 +120,9 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.METRIC_MODEL__IMPORT_URI: - return this.getImportURI(); + return getImportURI(); case MetricDSLPackage.METRIC_MODEL__METRICS: - return this.getMetrics(); + return getMetrics(); } return super.eGet(featureID, resolve, coreType); } @@ -138,12 +137,12 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.METRIC_MODEL__IMPORT_URI: - this.getImportURI().clear(); - this.getImportURI().addAll((Collection) newValue); + getImportURI().clear(); + getImportURI().addAll((Collection) newValue); return; case MetricDSLPackage.METRIC_MODEL__METRICS: - this.getMetrics().clear(); - this.getMetrics().addAll((Collection) newValue); + getMetrics().clear(); + getMetrics().addAll((Collection) newValue); return; } super.eSet(featureID, newValue); @@ -158,10 +157,10 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC_MODEL__IMPORT_URI: - this.getImportURI().clear(); + getImportURI().clear(); return; case MetricDSLPackage.METRIC_MODEL__METRICS: - this.getMetrics().clear(); + getMetrics().clear(); return; } super.eUnset(featureID); @@ -176,9 +175,9 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.METRIC_MODEL__IMPORT_URI: - return this.importURI != null && !this.importURI.isEmpty(); + return (importURI != null) && !importURI.isEmpty(); case MetricDSLPackage.METRIC_MODEL__METRICS: - return this.metrics != null && !this.metrics.isEmpty(); + return (metrics != null) && !metrics.isEmpty(); } return super.eIsSet(featureID); } @@ -190,13 +189,13 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (importURI: "); - result.append(this.importURI); + result.append(importURI); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/NumberImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/NumberImpl.java index 4084827..85168cd 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/NumberImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/NumberImpl.java @@ -9,12 +9,13 @@ import org.somox.metrics.dsl.metricDSL.MetricDSLPackage; /** - * An implementation of the model object 'Number'. + * An implementation of the model object + * 'Number'. *

      * The following features are implemented: *

        - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl#getName Name}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.NumberImpl#getName + * Name}
        • *
      *

      * @@ -22,8 +23,8 @@ */ public class NumberImpl extends MinimalEObjectImpl.Container implements org.somox.metrics.dsl.metricDSL.Number { /** - * The default value of the '{@link #getName() Name}' attribute. + * The default value of the '{@link #getName() Name}' attribute. * * @see #getName() * @generated @@ -32,8 +33,8 @@ public class NumberImpl extends MinimalEObjectImpl.Container implements org.somo protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. * * @see #getName() * @generated @@ -47,7 +48,6 @@ public class NumberImpl extends MinimalEObjectImpl.Container implements org.somo * @generated */ protected NumberImpl() { - super(); } /** @@ -67,7 +67,7 @@ protected EClass eStaticClass() { */ @Override public String getName() { - return this.name; + return name; } /** @@ -77,11 +77,10 @@ public String getName() { */ @Override public void setName(final String newName) { - final String oldName = this.name; - this.name = newName; - if (this.eNotificationRequired()) { - this.eNotify( - new ENotificationImpl(this, Notification.SET, MetricDSLPackage.NUMBER__NAME, oldName, this.name)); + final String oldName = name; + name = newName; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.NUMBER__NAME, oldName, name)); } } @@ -94,7 +93,7 @@ public void setName(final String newName) { public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.NUMBER__NAME: - return this.getName(); + return getName(); } return super.eGet(featureID, resolve, coreType); } @@ -108,7 +107,7 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.NUMBER__NAME: - this.setName((String) newValue); + setName((String) newValue); return; } super.eSet(featureID, newValue); @@ -123,7 +122,7 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.NUMBER__NAME: - this.setName(NAME_EDEFAULT); + setName(NAME_EDEFAULT); return; } super.eUnset(featureID); @@ -138,7 +137,7 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.NUMBER__NAME: - return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name); + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); } return super.eIsSet(featureID); } @@ -150,13 +149,13 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); - result.append(this.name); + result.append(name); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ParameterImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ParameterImpl.java index 6e4ef71..68cb195 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ParameterImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/ParameterImpl.java @@ -9,15 +9,15 @@ import org.somox.metrics.dsl.metricDSL.Parameter; /** - * An implementation of the model object 'Parameter'. + * An implementation of the model object + * 'Parameter'. *

      * The following features are implemented: *

        - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl#getShortname Shortname} - *
        • - *
      • {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl#getDescription Description - * }
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl#getShortname + * Shortname}
        • + *
      • {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl#getDescription + * Description }
        • *
      • {@link org.somox.metrics.dsl.metricDSL.impl.ParameterImpl#getDefaultValue * Default Value}
        • *
      @@ -27,8 +27,8 @@ */ public class ParameterImpl extends NumberImpl implements Parameter { /** - * The default value of the '{@link #getShortname() Shortname}' attribute. + * The default value of the '{@link #getShortname() Shortname}' + * attribute. * * @see #getShortname() * @generated @@ -37,8 +37,8 @@ public class ParameterImpl extends NumberImpl implements Parameter { protected static final String SHORTNAME_EDEFAULT = null; /** - * The cached value of the '{@link #getShortname() Shortname}' attribute. + * The cached value of the '{@link #getShortname() Shortname}' + * attribute. * * @see #getShortname() * @generated @@ -47,8 +47,8 @@ public class ParameterImpl extends NumberImpl implements Parameter { protected String shortname = SHORTNAME_EDEFAULT; /** - * The default value of the '{@link #getDescription() Description}' attribute. + * The default value of the '{@link #getDescription() Description}' + * attribute. * * @see #getDescription() * @generated @@ -57,8 +57,8 @@ public class ParameterImpl extends NumberImpl implements Parameter { protected static final String DESCRIPTION_EDEFAULT = null; /** - * The cached value of the '{@link #getDescription() Description}' attribute. + * The cached value of the '{@link #getDescription() Description}' + * attribute. * * @see #getDescription() * @generated @@ -67,8 +67,8 @@ public class ParameterImpl extends NumberImpl implements Parameter { protected String description = DESCRIPTION_EDEFAULT; /** - * The default value of the '{@link #getDefaultValue() Default Value}' attribute. + * The default value of the '{@link #getDefaultValue() Default Value}' + * attribute. * * @see #getDefaultValue() * @generated @@ -77,8 +77,8 @@ public class ParameterImpl extends NumberImpl implements Parameter { protected static final double DEFAULT_VALUE_EDEFAULT = 0.0; /** - * The cached value of the '{@link #getDefaultValue() Default Value}' attribute. + * The cached value of the '{@link #getDefaultValue() Default Value}' + * attribute. * * @see #getDefaultValue() * @generated @@ -92,7 +92,6 @@ public class ParameterImpl extends NumberImpl implements Parameter { * @generated */ protected ParameterImpl() { - super(); } /** @@ -112,7 +111,7 @@ protected EClass eStaticClass() { */ @Override public String getShortname() { - return this.shortname; + return shortname; } /** @@ -122,11 +121,11 @@ public String getShortname() { */ @Override public void setShortname(final String newShortname) { - final String oldShortname = this.shortname; - this.shortname = newShortname; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__SHORTNAME, - oldShortname, this.shortname)); + final String oldShortname = shortname; + shortname = newShortname; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__SHORTNAME, oldShortname, + shortname)); } } @@ -137,7 +136,7 @@ public void setShortname(final String newShortname) { */ @Override public String getDescription() { - return this.description; + return description; } /** @@ -147,11 +146,11 @@ public String getDescription() { */ @Override public void setDescription(final String newDescription) { - final String oldDescription = this.description; - this.description = newDescription; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__DESCRIPTION, - oldDescription, this.description)); + final String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__DESCRIPTION, + oldDescription, description)); } } @@ -162,7 +161,7 @@ public void setDescription(final String newDescription) { */ @Override public double getDefaultValue() { - return this.defaultValue; + return defaultValue; } /** @@ -172,11 +171,11 @@ public double getDefaultValue() { */ @Override public void setDefaultValue(final double newDefaultValue) { - final double oldDefaultValue = this.defaultValue; - this.defaultValue = newDefaultValue; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__DEFAULT_VALUE, - oldDefaultValue, this.defaultValue)); + final double oldDefaultValue = defaultValue; + defaultValue = newDefaultValue; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.PARAMETER__DEFAULT_VALUE, + oldDefaultValue, defaultValue)); } } @@ -189,11 +188,11 @@ public void setDefaultValue(final double newDefaultValue) { public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.PARAMETER__SHORTNAME: - return this.getShortname(); + return getShortname(); case MetricDSLPackage.PARAMETER__DESCRIPTION: - return this.getDescription(); + return getDescription(); case MetricDSLPackage.PARAMETER__DEFAULT_VALUE: - return this.getDefaultValue(); + return getDefaultValue(); } return super.eGet(featureID, resolve, coreType); } @@ -207,13 +206,13 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.PARAMETER__SHORTNAME: - this.setShortname((String) newValue); + setShortname((String) newValue); return; case MetricDSLPackage.PARAMETER__DESCRIPTION: - this.setDescription((String) newValue); + setDescription((String) newValue); return; case MetricDSLPackage.PARAMETER__DEFAULT_VALUE: - this.setDefaultValue((Double) newValue); + setDefaultValue((Double) newValue); return; } super.eSet(featureID, newValue); @@ -228,13 +227,13 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.PARAMETER__SHORTNAME: - this.setShortname(SHORTNAME_EDEFAULT); + setShortname(SHORTNAME_EDEFAULT); return; case MetricDSLPackage.PARAMETER__DESCRIPTION: - this.setDescription(DESCRIPTION_EDEFAULT); + setDescription(DESCRIPTION_EDEFAULT); return; case MetricDSLPackage.PARAMETER__DEFAULT_VALUE: - this.setDefaultValue(DEFAULT_VALUE_EDEFAULT); + setDefaultValue(DEFAULT_VALUE_EDEFAULT); return; } super.eUnset(featureID); @@ -249,12 +248,11 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.PARAMETER__SHORTNAME: - return SHORTNAME_EDEFAULT == null ? this.shortname != null : !SHORTNAME_EDEFAULT.equals(this.shortname); + return SHORTNAME_EDEFAULT == null ? shortname != null : !SHORTNAME_EDEFAULT.equals(shortname); case MetricDSLPackage.PARAMETER__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? this.description != null - : !DESCRIPTION_EDEFAULT.equals(this.description); + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case MetricDSLPackage.PARAMETER__DEFAULT_VALUE: - return this.defaultValue != DEFAULT_VALUE_EDEFAULT; + return defaultValue != DEFAULT_VALUE_EDEFAULT; } return super.eIsSet(featureID); } @@ -266,17 +264,17 @@ public boolean eIsSet(final int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) { + if (eIsProxy()) { return super.toString(); } - final StringBuffer result = new StringBuffer(super.toString()); + final StringBuilder result = new StringBuilder(super.toString()); result.append(" (shortname: "); - result.append(this.shortname); + result.append(shortname); result.append(", description: "); - result.append(this.description); + result.append(description); result.append(", defaultValue: "); - result.append(this.defaultValue); + result.append(defaultValue); result.append(')'); return result.toString(); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/RatioMetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/RatioMetricImpl.java index 3ba6042..7237ede 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/RatioMetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/RatioMetricImpl.java @@ -11,8 +11,8 @@ import org.somox.metrics.dsl.metricDSL.RatioMetric; /** - * An implementation of the model object 'Ratio Metric'. - * + * An implementation of the model object 'Ratio + * Metric'. *

      * The following features are implemented: *

        @@ -27,8 +27,8 @@ */ public class RatioMetricImpl extends MetricDefinitionImpl implements RatioMetric { /** - * The cached value of the '{@link #getNominatorMetric() Nominator Metric}' reference. - * + * The cached value of the '{@link #getNominatorMetric() Nominator + * Metric}' reference. * * @see #getNominatorMetric() * @generated @@ -37,8 +37,8 @@ public class RatioMetricImpl extends MetricDefinitionImpl implements RatioMetric protected Metric nominatorMetric; /** - * The cached value of the '{@link #getDenominatorMetric() Denominator Metric}' - * reference. + * The cached value of the '{@link #getDenominatorMetric() Denominator + * Metric}' reference. * * @see #getDenominatorMetric() * @generated @@ -52,7 +52,6 @@ public class RatioMetricImpl extends MetricDefinitionImpl implements RatioMetric * @generated */ protected RatioMetricImpl() { - super(); } /** @@ -72,17 +71,15 @@ protected EClass eStaticClass() { */ @Override public Metric getNominatorMetric() { - if (this.nominatorMetric != null && this.nominatorMetric.eIsProxy()) { - final InternalEObject oldNominatorMetric = (InternalEObject) this.nominatorMetric; - this.nominatorMetric = (Metric) this.eResolveProxy(oldNominatorMetric); - if (this.nominatorMetric != oldNominatorMetric) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC, oldNominatorMetric, this.nominatorMetric)); - } + if ((nominatorMetric != null) && nominatorMetric.eIsProxy()) { + final InternalEObject oldNominatorMetric = (InternalEObject) nominatorMetric; + nominatorMetric = (Metric) eResolveProxy(oldNominatorMetric); + if ((nominatorMetric != oldNominatorMetric) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, + MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC, oldNominatorMetric, nominatorMetric)); } } - return this.nominatorMetric; + return nominatorMetric; } /** @@ -91,7 +88,7 @@ public Metric getNominatorMetric() { * @generated */ public Metric basicGetNominatorMetric() { - return this.nominatorMetric; + return nominatorMetric; } /** @@ -101,11 +98,11 @@ public Metric basicGetNominatorMetric() { */ @Override public void setNominatorMetric(final Metric newNominatorMetric) { - final Metric oldNominatorMetric = this.nominatorMetric; - this.nominatorMetric = newNominatorMetric; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC, - oldNominatorMetric, this.nominatorMetric)); + final Metric oldNominatorMetric = nominatorMetric; + nominatorMetric = newNominatorMetric; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC, + oldNominatorMetric, nominatorMetric)); } } @@ -116,18 +113,15 @@ public void setNominatorMetric(final Metric newNominatorMetric) { */ @Override public Metric getDenominatorMetric() { - if (this.denominatorMetric != null && this.denominatorMetric.eIsProxy()) { - final InternalEObject oldDenominatorMetric = (InternalEObject) this.denominatorMetric; - this.denominatorMetric = (Metric) this.eResolveProxy(oldDenominatorMetric); - if (this.denominatorMetric != oldDenominatorMetric) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC, oldDenominatorMetric, - this.denominatorMetric)); - } + if ((denominatorMetric != null) && denominatorMetric.eIsProxy()) { + final InternalEObject oldDenominatorMetric = (InternalEObject) denominatorMetric; + denominatorMetric = (Metric) eResolveProxy(oldDenominatorMetric); + if ((denominatorMetric != oldDenominatorMetric) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, + MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC, oldDenominatorMetric, denominatorMetric)); } } - return this.denominatorMetric; + return denominatorMetric; } /** @@ -136,7 +130,7 @@ public Metric getDenominatorMetric() { * @generated */ public Metric basicGetDenominatorMetric() { - return this.denominatorMetric; + return denominatorMetric; } /** @@ -146,11 +140,11 @@ public Metric basicGetDenominatorMetric() { */ @Override public void setDenominatorMetric(final Metric newDenominatorMetric) { - final Metric oldDenominatorMetric = this.denominatorMetric; - this.denominatorMetric = newDenominatorMetric; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, - MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC, oldDenominatorMetric, this.denominatorMetric)); + final Metric oldDenominatorMetric = denominatorMetric; + denominatorMetric = newDenominatorMetric; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC, + oldDenominatorMetric, denominatorMetric)); } } @@ -164,14 +158,14 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor switch (featureID) { case MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC: if (resolve) { - return this.getNominatorMetric(); + return getNominatorMetric(); } - return this.basicGetNominatorMetric(); + return basicGetNominatorMetric(); case MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC: if (resolve) { - return this.getDenominatorMetric(); + return getDenominatorMetric(); } - return this.basicGetDenominatorMetric(); + return basicGetDenominatorMetric(); } return super.eGet(featureID, resolve, coreType); } @@ -185,10 +179,10 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC: - this.setNominatorMetric((Metric) newValue); + setNominatorMetric((Metric) newValue); return; case MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC: - this.setDenominatorMetric((Metric) newValue); + setDenominatorMetric((Metric) newValue); return; } super.eSet(featureID, newValue); @@ -203,10 +197,10 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC: - this.setNominatorMetric((Metric) null); + setNominatorMetric((Metric) null); return; case MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC: - this.setDenominatorMetric((Metric) null); + setDenominatorMetric((Metric) null); return; } super.eUnset(featureID); @@ -221,9 +215,9 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.RATIO_METRIC__NOMINATOR_METRIC: - return this.nominatorMetric != null; + return nominatorMetric != null; case MetricDSLPackage.RATIO_METRIC__DENOMINATOR_METRIC: - return this.denominatorMetric != null; + return denominatorMetric != null; } return super.eIsSet(featureID); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/StepwiseMetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/StepwiseMetricImpl.java index 9be6839..c335b2a 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/StepwiseMetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/StepwiseMetricImpl.java @@ -18,14 +18,15 @@ import org.somox.metrics.dsl.metricDSL.StepwiseMetric; /** - * An implementation of the model object 'Stepwise Metric'. - * + * An implementation of the model object + * 'Stepwise Metric'. *

        * The following features are implemented: *

          *
        • {@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl#getInnerMetric * Inner Metric}
          • - *
        • {@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl#getSteps Steps}
          • + *
        • {@link org.somox.metrics.dsl.metricDSL.impl.StepwiseMetricImpl#getSteps + * Steps}
          • *
        *

        * @@ -33,8 +34,8 @@ */ public class StepwiseMetricImpl extends MetricDefinitionImpl implements StepwiseMetric { /** - * The cached value of the '{@link #getInnerMetric() Inner Metric}' reference. + * The cached value of the '{@link #getInnerMetric() Inner Metric}' + * reference. * * @see #getInnerMetric() * @generated @@ -43,8 +44,8 @@ public class StepwiseMetricImpl extends MetricDefinitionImpl implements Stepwise protected Metric innerMetric; /** - * The cached value of the '{@link #getSteps() Steps}' containment reference list. + * The cached value of the '{@link #getSteps() Steps}' containment + * reference list. * * @see #getSteps() * @generated @@ -58,7 +59,6 @@ public class StepwiseMetricImpl extends MetricDefinitionImpl implements Stepwise * @generated */ protected StepwiseMetricImpl() { - super(); } /** @@ -78,17 +78,15 @@ protected EClass eStaticClass() { */ @Override public Metric getInnerMetric() { - if (this.innerMetric != null && this.innerMetric.eIsProxy()) { - final InternalEObject oldInnerMetric = (InternalEObject) this.innerMetric; - this.innerMetric = (Metric) this.eResolveProxy(oldInnerMetric); - if (this.innerMetric != oldInnerMetric) { - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, - MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC, oldInnerMetric, this.innerMetric)); - } + if ((innerMetric != null) && innerMetric.eIsProxy()) { + final InternalEObject oldInnerMetric = (InternalEObject) innerMetric; + innerMetric = (Metric) eResolveProxy(oldInnerMetric); + if ((innerMetric != oldInnerMetric) && eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, + MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC, oldInnerMetric, innerMetric)); } } - return this.innerMetric; + return innerMetric; } /** @@ -97,7 +95,7 @@ public Metric getInnerMetric() { * @generated */ public Metric basicGetInnerMetric() { - return this.innerMetric; + return innerMetric; } /** @@ -107,11 +105,11 @@ public Metric basicGetInnerMetric() { */ @Override public void setInnerMetric(final Metric newInnerMetric) { - final Metric oldInnerMetric = this.innerMetric; - this.innerMetric = newInnerMetric; - if (this.eNotificationRequired()) { - this.eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC, - oldInnerMetric, this.innerMetric)); + final Metric oldInnerMetric = innerMetric; + innerMetric = newInnerMetric; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC, + oldInnerMetric, innerMetric)); } } @@ -122,11 +120,10 @@ public void setInnerMetric(final Metric newInnerMetric) { */ @Override public EList getSteps() { - if (this.steps == null) { - this.steps = new EObjectContainmentEList(BoundAndWeight.class, this, - MetricDSLPackage.STEPWISE_METRIC__STEPS); + if (steps == null) { + steps = new EObjectContainmentEList<>(BoundAndWeight.class, this, MetricDSLPackage.STEPWISE_METRIC__STEPS); } - return this.steps; + return steps; } /** @@ -139,7 +136,7 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in final NotificationChain msgs) { switch (featureID) { case MetricDSLPackage.STEPWISE_METRIC__STEPS: - return ((InternalEList) this.getSteps()).basicRemove(otherEnd, msgs); + return ((InternalEList) getSteps()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -154,11 +151,11 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor switch (featureID) { case MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC: if (resolve) { - return this.getInnerMetric(); + return getInnerMetric(); } - return this.basicGetInnerMetric(); + return basicGetInnerMetric(); case MetricDSLPackage.STEPWISE_METRIC__STEPS: - return this.getSteps(); + return getSteps(); } return super.eGet(featureID, resolve, coreType); } @@ -173,11 +170,11 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC: - this.setInnerMetric((Metric) newValue); + setInnerMetric((Metric) newValue); return; case MetricDSLPackage.STEPWISE_METRIC__STEPS: - this.getSteps().clear(); - this.getSteps().addAll((Collection) newValue); + getSteps().clear(); + getSteps().addAll((Collection) newValue); return; } super.eSet(featureID, newValue); @@ -192,10 +189,10 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC: - this.setInnerMetric((Metric) null); + setInnerMetric((Metric) null); return; case MetricDSLPackage.STEPWISE_METRIC__STEPS: - this.getSteps().clear(); + getSteps().clear(); return; } super.eUnset(featureID); @@ -210,9 +207,9 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.STEPWISE_METRIC__INNER_METRIC: - return this.innerMetric != null; + return innerMetric != null; case MetricDSLPackage.STEPWISE_METRIC__STEPS: - return this.steps != null && !this.steps.isEmpty(); + return (steps != null) && !steps.isEmpty(); } return super.eIsSet(featureID); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/WeightedMetricImpl.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/WeightedMetricImpl.java index 8985dbc..67f2bf8 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/WeightedMetricImpl.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/impl/WeightedMetricImpl.java @@ -15,13 +15,13 @@ import org.somox.metrics.dsl.metricDSL.WeightedMetric; /** - * An implementation of the model object 'Weighted Metric'. - * + * An implementation of the model object + * 'Weighted Metric'. *

        * The following features are implemented: *

          - *
        • {@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl#getWeights Weights} - *
          • + *
        • {@link org.somox.metrics.dsl.metricDSL.impl.WeightedMetricImpl#getWeights + * Weights}
          • *
        *

        * @@ -29,8 +29,8 @@ */ public class WeightedMetricImpl extends MetricDefinitionImpl implements WeightedMetric { /** - * The cached value of the '{@link #getWeights() Weights}' containment reference list. - * + * The cached value of the '{@link #getWeights() Weights}' containment + * reference list. * * @see #getWeights() * @generated @@ -44,7 +44,6 @@ public class WeightedMetricImpl extends MetricDefinitionImpl implements Weighted * @generated */ protected WeightedMetricImpl() { - super(); } /** @@ -64,11 +63,11 @@ protected EClass eStaticClass() { */ @Override public EList getWeights() { - if (this.weights == null) { - this.weights = new EObjectContainmentEList(MetricAndWeight.class, this, + if (weights == null) { + weights = new EObjectContainmentEList<>(MetricAndWeight.class, this, MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS); } - return this.weights; + return weights; } /** @@ -81,7 +80,7 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in final NotificationChain msgs) { switch (featureID) { case MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS: - return ((InternalEList) this.getWeights()).basicRemove(otherEnd, msgs); + return ((InternalEList) getWeights()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -95,7 +94,7 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { switch (featureID) { case MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS: - return this.getWeights(); + return getWeights(); } return super.eGet(featureID, resolve, coreType); } @@ -110,8 +109,8 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor public void eSet(final int featureID, final Object newValue) { switch (featureID) { case MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS: - this.getWeights().clear(); - this.getWeights().addAll((Collection) newValue); + getWeights().clear(); + getWeights().addAll((Collection) newValue); return; } super.eSet(featureID, newValue); @@ -126,7 +125,7 @@ public void eSet(final int featureID, final Object newValue) { public void eUnset(final int featureID) { switch (featureID) { case MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS: - this.getWeights().clear(); + getWeights().clear(); return; } super.eUnset(featureID); @@ -141,7 +140,7 @@ public void eUnset(final int featureID) { public boolean eIsSet(final int featureID) { switch (featureID) { case MetricDSLPackage.WEIGHTED_METRIC__WEIGHTS: - return this.weights != null && !this.weights.isEmpty(); + return (weights != null) && !weights.isEmpty(); } return super.eIsSet(featureID); } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLAdapterFactory.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLAdapterFactory.java index eed6e11..bb241a9 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLAdapterFactory.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLAdapterFactory.java @@ -21,8 +21,9 @@ import org.somox.metrics.dsl.metricDSL.WeightedMetric; /** - * The Adapter Factory for the model. It provides an adapter - * createXXX method for each class of the model. + * The Adapter Factory for the model. It provides + * an adapter createXXX method for each class of the model. * * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage * @generated @@ -36,7 +37,8 @@ public class MetricDSLAdapterFactory extends AdapterFactoryImpl { protected static MetricDSLPackage modelPackage; /** - * Creates an instance of the adapter factory. + * Creates an instance of the adapter factory. * * @generated */ @@ -47,9 +49,10 @@ public MetricDSLAdapterFactory() { } /** - * Returns whether this factory is applicable for the type of the object. This implementation returns true if the object is either the model's package - * or is an instance object of the model. + * Returns whether this factory is applicable for the type of the object. This implementation returns true if the + * object is either the model's package or is an instance object of the model. + * * * @return whether this factory is applicable for the type of the object. * @generated @@ -66,12 +69,12 @@ public boolean isFactoryForType(final Object object) { } /** - * The switch that delegates to the createXXX methods. + * The switch that delegates to the createXXX methods. * * @generated */ - protected MetricDSLSwitch modelSwitch = new MetricDSLSwitch() { + protected MetricDSLSwitch modelSwitch = new MetricDSLSwitch<>() { @Override public Adapter caseMetricModel(final MetricModel object) { return MetricDSLAdapterFactory.this.createMetricModelAdapter(); @@ -144,24 +147,24 @@ public Adapter defaultCase(final EObject object) { }; /** - * Creates an adapter for the target. + * Creates an adapter for the target. * - * @param target - * the object to adapt. + * @param target the object to adapt. * @return the adapter for the target. * @generated */ @Override public Adapter createAdapter(final Notifier target) { - return this.modelSwitch.doSwitch((EObject) target); + return modelSwitch.doSwitch((EObject) target); } /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.MetricModel Metric Model}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.MetricModel Metric Model}'. + * This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.MetricModel @@ -172,10 +175,11 @@ public Adapter createMetricModelAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.somox.metrics.dsl.metricDSL.Metric - * Metric}'. This default implementation returns null so that - * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the - * cases anyway. + * Creates a new adapter for an object of class + * '{@link org.somox.metrics.dsl.metricDSL.Metric Metric}'. This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.Metric @@ -187,10 +191,10 @@ public Adapter createMetricAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.ExternalMetric External Metric}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.ExternalMetric External + * Metric}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.ExternalMetric @@ -202,10 +206,10 @@ public Adapter createExternalMetricAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.InternalMetric Internal Metric}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.InternalMetric Internal + * Metric}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.InternalMetric @@ -216,10 +220,11 @@ public Adapter createInternalMetricAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.somox.metrics.dsl.metricDSL.Number - * Number}'. This default implementation returns null so that - * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the - * cases anyway. + * Creates a new adapter for an object of class + * '{@link org.somox.metrics.dsl.metricDSL.Number Number}'. This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.Number @@ -231,9 +236,10 @@ public Adapter createNumberAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.Parameter Parameter}'. This default implementation returns null so that we can easily ignore cases; it's useful - * to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.Parameter Parameter}'. This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.Parameter @@ -244,10 +250,11 @@ public Adapter createParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.somox.metrics.dsl.metricDSL.Constant - * Constant}'. This default implementation returns null so that - * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the - * cases anyway. + * Creates a new adapter for an object of class + * '{@link org.somox.metrics.dsl.metricDSL.Constant Constant}'. This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.Constant @@ -259,10 +266,10 @@ public Adapter createConstantAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.MetricDefinition Metric Definition}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.MetricDefinition Metric + * Definition}'. This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.MetricDefinition @@ -274,10 +281,10 @@ public Adapter createMetricDefinitionAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.WeightedMetric Weighted Metric}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.WeightedMetric Weighted + * Metric}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.WeightedMetric @@ -289,10 +296,10 @@ public Adapter createWeightedMetricAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric Stepwise Metric}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.StepwiseMetric Stepwise + * Metric}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.StepwiseMetric @@ -304,10 +311,10 @@ public Adapter createStepwiseMetricAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.RatioMetric Ratio Metric}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.RatioMetric Ratio Metric}'. + * This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.RatioMetric @@ -319,10 +326,10 @@ public Adapter createRatioMetricAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight Bound And Weight}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.BoundAndWeight Bound And + * Weight}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.BoundAndWeight @@ -334,10 +341,10 @@ public Adapter createBoundAndWeightAdapter() { /** * Creates a new adapter for an object of class ' - * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight Metric And Weight}'. This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * {@link org.somox.metrics.dsl.metricDSL.MetricAndWeight Metric And + * Weight}'. This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.somox.metrics.dsl.metricDSL.MetricAndWeight @@ -348,8 +355,8 @@ public Adapter createMetricAndWeightAdapter() { } /** - * Creates a new adapter for the default case. This default - * implementation returns null. + * Creates a new adapter for the default case. This + * default implementation returns null. * * @return the new adapter. * @generated diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLSwitch.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLSwitch.java index 9ed9d12..d85d32a 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLSwitch.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/metricDSL/util/MetricDSLSwitch.java @@ -20,11 +20,12 @@ import org.somox.metrics.dsl.metricDSL.WeightedMetric; /** - * The Switch for the model's inheritance hierarchy. It supports the - * call {@link #doSwitch(EObject) doSwitch(object)} to invoke the caseXXX method for - * each class of the model, starting with the actual class of the object and proceeding up the - * inheritance hierarchy until a non-null result is returned, which is the result of the switch. - * + * The Switch for the model's inheritance + * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object and proceeding up the + * inheritance hierarchy until a non-null result is returned, which is the + * result of the switch. * * @see org.somox.metrics.dsl.metricDSL.MetricDSLPackage * @generated @@ -38,7 +39,8 @@ public class MetricDSLSwitch extends Switch { protected static MetricDSLPackage modelPackage; /** - * Creates an instance of the switch. + * Creates an instance of the switch. * * @generated */ @@ -49,8 +51,8 @@ public MetricDSLSwitch() { } /** - * Checks whether this is a switch for the given package. + * Checks whether this is a switch for the given package. * * @parameter ePackage the package in question. * @return whether this is a switch for the given package. @@ -62,8 +64,9 @@ protected boolean isSwitchFor(final EPackage ePackage) { } /** - * Calls caseXXX for each class of the model until one returns a non null result; - * it yields that result. + * Calls caseXXX for each class of the model until one returns a + * non null result; it yields that result. * * @return the first non-null result returned by a caseXXX call. * @generated @@ -202,13 +205,13 @@ protected T doSwitch(final int classifierID, final EObject theEObject) { } /** - * Returns the result of interpreting the object as an instance of 'Metric Model'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Metric + * Model'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Metric Model'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Metric + * Model'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -217,13 +220,13 @@ public T caseMetricModel(final MetricModel object) { } /** - * Returns the result of interpreting the object as an instance of 'Metric'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of + * 'Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of + * 'Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -232,13 +235,13 @@ public T caseMetric(final Metric object) { } /** - * Returns the result of interpreting the object as an instance of 'External Metric'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'External + * Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'External Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'External + * Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -247,13 +250,13 @@ public T caseExternalMetric(final ExternalMetric object) { } /** - * Returns the result of interpreting the object as an instance of 'Internal Metric'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Internal + * Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Internal Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Internal + * Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -262,13 +265,13 @@ public T caseInternalMetric(final InternalMetric object) { } /** - * Returns the result of interpreting the object as an instance of 'Number'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of + * 'Number'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Number'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of + * 'Number'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -277,13 +280,14 @@ public T caseNumber(final org.somox.metrics.dsl.metricDSL.Number object) { } /** - * Returns the result of interpreting the object as an instance of 'Parameter'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of + * 'Parameter'. This implementation returns + * null; returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Parameter'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of + * 'Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -292,13 +296,14 @@ public T caseParameter(final Parameter object) { } /** - * Returns the result of interpreting the object as an instance of 'Constant'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of + * 'Constant'. This implementation returns + * null; returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Constant'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of + * 'Constant'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -307,13 +312,13 @@ public T caseConstant(final Constant object) { } /** - * Returns the result of interpreting the object as an instance of 'Metric Definition'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Metric + * Definition'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Metric Definition'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Metric + * Definition'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -322,13 +327,13 @@ public T caseMetricDefinition(final MetricDefinition object) { } /** - * Returns the result of interpreting the object as an instance of 'Weighted Metric'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Weighted + * Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Weighted Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Weighted + * Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -337,13 +342,13 @@ public T caseWeightedMetric(final WeightedMetric object) { } /** - * Returns the result of interpreting the object as an instance of 'Stepwise Metric'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Stepwise + * Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Stepwise Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Stepwise + * Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -352,13 +357,13 @@ public T caseStepwiseMetric(final StepwiseMetric object) { } /** - * Returns the result of interpreting the object as an instance of 'Ratio Metric'. This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Ratio + * Metric'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Ratio Metric'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Ratio + * Metric'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -367,13 +372,13 @@ public T caseRatioMetric(final RatioMetric object) { } /** - * Returns the result of interpreting the object as an instance of 'Bound And Weight'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Bound + * And Weight'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Bound And Weight'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Bound + * And Weight'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -382,13 +387,13 @@ public T caseBoundAndWeight(final BoundAndWeight object) { } /** - * Returns the result of interpreting the object as an instance of 'Metric And Weight'. - * This implementation returns null; returning a non-null result will - * terminate the switch. + * Returns the result of interpreting the object as an instance of 'Metric + * And Weight'. This implementation returns null; + * returning a non-null result will terminate the switch. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'Metric And Weight'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Metric + * And Weight'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ @@ -397,13 +402,14 @@ public T caseMetricAndWeight(final MetricAndWeight object) { } /** - * Returns the result of interpreting the object as an instance of 'EObject'. This implementation returns null; returning a non-null result will - * terminate the switch, but this is the last case anyway. + * Returns the result of interpreting the object as an instance of + * 'EObject'. This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last + * case anyway. * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of 'EObject'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of + * 'EObject'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/MetricDSLParser.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/MetricDSLParser.java index 4fc1c2d..3c46dfe 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/MetricDSLParser.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/MetricDSLParser.java @@ -21,7 +21,7 @@ protected void setInitialHiddenTokens(final XtextTokenStream tokenStream) { @Override protected org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLParser createParser( final XtextTokenStream stream) { - return new org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLParser(stream, this.getGrammarAccess()); + return new org.somox.metrics.dsl.parser.antlr.internal.InternalMetricDSLParser(stream, getGrammarAccess()); } @Override @@ -30,7 +30,7 @@ protected String getDefaultRuleName() { } public MetricDSLGrammarAccess getGrammarAccess() { - return this.grammarAccess; + return grammarAccess; } public void setGrammarAccess(final MetricDSLGrammarAccess grammarAccess) { diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLLexer.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLLexer.java index a12b451..272f63f 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLLexer.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLLexer.java @@ -53,7 +53,7 @@ public class InternalMetricDSLLexer extends Lexer { // delegators public InternalMetricDSLLexer() { - ; + } public InternalMetricDSLLexer(final CharStream input) { @@ -84,8 +84,8 @@ public final void mT__12() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -105,8 +105,8 @@ public final void mT__13() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -126,8 +126,8 @@ public final void mT__14() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -147,8 +147,8 @@ public final void mT__15() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -168,8 +168,8 @@ public final void mT__16() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -189,8 +189,8 @@ public final void mT__17() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -210,8 +210,8 @@ public final void mT__18() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -231,8 +231,8 @@ public final void mT__19() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -252,8 +252,8 @@ public final void mT__20() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -273,8 +273,8 @@ public final void mT__21() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -294,8 +294,8 @@ public final void mT__22() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -315,8 +315,8 @@ public final void mT__23() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -336,8 +336,8 @@ public final void mT__24() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -357,8 +357,8 @@ public final void mT__25() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -378,8 +378,8 @@ public final void mT__26() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -399,8 +399,8 @@ public final void mT__27() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -420,8 +420,8 @@ public final void mT__28() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -441,8 +441,8 @@ public final void mT__29() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -462,8 +462,8 @@ public final void mT__30() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -483,8 +483,8 @@ public final void mT__31() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -504,8 +504,8 @@ public final void mT__32() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -525,8 +525,8 @@ public final void mT__33() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -546,8 +546,8 @@ public final void mT__34() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -567,8 +567,8 @@ public final void mT__35() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -587,7 +587,7 @@ public final void mRULE_DOUBLE() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:992:15: // ( '-' )? int alt1 = 2; - final int LA1_0 = this.input.LA(1); + final int LA1_0 = input.LA(1); if ((LA1_0 == '-')) { alt1 = 1; @@ -604,14 +604,14 @@ public final void mRULE_DOUBLE() throws RecognitionException { } - this.mRULE_INT(); + mRULE_INT(); this.match('.'); - this.mRULE_INT(); + mRULE_INT(); } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -623,16 +623,18 @@ public final void mRULE_ID() throws RecognitionException { final int _type = RULE_ID; final int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:994:9: - // ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. + // ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' + // | '0' .. // '9' )* ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:994:11: - // ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. + // ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | + // '0' .. // '9' )* { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:994:11: // ( '^' )? int alt2 = 2; - final int LA2_0 = this.input.LA(1); + final int LA2_0 = input.LA(1); if ((LA2_0 == '^')) { alt2 = 1; @@ -649,24 +651,22 @@ public final void mRULE_ID() throws RecognitionException { } - if ((this.input.LA(1) >= 'A' && this.input.LA(1) <= 'Z') || this.input.LA(1) == '_' - || (this.input.LA(1) >= 'a' && this.input.LA(1) <= 'z')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < 'A') || (input.LA(1) > 'Z')) && (input.LA(1) != '_') + && ((input.LA(1) < 'a') || (input.LA(1) > 'z'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:994:40: // ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop3: do { int alt3 = 2; - final int LA3_0 = this.input.LA(1); + final int LA3_0 = input.LA(1); - if (((LA3_0 >= '0' && LA3_0 <= '9') || (LA3_0 >= 'A' && LA3_0 <= 'Z') || LA3_0 == '_' - || (LA3_0 >= 'a' && LA3_0 <= 'z'))) { + if ((((LA3_0 >= '0') && (LA3_0 <= '9')) || ((LA3_0 >= 'A') && (LA3_0 <= 'Z')) || (LA3_0 == '_') + || ((LA3_0 >= 'a') && (LA3_0 <= 'z')))) { alt3 = 1; } @@ -674,16 +674,13 @@ public final void mRULE_ID() throws RecognitionException { case 1: // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g: { - if ((this.input.LA(1) >= '0' && this.input.LA(1) <= '9') - || (this.input.LA(1) >= 'A' && this.input.LA(1) <= 'Z') || this.input.LA(1) == '_' - || (this.input.LA(1) >= 'a' && this.input.LA(1) <= 'z')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '0') || (input.LA(1) > '9')) && ((input.LA(1) < 'A') || (input.LA(1) > 'Z')) + && (input.LA(1) != '_') && ((input.LA(1) < 'a') || (input.LA(1) > 'z'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -695,8 +692,8 @@ public final void mRULE_ID() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -717,9 +714,9 @@ public final void mRULE_INT() throws RecognitionException { int cnt4 = 0; loop4: do { int alt4 = 2; - final int LA4_0 = this.input.LA(1); + final int LA4_0 = input.LA(1); - if (((LA4_0 >= '0' && LA4_0 <= '9'))) { + if ((((LA4_0 >= '0') && (LA4_0 <= '9')))) { alt4 = 1; } @@ -728,7 +725,7 @@ public final void mRULE_INT() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:996:13: // '0' .. '9' { - this.matchRange('0', '9'); + matchRange('0', '9'); } break; @@ -737,7 +734,7 @@ public final void mRULE_INT() throws RecognitionException { if (cnt4 >= 1) { break loop4; } - final EarlyExitException eee = new EarlyExitException(4, this.input); + final EarlyExitException eee = new EarlyExitException(4, input); throw eee; } cnt4++; @@ -745,8 +742,8 @@ public final void mRULE_INT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -758,34 +755,41 @@ public final void mRULE_STRING() throws RecognitionException { final int _type = RULE_STRING; final int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:13: - // ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( - // ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | + // ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' + // ) | ~ ( + // ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // 'u' | // '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:15: - // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( - // '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' + // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ ( ( + // '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // 'u' | '\"' // | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:15: - // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ - // ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | + // ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ + // ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' + // | // 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt7 = 2; - final int LA7_0 = this.input.LA(1); + final int LA7_0 = input.LA(1); if ((LA7_0 == '\"')) { alt7 = 1; } else if ((LA7_0 == '\'')) { alt7 = 2; } else { - final NoViableAltException nvae = new NoViableAltException("", 7, 0, this.input); + final NoViableAltException nvae = new NoViableAltException("", 7, 0, input); throw nvae; } switch (alt7) { case 1: // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:16: - // '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( + // '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | + // ~ ( // ( '\\\\' | '\"' ) ) )* '\"' { this.match('\"'); @@ -794,12 +798,12 @@ public final void mRULE_STRING() throws RecognitionException { // ( '\\\\' | '\"' ) ) )* loop5: do { int alt5 = 3; - final int LA5_0 = this.input.LA(1); + final int LA5_0 = input.LA(1); if ((LA5_0 == '\\')) { alt5 = 1; - } else if (((LA5_0 >= '\u0000' && LA5_0 <= '!') || (LA5_0 >= '#' && LA5_0 <= '[') - || (LA5_0 >= ']' && LA5_0 <= '\uFFFF'))) { + } else if ((((LA5_0 >= '\u0000') && (LA5_0 <= '!')) || ((LA5_0 >= '#') && (LA5_0 <= '[')) + || ((LA5_0 >= ']') && (LA5_0 <= '\uFFFF')))) { alt5 = 2; } @@ -809,17 +813,14 @@ public final void mRULE_STRING() throws RecognitionException { // '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { this.match('\\'); - if (this.input.LA(1) == '\"' || this.input.LA(1) == '\'' || this.input.LA(1) == '\\' - || this.input.LA(1) == 'b' || this.input.LA(1) == 'f' || this.input.LA(1) == 'n' - || this.input.LA(1) == 'r' - || (this.input.LA(1) >= 't' && this.input.LA(1) <= 'u')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if ((input.LA(1) != '\"') && (input.LA(1) != '\'') && (input.LA(1) != '\\') + && (input.LA(1) != 'b') && (input.LA(1) != 'f') && (input.LA(1) != 'n') + && (input.LA(1) != 'r') && ((input.LA(1) < 't') || (input.LA(1) > 'u'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -827,16 +828,14 @@ public final void mRULE_STRING() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:66: // ~ ( ( '\\\\' | '\"' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '!') - || (this.input.LA(1) >= '#' && this.input.LA(1) <= '[') - || (this.input.LA(1) >= ']' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '!')) + && ((input.LA(1) < '#') || (input.LA(1) > '[')) + && ((input.LA(1) < ']') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -852,7 +851,8 @@ public final void mRULE_STRING() throws RecognitionException { break; case 2: // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:86: - // '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ + // '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // | ~ // ( ( '\\\\' | '\\'' ) ) )* '\\'' { this.match('\''); @@ -861,12 +861,12 @@ public final void mRULE_STRING() throws RecognitionException { // ( '\\\\' | '\\'' ) ) )* loop6: do { int alt6 = 3; - final int LA6_0 = this.input.LA(1); + final int LA6_0 = input.LA(1); if ((LA6_0 == '\\')) { alt6 = 1; - } else if (((LA6_0 >= '\u0000' && LA6_0 <= '&') || (LA6_0 >= '(' && LA6_0 <= '[') - || (LA6_0 >= ']' && LA6_0 <= '\uFFFF'))) { + } else if ((((LA6_0 >= '\u0000') && (LA6_0 <= '&')) || ((LA6_0 >= '(') && (LA6_0 <= '[')) + || ((LA6_0 >= ']') && (LA6_0 <= '\uFFFF')))) { alt6 = 2; } @@ -876,17 +876,14 @@ public final void mRULE_STRING() throws RecognitionException { // '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { this.match('\\'); - if (this.input.LA(1) == '\"' || this.input.LA(1) == '\'' || this.input.LA(1) == '\\' - || this.input.LA(1) == 'b' || this.input.LA(1) == 'f' || this.input.LA(1) == 'n' - || this.input.LA(1) == 'r' - || (this.input.LA(1) >= 't' && this.input.LA(1) <= 'u')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if ((input.LA(1) != '\"') && (input.LA(1) != '\'') && (input.LA(1) != '\\') + && (input.LA(1) != 'b') && (input.LA(1) != 'f') && (input.LA(1) != 'n') + && (input.LA(1) != 'r') && ((input.LA(1) < 't') || (input.LA(1) > 'u'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -894,16 +891,14 @@ public final void mRULE_STRING() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:998:137: // ~ ( ( '\\\\' | '\\'' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '&') - || (this.input.LA(1) >= '(' && this.input.LA(1) <= '[') - || (this.input.LA(1) >= ']' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '&')) + && ((input.LA(1) < '(') || (input.LA(1) > '[')) + && ((input.LA(1) < ']') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -922,8 +917,8 @@ public final void mRULE_STRING() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -945,18 +940,19 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { // ( options {greedy=false; } : . )* loop8: do { int alt8 = 2; - final int LA8_0 = this.input.LA(1); + final int LA8_0 = input.LA(1); if ((LA8_0 == '*')) { - final int LA8_1 = this.input.LA(2); + final int LA8_1 = input.LA(2); if ((LA8_1 == '/')) { alt8 = 2; - } else if (((LA8_1 >= '\u0000' && LA8_1 <= '.') || (LA8_1 >= '0' && LA8_1 <= '\uFFFF'))) { + } else if ((((LA8_1 >= '\u0000') && (LA8_1 <= '.')) + || ((LA8_1 >= '0') && (LA8_1 <= '\uFFFF')))) { alt8 = 1; } - } else if (((LA8_0 >= '\u0000' && LA8_0 <= ')') || (LA8_0 >= '+' && LA8_0 <= '\uFFFF'))) { + } else if ((((LA8_0 >= '\u0000') && (LA8_0 <= ')')) || ((LA8_0 >= '+') && (LA8_0 <= '\uFFFF')))) { alt8 = 1; } @@ -979,8 +975,8 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1002,10 +998,10 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // (~ ( ( '\\n' | '\\r' ) ) )* loop9: do { int alt9 = 2; - final int LA9_0 = this.input.LA(1); + final int LA9_0 = input.LA(1); - if (((LA9_0 >= '\u0000' && LA9_0 <= '\t') || (LA9_0 >= '\u000B' && LA9_0 <= '\f') - || (LA9_0 >= '\u000E' && LA9_0 <= '\uFFFF'))) { + if ((((LA9_0 >= '\u0000') && (LA9_0 <= '\t')) || ((LA9_0 >= '\u000B') && (LA9_0 <= '\f')) + || ((LA9_0 >= '\u000E') && (LA9_0 <= '\uFFFF')))) { alt9 = 1; } @@ -1014,16 +1010,14 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1002:24: // ~ ( ( '\\n' | '\\r' ) ) { - if ((this.input.LA(1) >= '\u0000' && this.input.LA(1) <= '\t') - || (this.input.LA(1) >= '\u000B' && this.input.LA(1) <= '\f') - || (this.input.LA(1) >= '\u000E' && this.input.LA(1) <= '\uFFFF')) { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\u0000') || (input.LA(1) > '\t')) + && ((input.LA(1) < '\u000B') || (input.LA(1) > '\f')) + && ((input.LA(1) < '\u000E') || (input.LA(1) > '\uFFFF'))) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -1036,9 +1030,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1002:40: // ( ( '\\r' )? '\\n' )? int alt11 = 2; - final int LA11_0 = this.input.LA(1); + final int LA11_0 = input.LA(1); - if ((LA11_0 == '\n' || LA11_0 == '\r')) { + if (((LA11_0 == '\n') || (LA11_0 == '\r'))) { alt11 = 1; } switch (alt11) { @@ -1049,7 +1043,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1002:41: // ( '\\r' )? int alt10 = 2; - final int LA10_0 = this.input.LA(1); + final int LA10_0 = input.LA(1); if ((LA10_0 == '\r')) { alt10 = 1; @@ -1075,8 +1069,8 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1097,9 +1091,9 @@ public final void mRULE_WS() throws RecognitionException { int cnt12 = 0; loop12: do { int alt12 = 2; - final int LA12_0 = this.input.LA(1); + final int LA12_0 = input.LA(1); - if (((LA12_0 >= '\t' && LA12_0 <= '\n') || LA12_0 == '\r' || LA12_0 == ' ')) { + if ((((LA12_0 >= '\t') && (LA12_0 <= '\n')) || (LA12_0 == '\r') || (LA12_0 == ' '))) { alt12 = 1; } @@ -1107,15 +1101,13 @@ public final void mRULE_WS() throws RecognitionException { case 1: // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g: { - if ((this.input.LA(1) >= '\t' && this.input.LA(1) <= '\n') || this.input.LA(1) == '\r' - || this.input.LA(1) == ' ') { - this.input.consume(); - - } else { - final MismatchedSetException mse = new MismatchedSetException(null, this.input); + if (((input.LA(1) < '\t') || (input.LA(1) > '\n')) && (input.LA(1) != '\r') + && (input.LA(1) != ' ')) { + final MismatchedSetException mse = new MismatchedSetException(null, input); this.recover(mse); throw mse; } + input.consume(); } break; @@ -1124,7 +1116,7 @@ public final void mRULE_WS() throws RecognitionException { if (cnt12 >= 1) { break loop12; } - final EarlyExitException eee = new EarlyExitException(12, this.input); + final EarlyExitException eee = new EarlyExitException(12, input); throw eee; } cnt12++; @@ -1132,8 +1124,8 @@ public final void mRULE_WS() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1153,8 +1145,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { } - this.state.type = _type; - this.state.channel = _channel; + state.type = _type; + state.channel = _channel; } finally { } } @@ -1162,19 +1154,13 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { @Override public void mTokens() throws RecognitionException { - // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:8: - // ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | - // T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | - // T__34 | T__35 | RULE_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | - // RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt13 = 32; - alt13 = this.dfa13.predict(this.input); + final int alt13 = dfa13.predict(input); switch (alt13) { case 1: // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:10: // T__12 { - this.mT__12(); + mT__12(); } break; @@ -1182,7 +1168,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:16: // T__13 { - this.mT__13(); + mT__13(); } break; @@ -1190,7 +1176,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:22: // T__14 { - this.mT__14(); + mT__14(); } break; @@ -1198,7 +1184,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:28: // T__15 { - this.mT__15(); + mT__15(); } break; @@ -1206,7 +1192,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:34: // T__16 { - this.mT__16(); + mT__16(); } break; @@ -1214,7 +1200,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:40: // T__17 { - this.mT__17(); + mT__17(); } break; @@ -1222,7 +1208,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:46: // T__18 { - this.mT__18(); + mT__18(); } break; @@ -1230,7 +1216,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:52: // T__19 { - this.mT__19(); + mT__19(); } break; @@ -1238,7 +1224,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:58: // T__20 { - this.mT__20(); + mT__20(); } break; @@ -1246,7 +1232,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:64: // T__21 { - this.mT__21(); + mT__21(); } break; @@ -1254,7 +1240,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:70: // T__22 { - this.mT__22(); + mT__22(); } break; @@ -1262,7 +1248,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:76: // T__23 { - this.mT__23(); + mT__23(); } break; @@ -1270,7 +1256,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:82: // T__24 { - this.mT__24(); + mT__24(); } break; @@ -1278,7 +1264,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:88: // T__25 { - this.mT__25(); + mT__25(); } break; @@ -1286,7 +1272,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:94: // T__26 { - this.mT__26(); + mT__26(); } break; @@ -1294,7 +1280,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:100: // T__27 { - this.mT__27(); + mT__27(); } break; @@ -1302,7 +1288,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:106: // T__28 { - this.mT__28(); + mT__28(); } break; @@ -1310,7 +1296,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:112: // T__29 { - this.mT__29(); + mT__29(); } break; @@ -1318,7 +1304,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:118: // T__30 { - this.mT__30(); + mT__30(); } break; @@ -1326,7 +1312,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:124: // T__31 { - this.mT__31(); + mT__31(); } break; @@ -1334,7 +1320,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:130: // T__32 { - this.mT__32(); + mT__32(); } break; @@ -1342,7 +1328,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:136: // T__33 { - this.mT__33(); + mT__33(); } break; @@ -1350,7 +1336,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:142: // T__34 { - this.mT__34(); + mT__34(); } break; @@ -1358,7 +1344,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:148: // T__35 { - this.mT__35(); + mT__35(); } break; @@ -1366,7 +1352,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:154: // RULE_DOUBLE { - this.mRULE_DOUBLE(); + mRULE_DOUBLE(); } break; @@ -1374,7 +1360,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:166: // RULE_ID { - this.mRULE_ID(); + mRULE_ID(); } break; @@ -1382,7 +1368,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:174: // RULE_INT { - this.mRULE_INT(); + mRULE_INT(); } break; @@ -1390,7 +1376,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:183: // RULE_STRING { - this.mRULE_STRING(); + mRULE_STRING(); } break; @@ -1398,7 +1384,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:195: // RULE_ML_COMMENT { - this.mRULE_ML_COMMENT(); + mRULE_ML_COMMENT(); } break; @@ -1406,7 +1392,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:211: // RULE_SL_COMMENT { - this.mRULE_SL_COMMENT(); + mRULE_SL_COMMENT(); } break; @@ -1414,7 +1400,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:227: // RULE_WS { - this.mRULE_WS(); + mRULE_WS(); } break; @@ -1422,7 +1408,7 @@ public void mTokens() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:1:235: // RULE_ANY_OTHER { - this.mRULE_ANY_OTHER(); + mRULE_ANY_OTHER(); } break; @@ -1432,35 +1418,42 @@ public void mTokens() throws RecognitionException { } protected DFA13 dfa13 = new DFA13(this); - static final String DFA13_eotS = "\1\uffff\1\40\1\uffff\2\40\1\uffff\1\46\3\uffff\3\40\1\uffff\2\40" - + "\2\uffff\1\40\1\65\3\uffff\1\36\1\72\1\36\1\uffff\2\36\2\uffff\1" - + "\40\2\uffff\2\40\6\uffff\3\40\1\uffff\2\40\2\uffff\1\40\10\uffff" - + "\1\72\2\uffff\27\40\1\136\2\40\1\141\1\142\1\143\1\145\2\40\1\uffff" - + "\2\40\3\uffff\1\152\1\uffff\4\40\1\uffff\3\40\1\162\1\40\1\164\1" - + "\40\1\uffff\1\166\1\uffff\1\40\1\uffff\1\170\1\uffff"; + static final String DFA13_eotS = """ + \1\uffff\1\40\1\uffff\2\40\1\uffff\1\46\3\uffff\3\40\1\uffff\2\40\ + \2\uffff\1\40\1\65\3\uffff\1\36\1\72\1\36\1\uffff\2\36\2\uffff\1\ + \40\2\uffff\2\40\6\uffff\3\40\1\uffff\2\40\2\uffff\1\40\10\uffff\ + \1\72\2\uffff\27\40\1\136\2\40\1\141\1\142\1\143\1\145\2\40\1\uffff\ + \2\40\3\uffff\1\152\1\uffff\4\40\1\uffff\3\40\1\162\1\40\1\164\1\ + \40\1\uffff\1\166\1\uffff\1\40\1\uffff\1\170\1\uffff"""; static final String DFA13_eofS = "\171\uffff"; - static final String DFA13_minS = "\1\0\1\155\1\uffff\1\170\1\145\1\uffff\1\73\3\uffff\2\141\1\157" - + "\1\uffff\1\145\1\164\2\uffff\1\141\1\52\3\uffff\1\60\1\56\1\101" - + "\1\uffff\2\0\2\uffff\1\160\2\uffff\2\164\6\uffff\2\162\1\156\1\uffff" - + "\1\151\1\145\2\uffff\1\164\10\uffff\1\56\2\uffff\1\157\1\145\1\162" - + "\2\141\1\163\1\147\1\160\1\151\2\162\1\151\2\155\2\164\1\167\1\157" - + "\1\164\1\156\1\143\2\145\1\60\1\150\1\151\4\60\2\164\1\uffff\1\145" - + "\1\163\3\uffff\1\60\1\uffff\2\145\1\144\1\145\1\uffff\2\162\1\123" - + "\1\60\1\163\1\60\1\165\1\uffff\1\60\1\uffff\1\155\1\uffff\1\60\1" + "\uffff"; - static final String DFA13_maxS = "\1\uffff\1\155\1\uffff\1\170\1\145\1\uffff\1\73\3\uffff\2\141\1" - + "\157\1\uffff\1\145\1\164\2\uffff\1\141\1\57\3\uffff\2\71\1\172\1" - + "\uffff\2\uffff\2\uffff\1\160\2\uffff\2\164\6\uffff\2\162\1\156\1" - + "\uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\71\2\uffff\1\157\1\145" - + "\1\162\2\141\1\163\1\147\1\160\1\151\2\162\1\151\2\155\2\164\1\167" - + "\1\157\1\164\1\156\1\143\2\145\1\172\1\150\1\151\4\172\2\164\1\uffff" - + "\1\145\1\163\3\uffff\1\172\1\uffff\2\145\1\144\1\145\1\uffff\2\162" - + "\1\123\1\172\1\163\1\172\1\165\1\uffff\1\172\1\uffff\1\155\1\uffff" + "\1\172\1\uffff"; - static final String DFA13_acceptS = "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\1\11\1\12\3\uffff\1\17\2\uffff" - + "\1\22\1\23\2\uffff\1\26\1\27\1\30\3\uffff\1\32\2\uffff\1\37\1\40" - + "\1\uffff\1\32\1\2\2\uffff\1\5\1\14\1\6\1\10\1\11\1\12\3\uffff\1" - + "\17\2\uffff\1\22\1\23\1\uffff\1\35\1\36\1\25\1\26\1\27\1\30\1\31" - + "\1\33\1\uffff\1\34\1\37\40\uffff\1\16\2\uffff\1\24\1\1\1\3\1\uffff" - + "\1\7\4\uffff\1\4\7\uffff\1\21\1\uffff\1\15\1\uffff\1\13\1\uffff" + "\1\20"; + static final String DFA13_minS = """ + \1\0\1\155\1\uffff\1\170\1\145\1\uffff\1\73\3\uffff\2\141\1\157\ + \1\uffff\1\145\1\164\2\uffff\1\141\1\52\3\uffff\1\60\1\56\1\101\ + \1\uffff\2\0\2\uffff\1\160\2\uffff\2\164\6\uffff\2\162\1\156\1\uffff\ + \1\151\1\145\2\uffff\1\164\10\uffff\1\56\2\uffff\1\157\1\145\1\162\ + \2\141\1\163\1\147\1\160\1\151\2\162\1\151\2\155\2\164\1\167\1\157\ + \1\164\1\156\1\143\2\145\1\60\1\150\1\151\4\60\2\164\1\uffff\1\145\ + \1\163\3\uffff\1\60\1\uffff\2\145\1\144\1\145\1\uffff\2\162\1\123\ + \1\60\1\163\1\60\1\165\1\uffff\1\60\1\uffff\1\155\1\uffff\1\60\1\ + \uffff"""; + static final String DFA13_maxS = """ + \1\uffff\1\155\1\uffff\1\170\1\145\1\uffff\1\73\3\uffff\2\141\1\ + \157\1\uffff\1\145\1\164\2\uffff\1\141\1\57\3\uffff\2\71\1\172\1\ + \uffff\2\uffff\2\uffff\1\160\2\uffff\2\164\6\uffff\2\162\1\156\1\ + \uffff\1\151\1\145\2\uffff\1\164\10\uffff\1\71\2\uffff\1\157\1\145\ + \1\162\2\141\1\163\1\147\1\160\1\151\2\162\1\151\2\155\2\164\1\167\ + \1\157\1\164\1\156\1\143\2\145\1\172\1\150\1\151\4\172\2\164\1\uffff\ + \1\145\1\163\3\uffff\1\172\1\uffff\2\145\1\144\1\145\1\uffff\2\162\ + \1\123\1\172\1\163\1\172\1\165\1\uffff\1\172\1\uffff\1\155\1\uffff\ + \1\172\1\uffff"""; + static final String DFA13_acceptS = """ + \2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\1\11\1\12\3\uffff\1\17\2\uffff\ + \1\22\1\23\2\uffff\1\26\1\27\1\30\3\uffff\1\32\2\uffff\1\37\1\40\ + \1\uffff\1\32\1\2\2\uffff\1\5\1\14\1\6\1\10\1\11\1\12\3\uffff\1\ + \17\2\uffff\1\22\1\23\1\uffff\1\35\1\36\1\25\1\26\1\27\1\30\1\31\ + \1\33\1\uffff\1\34\1\37\40\uffff\1\16\2\uffff\1\24\1\1\1\3\1\uffff\ + \1\7\4\uffff\1\4\7\uffff\1\21\1\uffff\1\15\1\uffff\1\13\1\uffff\ + \1\20"""; static final String DFA13_specialS = "\1\2\32\uffff\1\0\1\1\134\uffff}>"; static final String[] DFA13_transitionS = { "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\33\4\36\1\34\1\7\1\11" @@ -1504,14 +1497,14 @@ class DFA13 extends DFA { public DFA13(final BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 13; - this.eot = DFA13_eot; - this.eof = DFA13_eof; - this.min = DFA13_min; - this.max = DFA13_max; - this.accept = DFA13_accept; - this.special = DFA13_special; - this.transition = DFA13_transition; + decisionNumber = 13; + eot = DFA13_eot; + eof = DFA13_eof; + min = DFA13_min; + max = DFA13_max; + accept = DFA13_accept; + special = DFA13_special; + transition = DFA13_transition; } @Override @@ -1528,7 +1521,7 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_27 = input.LA(1); s = -1; - if (((LA13_27 >= '\u0000' && LA13_27 <= '\uFFFF'))) { + if ((((LA13_27 >= '\u0000') && (LA13_27 <= '\uFFFF')))) { s = 60; } else { s = 30; @@ -1542,7 +1535,7 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_28 = input.LA(1); s = -1; - if (((LA13_28 >= '\u0000' && LA13_28 <= '\uFFFF'))) { + if ((((LA13_28 >= '\u0000') && (LA13_28 <= '\uFFFF')))) { s = 60; } else { s = 30; @@ -1556,132 +1549,114 @@ public int specialStateTransition(int s, final IntStream _input) throws NoViable final int LA13_0 = input.LA(1); s = -1; - if ((LA13_0 == 'i')) { + switch (LA13_0) { + case 'i': s = 1; - } - - else if ((LA13_0 == ';')) { + break; + case ';': s = 2; - } - - else if ((LA13_0 == 'e')) { + break; + case 'e': s = 3; - } - - else if ((LA13_0 == 'M')) { + break; + case 'M': s = 4; - } - - else if ((LA13_0 == '{')) { + break; + case '{': s = 5; - } - - else if ((LA13_0 == '}')) { + break; + case '}': s = 6; - } - - else if ((LA13_0 == '(')) { + break; + case '(': s = 7; - } - - else if ((LA13_0 == ',')) { + break; + case ',': s = 8; - } - - else if ((LA13_0 == ')')) { + break; + case ')': s = 9; - } - - else if ((LA13_0 == 'p')) { + break; + case 'p': s = 10; - } - - else if ((LA13_0 == 'P')) { + break; + case 'P': s = 11; - } - - else if ((LA13_0 == 'C')) { + break; + case 'C': s = 12; - } - - else if ((LA13_0 == '=')) { + break; + case '=': s = 13; - } - - else if ((LA13_0 == 'W')) { + break; + case 'W': s = 14; - } - - else if ((LA13_0 == 'S')) { + break; + case 'S': s = 15; - } - - else if ((LA13_0 == '[')) { + break; + case '[': s = 16; - } - - else if ((LA13_0 == ']')) { + break; + case ']': s = 17; - } - - else if ((LA13_0 == 'R')) { + break; + case 'R': s = 18; - } - - else if ((LA13_0 == '/')) { + break; + case '/': s = 19; - } - - else if ((LA13_0 == '<')) { + break; + case '<': s = 20; - } - - else if ((LA13_0 == '>')) { + break; + case '>': s = 21; - } - - else if ((LA13_0 == '.')) { + break; + case '.': s = 22; - } - - else if ((LA13_0 == '-')) { + break; + case '-': s = 23; - } - - else if (((LA13_0 >= '0' && LA13_0 <= '9'))) { - s = 24; - } + break; + default: + if ((((LA13_0 >= '0') && (LA13_0 <= '9')))) { + s = 24; + } - else if ((LA13_0 == '^')) { - s = 25; - } + else if ((LA13_0 == '^')) { + s = 25; + } - else if (((LA13_0 >= 'A' && LA13_0 <= 'B') || (LA13_0 >= 'D' && LA13_0 <= 'L') - || (LA13_0 >= 'N' && LA13_0 <= 'O') || LA13_0 == 'Q' || (LA13_0 >= 'T' && LA13_0 <= 'V') - || (LA13_0 >= 'X' && LA13_0 <= 'Z') || LA13_0 == '_' || (LA13_0 >= 'a' && LA13_0 <= 'd') - || (LA13_0 >= 'f' && LA13_0 <= 'h') || (LA13_0 >= 'j' && LA13_0 <= 'o') - || (LA13_0 >= 'q' && LA13_0 <= 'z'))) { - s = 26; - } + else if ((((LA13_0 >= 'A') && (LA13_0 <= 'B')) || ((LA13_0 >= 'D') && (LA13_0 <= 'L')) + || ((LA13_0 >= 'N') && (LA13_0 <= 'O')) || (LA13_0 == 'Q') + || ((LA13_0 >= 'T') && (LA13_0 <= 'V')) || ((LA13_0 >= 'X') && (LA13_0 <= 'Z')) + || (LA13_0 == '_') || ((LA13_0 >= 'a') && (LA13_0 <= 'd')) + || ((LA13_0 >= 'f') && (LA13_0 <= 'h')) || ((LA13_0 >= 'j') && (LA13_0 <= 'o')) + || ((LA13_0 >= 'q') && (LA13_0 <= 'z')))) { + s = 26; + } - else if ((LA13_0 == '\"')) { - s = 27; - } + else if ((LA13_0 == '\"')) { + s = 27; + } - else if ((LA13_0 == '\'')) { - s = 28; - } + else if ((LA13_0 == '\'')) { + s = 28; + } - else if (((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) { - s = 29; - } + else if ((((LA13_0 >= '\t') && (LA13_0 <= '\n')) || (LA13_0 == '\r') || (LA13_0 == ' '))) { + s = 29; + } - else if (((LA13_0 >= '\u0000' && LA13_0 <= '\b') || (LA13_0 >= '\u000B' && LA13_0 <= '\f') - || (LA13_0 >= '\u000E' && LA13_0 <= '\u001F') || LA13_0 == '!' - || (LA13_0 >= '#' && LA13_0 <= '&') || (LA13_0 >= '*' && LA13_0 <= '+') || LA13_0 == ':' - || (LA13_0 >= '?' && LA13_0 <= '@') || LA13_0 == '\\' || LA13_0 == '`' || LA13_0 == '|' - || (LA13_0 >= '~' && LA13_0 <= '\uFFFF'))) { - s = 30; + else if ((((LA13_0 >= '\u0000') && (LA13_0 <= '\b')) || ((LA13_0 >= '\u000B') && (LA13_0 <= '\f')) + || ((LA13_0 >= '\u000E') && (LA13_0 <= '\u001F')) || (LA13_0 == '!') + || ((LA13_0 >= '#') && (LA13_0 <= '&')) || ((LA13_0 >= '*') && (LA13_0 <= '+')) + || (LA13_0 == ':') || ((LA13_0 >= '?') && (LA13_0 <= '@')) || (LA13_0 == '\\') + || (LA13_0 == '`') || (LA13_0 == '|') || ((LA13_0 >= '~') && (LA13_0 <= '\uFFFF')))) { + s = 30; + } + break; } if (s >= 0) { @@ -1689,8 +1664,8 @@ else if (((LA13_0 >= '\u0000' && LA13_0 <= '\b') || (LA13_0 >= '\u000B' && LA13_ } break; } - final NoViableAltException nvae = new NoViableAltException(this.getDescription(), 13, _s, input); - this.error(nvae); + final NoViableAltException nvae = new NoViableAltException(getDescription(), 13, _s, input); + error(nvae); throw nvae; } } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLParser.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLParser.java index cefa96e..7584ae6 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLParser.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSLParser.java @@ -14,11 +14,11 @@ @SuppressWarnings("all") public class InternalMetricDSLParser extends AbstractInternalAntlrParser { - public static final String[] tokenNames = new String[] { "", "", "", "", "RULE_STRING", - "RULE_DOUBLE", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", - "'import'", "';'", "'extern'", "'Metrics'", "'{'", "'}'", "'Metric'", "'('", "','", "')'", "'parameters'", - "'};'", "'Parameter'", "'Const'", "'='", "'WeigthedSum'", "'Stepwise'", "'['", "']'", "'Ratio'", "'/'", - "'<'", "'>'", "'.'" }; + public static final String[] tokenNames = { "", "", "", "", "RULE_STRING", "RULE_DOUBLE", + "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "';'", + "'extern'", "'Metrics'", "'{'", "'}'", "'Metric'", "'('", "','", "')'", "'parameters'", "'};'", + "'Parameter'", "'Const'", "'='", "'WeigthedSum'", "'Stepwise'", "'['", "']'", "'Ratio'", "'/'", "'<'", + "'>'", "'.'" }; public static final int RULE_ID = 6; public static final int T__29 = 29; public static final int T__28 = 28; @@ -80,7 +80,7 @@ public String getGrammarFileName() { public InternalMetricDSLParser(final TokenStream input, final MetricDSLGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; - this.registerRules(grammarAccess.getGrammar()); + registerRules(grammarAccess.getGrammar()); } @Override @@ -90,12 +90,13 @@ protected String getFirstRuleName() { @Override protected MetricDSLGrammarAccess getGrammarAccess() { - return this.grammarAccess; + return grammarAccess; } // $ANTLR start "entryRuleMetricModel" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:67:1: - // entryRuleMetricModel returns [EObject current=null] : iv_ruleMetricModel= ruleMetricModel EOF + // entryRuleMetricModel returns [EObject current=null] : iv_ruleMetricModel= + // ruleMetricModel EOF // ; public final EObject entryRuleMetricModel() throws RecognitionException { EObject current = null; @@ -108,22 +109,22 @@ public final EObject entryRuleMetricModel() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:69:2: // iv_ruleMetricModel= ruleMetricModel EOF { - this.newCompositeNode(this.grammarAccess.getMetricModelRule()); - this.pushFollow(FOLLOW_ruleMetricModel_in_entryRuleMetricModel75); - iv_ruleMetricModel = this.ruleMetricModel(); + newCompositeNode(grammarAccess.getMetricModelRule()); + pushFollow(FOLLOW_ruleMetricModel_in_entryRuleMetricModel75); + iv_ruleMetricModel = ruleMetricModel(); - this.state._fsp--; + state._fsp--; current = iv_ruleMetricModel; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricModel85); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricModel85); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -132,8 +133,10 @@ public final EObject entryRuleMetricModel() throws RecognitionException { // $ANTLR start "ruleMetricModel" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:76:1: - // ruleMetricModel returns [EObject current=null] : ( (otherlv_0= 'import' ( (lv_importURI_1_0= - // RULE_STRING ) ) otherlv_2= ';' )* (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric + // ruleMetricModel returns [EObject current=null] : ( (otherlv_0= 'import' ( + // (lv_importURI_1_0= + // RULE_STRING ) ) otherlv_2= ';' )* (otherlv_3= 'extern' ( (lv_metrics_4_0= + // ruleExternalMetric // ) ) otherlv_5= ';' )* otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= // ruleInternalMetric ) )+ otherlv_9= '}' ) ; public final EObject ruleMetricModel() throws RecognitionException { @@ -151,36 +154,45 @@ public final EObject ruleMetricModel() throws RecognitionException { EObject lv_metrics_8_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:79:28: - // ( ( (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' )* - // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' )* - // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) )+ + // ( ( (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' + // )* + // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' + // )* + // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) + // )+ // otherlv_9= '}' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:80:1: // ( (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' )* - // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' )* - // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) )+ + // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' + // )* + // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) + // )+ // otherlv_9= '}' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:80:1: // ( (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' )* - // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' )* - // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) )+ + // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' + // )* + // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) + // )+ // otherlv_9= '}' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:80:2: // (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' )* - // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' )* - // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) )+ + // (otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= ';' + // )* + // otherlv_6= 'Metrics' otherlv_7= '{' ( (lv_metrics_8_0= ruleInternalMetric ) + // )+ // otherlv_9= '}' { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:80:2: // (otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' )* loop1: do { int alt1 = 2; - final int LA1_0 = this.input.LA(1); + final int LA1_0 = input.LA(1); if ((LA1_0 == 12)) { alt1 = 1; @@ -191,10 +203,9 @@ public final EObject ruleMetricModel() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:80:4: // otherlv_0= 'import' ( (lv_importURI_1_0= RULE_STRING ) ) otherlv_2= ';' { - otherlv_0 = (Token) this.match(this.input, 12, FOLLOW_12_in_ruleMetricModel123); + otherlv_0 = (Token) match(input, 12, FOLLOW_12_in_ruleMetricModel123); - this.newLeafNode(otherlv_0, - this.grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); + newLeafNode(otherlv_0, grammarAccess.getMetricModelAccess().getImportKeyword_0_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:84:1: // ( (lv_importURI_1_0= RULE_STRING ) ) @@ -206,14 +217,14 @@ public final EObject ruleMetricModel() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:86:3: // lv_importURI_1_0= RULE_STRING { - lv_importURI_1_0 = (Token) this.match(this.input, RULE_STRING, + lv_importURI_1_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleMetricModel140); - this.newLeafNode(lv_importURI_1_0, this.grammarAccess.getMetricModelAccess() + newLeafNode(lv_importURI_1_0, grammarAccess.getMetricModelAccess() .getImportURISTRINGTerminalRuleCall_0_1_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getMetricModelRule()); + current = this.createModelElement(grammarAccess.getMetricModelRule()); } this.addWithLastConsumed(current, "importURI", lv_importURI_1_0, "STRING"); @@ -221,10 +232,9 @@ public final EObject ruleMetricModel() throws RecognitionException { } - otherlv_2 = (Token) this.match(this.input, 13, FOLLOW_13_in_ruleMetricModel157); + otherlv_2 = (Token) match(input, 13, FOLLOW_13_in_ruleMetricModel157); - this.newLeafNode(otherlv_2, - this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); + newLeafNode(otherlv_2, grammarAccess.getMetricModelAccess().getSemicolonKeyword_0_2()); } break; @@ -239,7 +249,7 @@ public final EObject ruleMetricModel() throws RecognitionException { // )* loop2: do { int alt2 = 2; - final int LA2_0 = this.input.LA(1); + final int LA2_0 = input.LA(1); if ((LA2_0 == 14)) { alt2 = 1; @@ -251,10 +261,9 @@ public final EObject ruleMetricModel() throws RecognitionException { // otherlv_3= 'extern' ( (lv_metrics_4_0= ruleExternalMetric ) ) otherlv_5= // ';' { - otherlv_3 = (Token) this.match(this.input, 14, FOLLOW_14_in_ruleMetricModel172); + otherlv_3 = (Token) match(input, 14, FOLLOW_14_in_ruleMetricModel172); - this.newLeafNode(otherlv_3, - this.grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); + newLeafNode(otherlv_3, grammarAccess.getMetricModelAccess().getExternKeyword_1_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:110:1: // ( (lv_metrics_4_0= ruleExternalMetric ) ) @@ -267,29 +276,27 @@ public final EObject ruleMetricModel() throws RecognitionException { // lv_metrics_4_0= ruleExternalMetric { - this.newCompositeNode(this.grammarAccess.getMetricModelAccess() + newCompositeNode(grammarAccess.getMetricModelAccess() .getMetricsExternalMetricParserRuleCall_1_1_0()); - this.pushFollow(FOLLOW_ruleExternalMetric_in_ruleMetricModel193); - lv_metrics_4_0 = this.ruleExternalMetric(); + pushFollow(FOLLOW_ruleExternalMetric_in_ruleMetricModel193); + lv_metrics_4_0 = ruleExternalMetric(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this - .createModelElementForParent(this.grammarAccess.getMetricModelRule()); + current = this.createModelElementForParent(grammarAccess.getMetricModelRule()); } this.add(current, "metrics", lv_metrics_4_0, "ExternalMetric"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_5 = (Token) this.match(this.input, 13, FOLLOW_13_in_ruleMetricModel205); + otherlv_5 = (Token) match(input, 13, FOLLOW_13_in_ruleMetricModel205); - this.newLeafNode(otherlv_5, - this.grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); + newLeafNode(otherlv_5, grammarAccess.getMetricModelAccess().getSemicolonKeyword_1_2()); } break; @@ -299,21 +306,20 @@ public final EObject ruleMetricModel() throws RecognitionException { } } while (true); - otherlv_6 = (Token) this.match(this.input, 15, FOLLOW_15_in_ruleMetricModel219); + otherlv_6 = (Token) match(input, 15, FOLLOW_15_in_ruleMetricModel219); - this.newLeafNode(otherlv_6, this.grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); + newLeafNode(otherlv_6, grammarAccess.getMetricModelAccess().getMetricsKeyword_2()); - otherlv_7 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleMetricModel231); + otherlv_7 = (Token) match(input, 16, FOLLOW_16_in_ruleMetricModel231); - this.newLeafNode(otherlv_7, - this.grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); + newLeafNode(otherlv_7, grammarAccess.getMetricModelAccess().getLeftCurlyBracketKeyword_3()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:140:1: // ( (lv_metrics_8_0= ruleInternalMetric ) )+ int cnt3 = 0; loop3: do { int alt3 = 2; - final int LA3_0 = this.input.LA(1); + final int LA3_0 = input.LA(1); if ((LA3_0 == 18)) { alt3 = 1; @@ -330,19 +336,19 @@ public final EObject ruleMetricModel() throws RecognitionException { // lv_metrics_8_0= ruleInternalMetric { - this.newCompositeNode(this.grammarAccess.getMetricModelAccess() + newCompositeNode(grammarAccess.getMetricModelAccess() .getMetricsInternalMetricParserRuleCall_4_0()); - this.pushFollow(FOLLOW_ruleInternalMetric_in_ruleMetricModel252); - lv_metrics_8_0 = this.ruleInternalMetric(); + pushFollow(FOLLOW_ruleInternalMetric_in_ruleMetricModel252); + lv_metrics_8_0 = ruleInternalMetric(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getMetricModelRule()); + current = this.createModelElementForParent(grammarAccess.getMetricModelRule()); } this.add(current, "metrics", lv_metrics_8_0, "InternalMetric"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } @@ -353,27 +359,26 @@ public final EObject ruleMetricModel() throws RecognitionException { if (cnt3 >= 1) { break loop3; } - final EarlyExitException eee = new EarlyExitException(3, this.input); + final EarlyExitException eee = new EarlyExitException(3, input); throw eee; } cnt3++; } while (true); - otherlv_9 = (Token) this.match(this.input, 17, FOLLOW_17_in_ruleMetricModel265); + otherlv_9 = (Token) match(input, 17, FOLLOW_17_in_ruleMetricModel265); - this.newLeafNode(otherlv_9, - this.grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); + newLeafNode(otherlv_9, grammarAccess.getMetricModelAccess().getRightCurlyBracketKeyword_5()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -382,7 +387,8 @@ public final EObject ruleMetricModel() throws RecognitionException { // $ANTLR start "entryRuleExternalMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:172:1: - // entryRuleExternalMetric returns [EObject current=null] : iv_ruleExternalMetric= + // entryRuleExternalMetric returns [EObject current=null] : + // iv_ruleExternalMetric= // ruleExternalMetric EOF ; public final EObject entryRuleExternalMetric() throws RecognitionException { EObject current = null; @@ -395,22 +401,22 @@ public final EObject entryRuleExternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:174:2: // iv_ruleExternalMetric= ruleExternalMetric EOF { - this.newCompositeNode(this.grammarAccess.getExternalMetricRule()); - this.pushFollow(FOLLOW_ruleExternalMetric_in_entryRuleExternalMetric303); - iv_ruleExternalMetric = this.ruleExternalMetric(); + newCompositeNode(grammarAccess.getExternalMetricRule()); + pushFollow(FOLLOW_ruleExternalMetric_in_entryRuleExternalMetric303); + iv_ruleExternalMetric = ruleExternalMetric(); - this.state._fsp--; + state._fsp--; current = iv_ruleExternalMetric; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleExternalMetric313); + match(input, EOF, FOLLOW_EOF_in_entryRuleExternalMetric313); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -419,13 +425,14 @@ public final EObject entryRuleExternalMetric() throws RecognitionException { // $ANTLR start "ruleExternalMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:181:1: - // ruleExternalMetric returns [EObject current=null] : ( (lv_name_0_0= ruleMYID ) ) ; + // ruleExternalMetric returns [EObject current=null] : ( (lv_name_0_0= ruleMYID + // ) ) ; public final EObject ruleExternalMetric() throws RecognitionException { EObject current = null; AntlrDatatypeRuleToken lv_name_0_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:184:28: @@ -444,19 +451,18 @@ public final EObject ruleExternalMetric() throws RecognitionException { // lv_name_0_0= ruleMYID { - this.newCompositeNode( - this.grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); + newCompositeNode(grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleExternalMetric358); - lv_name_0_0 = this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleExternalMetric358); + lv_name_0_0 = ruleMYID(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getExternalMetricRule()); + current = this.createModelElementForParent(grammarAccess.getExternalMetricRule()); } this.set(current, "name", lv_name_0_0, "MYID"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } @@ -464,12 +470,12 @@ public final EObject ruleExternalMetric() throws RecognitionException { } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -478,7 +484,8 @@ public final EObject ruleExternalMetric() throws RecognitionException { // $ANTLR start "entryRuleInternalMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:211:1: - // entryRuleInternalMetric returns [EObject current=null] : iv_ruleInternalMetric= + // entryRuleInternalMetric returns [EObject current=null] : + // iv_ruleInternalMetric= // ruleInternalMetric EOF ; public final EObject entryRuleInternalMetric() throws RecognitionException { EObject current = null; @@ -491,22 +498,22 @@ public final EObject entryRuleInternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:213:2: // iv_ruleInternalMetric= ruleInternalMetric EOF { - this.newCompositeNode(this.grammarAccess.getInternalMetricRule()); - this.pushFollow(FOLLOW_ruleInternalMetric_in_entryRuleInternalMetric393); - iv_ruleInternalMetric = this.ruleInternalMetric(); + newCompositeNode(grammarAccess.getInternalMetricRule()); + pushFollow(FOLLOW_ruleInternalMetric_in_entryRuleInternalMetric393); + iv_ruleInternalMetric = ruleInternalMetric(); - this.state._fsp--; + state._fsp--; current = iv_ruleInternalMetric; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleInternalMetric403); + match(input, EOF, FOLLOW_EOF_in_entryRuleInternalMetric403); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -515,9 +522,12 @@ public final EObject entryRuleInternalMetric() throws RecognitionException { // $ANTLR start "ruleInternalMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:220:1: - // ruleInternalMetric returns [EObject current=null] : (otherlv_0= 'Metric' ( (lv_name_1_0= - // ruleMYID ) ) otherlv_2= '(' ( (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= ',' ( - // (lv_description_5_0= RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' + // ruleInternalMetric returns [EObject current=null] : (otherlv_0= 'Metric' ( + // (lv_name_1_0= + // ruleMYID ) ) otherlv_2= '(' ( (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= + // ',' ( + // (lv_description_5_0= RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' + // (otherlv_8= 'parameters' // otherlv_9= '{' ( (lv_parameter_10_0= ruleNumber ) )* otherlv_11= '}' )? ( // (lv_definition_12_0= ruleMetricDefinition ) ) otherlv_13= '};' ) ; public final EObject ruleInternalMetric() throws RecognitionException { @@ -540,38 +550,44 @@ public final EObject ruleInternalMetric() throws RecognitionException { EObject lv_definition_12_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:223:28: // ( (otherlv_0= 'Metric' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( - // (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= RULE_STRING + // (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= + // RULE_STRING // ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' otherlv_9= '{' ( // (lv_parameter_10_0= ruleNumber ) )* otherlv_11= '}' )? ( (lv_definition_12_0= // ruleMetricDefinition ) ) otherlv_13= '};' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:224:1: - // (otherlv_0= 'Metric' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( (lv_shortName_3_0= - // RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= RULE_STRING ) ) otherlv_6= ')' + // (otherlv_0= 'Metric' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( + // (lv_shortName_3_0= + // RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= RULE_STRING ) ) + // otherlv_6= ')' // otherlv_7= '{' (otherlv_8= 'parameters' otherlv_9= '{' ( (lv_parameter_10_0= - // ruleNumber ) )* otherlv_11= '}' )? ( (lv_definition_12_0= ruleMetricDefinition ) ) + // ruleNumber ) )* otherlv_11= '}' )? ( (lv_definition_12_0= + // ruleMetricDefinition ) ) // otherlv_13= '};' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:224:1: // (otherlv_0= 'Metric' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( // (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= - // RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' otherlv_9= + // RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' + // otherlv_9= // '{' ( (lv_parameter_10_0= ruleNumber ) )* otherlv_11= '}' )? ( // (lv_definition_12_0= ruleMetricDefinition ) ) otherlv_13= '};' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:224:3: // otherlv_0= 'Metric' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( // (lv_shortName_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= - // RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' otherlv_9= + // RULE_STRING ) ) otherlv_6= ')' otherlv_7= '{' (otherlv_8= 'parameters' + // otherlv_9= // '{' ( (lv_parameter_10_0= ruleNumber ) )* otherlv_11= '}' )? ( // (lv_definition_12_0= ruleMetricDefinition ) ) otherlv_13= '};' { - otherlv_0 = (Token) this.match(this.input, 18, FOLLOW_18_in_ruleInternalMetric440); + otherlv_0 = (Token) match(input, 18, FOLLOW_18_in_ruleInternalMetric440); - this.newLeafNode(otherlv_0, this.grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getInternalMetricAccess().getMetricKeyword_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:228:1: // ( (lv_name_1_0= ruleMYID ) ) @@ -584,28 +600,26 @@ public final EObject ruleInternalMetric() throws RecognitionException { // lv_name_1_0= ruleMYID { - this.newCompositeNode( - this.grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); + newCompositeNode(grammarAccess.getInternalMetricAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleInternalMetric461); - lv_name_1_0 = this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleInternalMetric461); + lv_name_1_0 = ruleMYID(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getInternalMetricRule()); + current = this.createModelElementForParent(grammarAccess.getInternalMetricRule()); } this.set(current, "name", lv_name_1_0, "MYID"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_2 = (Token) this.match(this.input, 19, FOLLOW_19_in_ruleInternalMetric473); + otherlv_2 = (Token) match(input, 19, FOLLOW_19_in_ruleInternalMetric473); - this.newLeafNode(otherlv_2, - this.grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getInternalMetricAccess().getLeftParenthesisKeyword_2()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:250:1: // ( (lv_shortName_3_0= RULE_STRING ) ) @@ -617,14 +631,14 @@ public final EObject ruleInternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:252:3: // lv_shortName_3_0= RULE_STRING { - lv_shortName_3_0 = (Token) this.match(this.input, RULE_STRING, + lv_shortName_3_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleInternalMetric490); - this.newLeafNode(lv_shortName_3_0, this.grammarAccess.getInternalMetricAccess() - .getShortNameSTRINGTerminalRuleCall_3_0()); + newLeafNode(lv_shortName_3_0, + grammarAccess.getInternalMetricAccess().getShortNameSTRINGTerminalRuleCall_3_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getInternalMetricRule()); + current = this.createModelElement(grammarAccess.getInternalMetricRule()); } this.setWithLastConsumed(current, "shortName", lv_shortName_3_0, "STRING"); @@ -632,9 +646,9 @@ public final EObject ruleInternalMetric() throws RecognitionException { } - otherlv_4 = (Token) this.match(this.input, 20, FOLLOW_20_in_ruleInternalMetric507); + otherlv_4 = (Token) match(input, 20, FOLLOW_20_in_ruleInternalMetric507); - this.newLeafNode(otherlv_4, this.grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getInternalMetricAccess().getCommaKeyword_4()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:272:1: // ( (lv_description_5_0= RULE_STRING ) ) @@ -646,14 +660,14 @@ public final EObject ruleInternalMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:274:3: // lv_description_5_0= RULE_STRING { - lv_description_5_0 = (Token) this.match(this.input, RULE_STRING, + lv_description_5_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleInternalMetric524); - this.newLeafNode(lv_description_5_0, this.grammarAccess.getInternalMetricAccess() - .getDescriptionSTRINGTerminalRuleCall_5_0()); + newLeafNode(lv_description_5_0, + grammarAccess.getInternalMetricAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getInternalMetricRule()); + current = this.createModelElement(grammarAccess.getInternalMetricRule()); } this.setWithLastConsumed(current, "description", lv_description_5_0, "STRING"); @@ -661,21 +675,19 @@ public final EObject ruleInternalMetric() throws RecognitionException { } - otherlv_6 = (Token) this.match(this.input, 21, FOLLOW_21_in_ruleInternalMetric541); + otherlv_6 = (Token) match(input, 21, FOLLOW_21_in_ruleInternalMetric541); - this.newLeafNode(otherlv_6, - this.grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); + newLeafNode(otherlv_6, grammarAccess.getInternalMetricAccess().getRightParenthesisKeyword_6()); - otherlv_7 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleInternalMetric553); + otherlv_7 = (Token) match(input, 16, FOLLOW_16_in_ruleInternalMetric553); - this.newLeafNode(otherlv_7, - this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); + newLeafNode(otherlv_7, grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_7()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:298:1: // (otherlv_8= 'parameters' otherlv_9= '{' ( (lv_parameter_10_0= ruleNumber ) )* // otherlv_11= '}' )? int alt5 = 2; - final int LA5_0 = this.input.LA(1); + final int LA5_0 = input.LA(1); if ((LA5_0 == 22)) { alt5 = 1; @@ -686,23 +698,22 @@ public final EObject ruleInternalMetric() throws RecognitionException { // otherlv_8= 'parameters' otherlv_9= '{' ( (lv_parameter_10_0= ruleNumber ) )* // otherlv_11= '}' { - otherlv_8 = (Token) this.match(this.input, 22, FOLLOW_22_in_ruleInternalMetric566); + otherlv_8 = (Token) match(input, 22, FOLLOW_22_in_ruleInternalMetric566); - this.newLeafNode(otherlv_8, - this.grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); + newLeafNode(otherlv_8, grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()); - otherlv_9 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleInternalMetric578); + otherlv_9 = (Token) match(input, 16, FOLLOW_16_in_ruleInternalMetric578); - this.newLeafNode(otherlv_9, - this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); + newLeafNode(otherlv_9, + grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:306:1: // ( (lv_parameter_10_0= ruleNumber ) )* loop4: do { int alt4 = 2; - final int LA4_0 = this.input.LA(1); + final int LA4_0 = input.LA(1); - if (((LA4_0 >= 24 && LA4_0 <= 25))) { + if ((((LA4_0 >= 24) && (LA4_0 <= 25)))) { alt4 = 1; } @@ -717,20 +728,20 @@ public final EObject ruleInternalMetric() throws RecognitionException { // lv_parameter_10_0= ruleNumber { - this.newCompositeNode(this.grammarAccess.getInternalMetricAccess() + newCompositeNode(grammarAccess.getInternalMetricAccess() .getParameterNumberParserRuleCall_8_2_0()); - this.pushFollow(FOLLOW_ruleNumber_in_ruleInternalMetric599); - lv_parameter_10_0 = this.ruleNumber(); + pushFollow(FOLLOW_ruleNumber_in_ruleInternalMetric599); + lv_parameter_10_0 = ruleNumber(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent( - this.grammarAccess.getInternalMetricRule()); + current = this + .createModelElementForParent(grammarAccess.getInternalMetricRule()); } this.add(current, "parameter", lv_parameter_10_0, "Number"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } @@ -742,10 +753,10 @@ public final EObject ruleInternalMetric() throws RecognitionException { } } while (true); - otherlv_11 = (Token) this.match(this.input, 17, FOLLOW_17_in_ruleInternalMetric612); + otherlv_11 = (Token) match(input, 17, FOLLOW_17_in_ruleInternalMetric612); - this.newLeafNode(otherlv_11, - this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); + newLeafNode(otherlv_11, + grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3()); } break; @@ -763,39 +774,39 @@ public final EObject ruleInternalMetric() throws RecognitionException { // lv_definition_12_0= ruleMetricDefinition { - this.newCompositeNode(this.grammarAccess.getInternalMetricAccess() + newCompositeNode(grammarAccess.getInternalMetricAccess() .getDefinitionMetricDefinitionParserRuleCall_9_0()); - this.pushFollow(FOLLOW_ruleMetricDefinition_in_ruleInternalMetric635); - lv_definition_12_0 = this.ruleMetricDefinition(); + pushFollow(FOLLOW_ruleMetricDefinition_in_ruleInternalMetric635); + lv_definition_12_0 = ruleMetricDefinition(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getInternalMetricRule()); + current = this.createModelElementForParent(grammarAccess.getInternalMetricRule()); } this.set(current, "definition", lv_definition_12_0, "MetricDefinition"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_13 = (Token) this.match(this.input, 23, FOLLOW_23_in_ruleInternalMetric647); + otherlv_13 = (Token) match(input, 23, FOLLOW_23_in_ruleInternalMetric647); - this.newLeafNode(otherlv_13, - this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); + newLeafNode(otherlv_13, + grammarAccess.getInternalMetricAccess().getRightCurlyBracketSemicolonKeyword_10()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -804,7 +815,8 @@ public final EObject ruleInternalMetric() throws RecognitionException { // $ANTLR start "entryRuleNumber" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:358:1: - // entryRuleNumber returns [EObject current=null] : iv_ruleNumber= ruleNumber EOF ; + // entryRuleNumber returns [EObject current=null] : iv_ruleNumber= ruleNumber + // EOF ; public final EObject entryRuleNumber() throws RecognitionException { EObject current = null; @@ -816,22 +828,22 @@ public final EObject entryRuleNumber() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:360:2: // iv_ruleNumber= ruleNumber EOF { - this.newCompositeNode(this.grammarAccess.getNumberRule()); - this.pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber683); - iv_ruleNumber = this.ruleNumber(); + newCompositeNode(grammarAccess.getNumberRule()); + pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber683); + iv_ruleNumber = ruleNumber(); - this.state._fsp--; + state._fsp--; current = iv_ruleNumber; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleNumber693); + match(input, EOF, FOLLOW_EOF_in_entryRuleNumber693); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -840,7 +852,8 @@ public final EObject entryRuleNumber() throws RecognitionException { // $ANTLR start "ruleNumber" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:367:1: - // ruleNumber returns [EObject current=null] : (this_Parameter_0= ruleParameter | + // ruleNumber returns [EObject current=null] : (this_Parameter_0= ruleParameter + // | // this_Constant_1= ruleConstant ) ; public final EObject ruleNumber() throws RecognitionException { EObject current = null; @@ -849,7 +862,7 @@ public final EObject ruleNumber() throws RecognitionException { EObject this_Constant_1 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:370:28: @@ -860,14 +873,14 @@ public final EObject ruleNumber() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:371:1: // (this_Parameter_0= ruleParameter | this_Constant_1= ruleConstant ) int alt6 = 2; - final int LA6_0 = this.input.LA(1); + final int LA6_0 = input.LA(1); if ((LA6_0 == 24)) { alt6 = 1; } else if ((LA6_0 == 25)) { alt6 = 2; } else { - final NoViableAltException nvae = new NoViableAltException("", 6, 0, this.input); + final NoViableAltException nvae = new NoViableAltException("", 6, 0, input); throw nvae; } @@ -877,15 +890,15 @@ public final EObject ruleNumber() throws RecognitionException { // this_Parameter_0= ruleParameter { - this.newCompositeNode(this.grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); + newCompositeNode(grammarAccess.getNumberAccess().getParameterParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleParameter_in_ruleNumber740); - this_Parameter_0 = this.ruleParameter(); + pushFollow(FOLLOW_ruleParameter_in_ruleNumber740); + this_Parameter_0 = ruleParameter(); - this.state._fsp--; + state._fsp--; current = this_Parameter_0; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } break; @@ -894,15 +907,15 @@ public final EObject ruleNumber() throws RecognitionException { // this_Constant_1= ruleConstant { - this.newCompositeNode(this.grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); + newCompositeNode(grammarAccess.getNumberAccess().getConstantParserRuleCall_1()); - this.pushFollow(FOLLOW_ruleConstant_in_ruleNumber767); - this_Constant_1 = this.ruleConstant(); + pushFollow(FOLLOW_ruleConstant_in_ruleNumber767); + this_Constant_1 = ruleConstant(); - this.state._fsp--; + state._fsp--; current = this_Constant_1; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } break; @@ -911,12 +924,12 @@ public final EObject ruleNumber() throws RecognitionException { } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -925,7 +938,8 @@ public final EObject ruleNumber() throws RecognitionException { // $ANTLR start "entryRuleParameter" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:398:1: - // entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; + // entryRuleParameter returns [EObject current=null] : iv_ruleParameter= + // ruleParameter EOF ; public final EObject entryRuleParameter() throws RecognitionException { EObject current = null; @@ -937,22 +951,22 @@ public final EObject entryRuleParameter() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:400:2: // iv_ruleParameter= ruleParameter EOF { - this.newCompositeNode(this.grammarAccess.getParameterRule()); - this.pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter802); - iv_ruleParameter = this.ruleParameter(); + newCompositeNode(grammarAccess.getParameterRule()); + pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter802); + iv_ruleParameter = ruleParameter(); - this.state._fsp--; + state._fsp--; current = iv_ruleParameter; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleParameter812); + match(input, EOF, FOLLOW_EOF_in_entryRuleParameter812); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -961,9 +975,12 @@ public final EObject entryRuleParameter() throws RecognitionException { // $ANTLR start "ruleParameter" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:407:1: - // ruleParameter returns [EObject current=null] : (otherlv_0= 'Parameter' ( (lv_name_1_0= - // ruleMYID ) ) otherlv_2= '(' ( (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( - // (lv_description_5_0= RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) + // ruleParameter returns [EObject current=null] : (otherlv_0= 'Parameter' ( + // (lv_name_1_0= + // ruleMYID ) ) otherlv_2= '(' ( (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= + // ',' ( + // (lv_description_5_0= RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= + // RULE_DOUBLE ) ) // otherlv_8= ')' otherlv_9= ';' ) ; public final EObject ruleParameter() throws RecognitionException { EObject current = null; @@ -979,34 +996,40 @@ public final EObject ruleParameter() throws RecognitionException { Token otherlv_9 = null; AntlrDatatypeRuleToken lv_name_1_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:410:28: // ( (otherlv_0= 'Parameter' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( - // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= RULE_STRING - // ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= ')' otherlv_9= + // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= + // RULE_STRING + // ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= ')' + // otherlv_9= // ';' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:411:1: // (otherlv_0= 'Parameter' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( - // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= RULE_STRING - // ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= ')' otherlv_9= + // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= + // RULE_STRING + // ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= ')' + // otherlv_9= // ';' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:411:1: // (otherlv_0= 'Parameter' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= - // RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= + // RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) + // otherlv_8= // ')' otherlv_9= ';' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:411:3: // otherlv_0= 'Parameter' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '(' ( // (lv_shortname_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_description_5_0= - // RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) otherlv_8= + // RULE_STRING ) ) otherlv_6= ',' ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) + // otherlv_8= // ')' otherlv_9= ';' { - otherlv_0 = (Token) this.match(this.input, 24, FOLLOW_24_in_ruleParameter849); + otherlv_0 = (Token) match(input, 24, FOLLOW_24_in_ruleParameter849); - this.newLeafNode(otherlv_0, this.grammarAccess.getParameterAccess().getParameterKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getParameterAccess().getParameterKeyword_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:415:1: // ( (lv_name_1_0= ruleMYID ) ) @@ -1019,27 +1042,26 @@ public final EObject ruleParameter() throws RecognitionException { // lv_name_1_0= ruleMYID { - this.newCompositeNode( - this.grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); + newCompositeNode(grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleParameter870); - lv_name_1_0 = this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleParameter870); + lv_name_1_0 = ruleMYID(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getParameterRule()); + current = this.createModelElementForParent(grammarAccess.getParameterRule()); } this.set(current, "name", lv_name_1_0, "MYID"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_2 = (Token) this.match(this.input, 19, FOLLOW_19_in_ruleParameter882); + otherlv_2 = (Token) match(input, 19, FOLLOW_19_in_ruleParameter882); - this.newLeafNode(otherlv_2, this.grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getParameterAccess().getLeftParenthesisKeyword_2()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:437:1: // ( (lv_shortname_3_0= RULE_STRING ) ) @@ -1051,14 +1073,14 @@ public final EObject ruleParameter() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:439:3: // lv_shortname_3_0= RULE_STRING { - lv_shortname_3_0 = (Token) this.match(this.input, RULE_STRING, + lv_shortname_3_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleParameter899); - this.newLeafNode(lv_shortname_3_0, - this.grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); + newLeafNode(lv_shortname_3_0, + grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getParameterRule()); + current = this.createModelElement(grammarAccess.getParameterRule()); } this.setWithLastConsumed(current, "shortname", lv_shortname_3_0, "STRING"); @@ -1066,9 +1088,9 @@ public final EObject ruleParameter() throws RecognitionException { } - otherlv_4 = (Token) this.match(this.input, 20, FOLLOW_20_in_ruleParameter916); + otherlv_4 = (Token) match(input, 20, FOLLOW_20_in_ruleParameter916); - this.newLeafNode(otherlv_4, this.grammarAccess.getParameterAccess().getCommaKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getParameterAccess().getCommaKeyword_4()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:459:1: // ( (lv_description_5_0= RULE_STRING ) ) @@ -1080,14 +1102,14 @@ public final EObject ruleParameter() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:461:3: // lv_description_5_0= RULE_STRING { - lv_description_5_0 = (Token) this.match(this.input, RULE_STRING, + lv_description_5_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleParameter933); - this.newLeafNode(lv_description_5_0, - this.grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); + newLeafNode(lv_description_5_0, + grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getParameterRule()); + current = this.createModelElement(grammarAccess.getParameterRule()); } this.setWithLastConsumed(current, "description", lv_description_5_0, "STRING"); @@ -1095,9 +1117,9 @@ public final EObject ruleParameter() throws RecognitionException { } - otherlv_6 = (Token) this.match(this.input, 20, FOLLOW_20_in_ruleParameter950); + otherlv_6 = (Token) match(input, 20, FOLLOW_20_in_ruleParameter950); - this.newLeafNode(otherlv_6, this.grammarAccess.getParameterAccess().getCommaKeyword_6()); + newLeafNode(otherlv_6, grammarAccess.getParameterAccess().getCommaKeyword_6()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:481:1: // ( (lv_defaultValue_7_0= RULE_DOUBLE ) ) @@ -1109,14 +1131,14 @@ public final EObject ruleParameter() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:483:3: // lv_defaultValue_7_0= RULE_DOUBLE { - lv_defaultValue_7_0 = (Token) this.match(this.input, RULE_DOUBLE, + lv_defaultValue_7_0 = (Token) match(input, RULE_DOUBLE, FOLLOW_RULE_DOUBLE_in_ruleParameter967); - this.newLeafNode(lv_defaultValue_7_0, this.grammarAccess.getParameterAccess() - .getDefaultValueDOUBLETerminalRuleCall_7_0()); + newLeafNode(lv_defaultValue_7_0, + grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getParameterRule()); + current = this.createModelElement(grammarAccess.getParameterRule()); } this.setWithLastConsumed(current, "defaultValue", lv_defaultValue_7_0, "DOUBLE"); @@ -1124,24 +1146,24 @@ public final EObject ruleParameter() throws RecognitionException { } - otherlv_8 = (Token) this.match(this.input, 21, FOLLOW_21_in_ruleParameter984); + otherlv_8 = (Token) match(input, 21, FOLLOW_21_in_ruleParameter984); - this.newLeafNode(otherlv_8, this.grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); + newLeafNode(otherlv_8, grammarAccess.getParameterAccess().getRightParenthesisKeyword_8()); - otherlv_9 = (Token) this.match(this.input, 13, FOLLOW_13_in_ruleParameter996); + otherlv_9 = (Token) match(input, 13, FOLLOW_13_in_ruleParameter996); - this.newLeafNode(otherlv_9, this.grammarAccess.getParameterAccess().getSemicolonKeyword_9()); + newLeafNode(otherlv_9, grammarAccess.getParameterAccess().getSemicolonKeyword_9()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1150,7 +1172,8 @@ public final EObject ruleParameter() throws RecognitionException { // $ANTLR start "entryRuleConstant" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:515:1: - // entryRuleConstant returns [EObject current=null] : iv_ruleConstant= ruleConstant EOF ; + // entryRuleConstant returns [EObject current=null] : iv_ruleConstant= + // ruleConstant EOF ; public final EObject entryRuleConstant() throws RecognitionException { EObject current = null; @@ -1162,22 +1185,22 @@ public final EObject entryRuleConstant() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:517:2: // iv_ruleConstant= ruleConstant EOF { - this.newCompositeNode(this.grammarAccess.getConstantRule()); - this.pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant1032); - iv_ruleConstant = this.ruleConstant(); + newCompositeNode(grammarAccess.getConstantRule()); + pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant1032); + iv_ruleConstant = ruleConstant(); - this.state._fsp--; + state._fsp--; current = iv_ruleConstant; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleConstant1042); + match(input, EOF, FOLLOW_EOF_in_entryRuleConstant1042); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1186,7 +1209,8 @@ public final EObject entryRuleConstant() throws RecognitionException { // $ANTLR start "ruleConstant" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:524:1: - // ruleConstant returns [EObject current=null] : (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) + // ruleConstant returns [EObject current=null] : (otherlv_0= 'Const' ( + // (lv_name_1_0= ruleMYID ) // ) otherlv_2= '=' ( (lv_value_3_0= RULE_DOUBLE ) ) otherlv_4= ';' ) ; public final EObject ruleConstant() throws RecognitionException { EObject current = null; @@ -1197,26 +1221,30 @@ public final EObject ruleConstant() throws RecognitionException { Token otherlv_4 = null; AntlrDatatypeRuleToken lv_name_1_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:527:28: - // ( (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( (lv_value_3_0= + // ( (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( + // (lv_value_3_0= // RULE_DOUBLE ) ) otherlv_4= ';' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:528:1: - // (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( (lv_value_3_0= + // (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( + // (lv_value_3_0= // RULE_DOUBLE ) ) otherlv_4= ';' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:528:1: - // (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( (lv_value_3_0= + // (otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( + // (lv_value_3_0= // RULE_DOUBLE ) ) otherlv_4= ';' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:528:3: - // otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( (lv_value_3_0= + // otherlv_0= 'Const' ( (lv_name_1_0= ruleMYID ) ) otherlv_2= '=' ( + // (lv_value_3_0= // RULE_DOUBLE ) ) otherlv_4= ';' { - otherlv_0 = (Token) this.match(this.input, 25, FOLLOW_25_in_ruleConstant1079); + otherlv_0 = (Token) match(input, 25, FOLLOW_25_in_ruleConstant1079); - this.newLeafNode(otherlv_0, this.grammarAccess.getConstantAccess().getConstKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getConstantAccess().getConstKeyword_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:532:1: // ( (lv_name_1_0= ruleMYID ) ) @@ -1229,27 +1257,26 @@ public final EObject ruleConstant() throws RecognitionException { // lv_name_1_0= ruleMYID { - this.newCompositeNode( - this.grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); + newCompositeNode(grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleConstant1100); - lv_name_1_0 = this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleConstant1100); + lv_name_1_0 = ruleMYID(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this.createModelElementForParent(this.grammarAccess.getConstantRule()); + current = this.createModelElementForParent(grammarAccess.getConstantRule()); } this.set(current, "name", lv_name_1_0, "MYID"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_2 = (Token) this.match(this.input, 26, FOLLOW_26_in_ruleConstant1112); + otherlv_2 = (Token) match(input, 26, FOLLOW_26_in_ruleConstant1112); - this.newLeafNode(otherlv_2, this.grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:554:1: // ( (lv_value_3_0= RULE_DOUBLE ) ) @@ -1261,14 +1288,13 @@ public final EObject ruleConstant() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:556:3: // lv_value_3_0= RULE_DOUBLE { - lv_value_3_0 = (Token) this.match(this.input, RULE_DOUBLE, - FOLLOW_RULE_DOUBLE_in_ruleConstant1129); + lv_value_3_0 = (Token) match(input, RULE_DOUBLE, FOLLOW_RULE_DOUBLE_in_ruleConstant1129); - this.newLeafNode(lv_value_3_0, - this.grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); + newLeafNode(lv_value_3_0, + grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0()); if (current == null) { - current = this.createModelElement(this.grammarAccess.getConstantRule()); + current = this.createModelElement(grammarAccess.getConstantRule()); } this.setWithLastConsumed(current, "value", lv_value_3_0, "DOUBLE"); @@ -1276,20 +1302,20 @@ public final EObject ruleConstant() throws RecognitionException { } - otherlv_4 = (Token) this.match(this.input, 13, FOLLOW_13_in_ruleConstant1146); + otherlv_4 = (Token) match(input, 13, FOLLOW_13_in_ruleConstant1146); - this.newLeafNode(otherlv_4, this.grammarAccess.getConstantAccess().getSemicolonKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getConstantAccess().getSemicolonKeyword_4()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1298,7 +1324,8 @@ public final EObject ruleConstant() throws RecognitionException { // $ANTLR start "entryRuleMetricDefinition" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:584:1: - // entryRuleMetricDefinition returns [EObject current=null] : iv_ruleMetricDefinition= + // entryRuleMetricDefinition returns [EObject current=null] : + // iv_ruleMetricDefinition= // ruleMetricDefinition EOF ; public final EObject entryRuleMetricDefinition() throws RecognitionException { EObject current = null; @@ -1311,22 +1338,22 @@ public final EObject entryRuleMetricDefinition() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:586:2: // iv_ruleMetricDefinition= ruleMetricDefinition EOF { - this.newCompositeNode(this.grammarAccess.getMetricDefinitionRule()); - this.pushFollow(FOLLOW_ruleMetricDefinition_in_entryRuleMetricDefinition1182); - iv_ruleMetricDefinition = this.ruleMetricDefinition(); + newCompositeNode(grammarAccess.getMetricDefinitionRule()); + pushFollow(FOLLOW_ruleMetricDefinition_in_entryRuleMetricDefinition1182); + iv_ruleMetricDefinition = ruleMetricDefinition(); - this.state._fsp--; + state._fsp--; current = iv_ruleMetricDefinition; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricDefinition1192); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricDefinition1192); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1336,7 +1363,8 @@ public final EObject entryRuleMetricDefinition() throws RecognitionException { // $ANTLR start "ruleMetricDefinition" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:593:1: // ruleMetricDefinition returns [EObject current=null] : (this_WeightedMetric_0= - // ruleWeightedMetric | this_StepwiseMetric_1= ruleStepwiseMetric | this_RatioMetric_2= + // ruleWeightedMetric | this_StepwiseMetric_1= ruleStepwiseMetric | + // this_RatioMetric_2= // ruleRatioMetric ) ; public final EObject ruleMetricDefinition() throws RecognitionException { EObject current = null; @@ -1347,7 +1375,7 @@ public final EObject ruleMetricDefinition() throws RecognitionException { EObject this_RatioMetric_2 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:596:28: @@ -1361,24 +1389,15 @@ public final EObject ruleMetricDefinition() throws RecognitionException { // (this_WeightedMetric_0= ruleWeightedMetric | this_StepwiseMetric_1= // ruleStepwiseMetric | this_RatioMetric_2= ruleRatioMetric ) int alt7 = 3; - switch (this.input.LA(1)) { - case 27: { - alt7 = 1; - } - break; - case 28: { - alt7 = 2; - } - break; - case 31: { - alt7 = 3; - } - break; - default: - final NoViableAltException nvae = new NoViableAltException("", 7, 0, this.input); - + alt7 = switch (input.LA(1)) { + case 27 -> 1; + case 28 -> 2; + case 31 -> 3; + default -> { + final NoViableAltException nvae = new NoViableAltException("", 7, 0, input); throw nvae; } + }; switch (alt7) { case 1: @@ -1386,16 +1405,15 @@ public final EObject ruleMetricDefinition() throws RecognitionException { // this_WeightedMetric_0= ruleWeightedMetric { - this.newCompositeNode( - this.grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); + newCompositeNode(grammarAccess.getMetricDefinitionAccess().getWeightedMetricParserRuleCall_0()); - this.pushFollow(FOLLOW_ruleWeightedMetric_in_ruleMetricDefinition1239); - this_WeightedMetric_0 = this.ruleWeightedMetric(); + pushFollow(FOLLOW_ruleWeightedMetric_in_ruleMetricDefinition1239); + this_WeightedMetric_0 = ruleWeightedMetric(); - this.state._fsp--; + state._fsp--; current = this_WeightedMetric_0; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } break; @@ -1404,16 +1422,15 @@ public final EObject ruleMetricDefinition() throws RecognitionException { // this_StepwiseMetric_1= ruleStepwiseMetric { - this.newCompositeNode( - this.grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); + newCompositeNode(grammarAccess.getMetricDefinitionAccess().getStepwiseMetricParserRuleCall_1()); - this.pushFollow(FOLLOW_ruleStepwiseMetric_in_ruleMetricDefinition1266); - this_StepwiseMetric_1 = this.ruleStepwiseMetric(); + pushFollow(FOLLOW_ruleStepwiseMetric_in_ruleMetricDefinition1266); + this_StepwiseMetric_1 = ruleStepwiseMetric(); - this.state._fsp--; + state._fsp--; current = this_StepwiseMetric_1; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } break; @@ -1422,16 +1439,15 @@ public final EObject ruleMetricDefinition() throws RecognitionException { // this_RatioMetric_2= ruleRatioMetric { - this.newCompositeNode( - this.grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); + newCompositeNode(grammarAccess.getMetricDefinitionAccess().getRatioMetricParserRuleCall_2()); - this.pushFollow(FOLLOW_ruleRatioMetric_in_ruleMetricDefinition1293); - this_RatioMetric_2 = this.ruleRatioMetric(); + pushFollow(FOLLOW_ruleRatioMetric_in_ruleMetricDefinition1293); + this_RatioMetric_2 = ruleRatioMetric(); - this.state._fsp--; + state._fsp--; current = this_RatioMetric_2; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } break; @@ -1440,12 +1456,12 @@ public final EObject ruleMetricDefinition() throws RecognitionException { } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1454,7 +1470,8 @@ public final EObject ruleMetricDefinition() throws RecognitionException { // $ANTLR start "entryRuleWeightedMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:634:1: - // entryRuleWeightedMetric returns [EObject current=null] : iv_ruleWeightedMetric= + // entryRuleWeightedMetric returns [EObject current=null] : + // iv_ruleWeightedMetric= // ruleWeightedMetric EOF ; public final EObject entryRuleWeightedMetric() throws RecognitionException { EObject current = null; @@ -1467,22 +1484,22 @@ public final EObject entryRuleWeightedMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:636:2: // iv_ruleWeightedMetric= ruleWeightedMetric EOF { - this.newCompositeNode(this.grammarAccess.getWeightedMetricRule()); - this.pushFollow(FOLLOW_ruleWeightedMetric_in_entryRuleWeightedMetric1328); - iv_ruleWeightedMetric = this.ruleWeightedMetric(); + newCompositeNode(grammarAccess.getWeightedMetricRule()); + pushFollow(FOLLOW_ruleWeightedMetric_in_entryRuleWeightedMetric1328); + iv_ruleWeightedMetric = ruleWeightedMetric(); - this.state._fsp--; + state._fsp--; current = iv_ruleWeightedMetric; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleWeightedMetric1338); + match(input, EOF, FOLLOW_EOF_in_entryRuleWeightedMetric1338); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1491,7 +1508,8 @@ public final EObject entryRuleWeightedMetric() throws RecognitionException { // $ANTLR start "ruleWeightedMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:643:1: - // ruleWeightedMetric returns [EObject current=null] : (otherlv_0= 'WeigthedSum' otherlv_1= '{' + // ruleWeightedMetric returns [EObject current=null] : (otherlv_0= 'WeigthedSum' + // otherlv_1= '{' // ( (lv_weights_2_0= ruleMetricAndWeight ) )+ otherlv_3= '}' ) ; public final EObject ruleWeightedMetric() throws RecognitionException { EObject current = null; @@ -1501,38 +1519,41 @@ public final EObject ruleWeightedMetric() throws RecognitionException { Token otherlv_3 = null; EObject lv_weights_2_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:646:28: - // ( (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= ruleMetricAndWeight ) + // ( (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= + // ruleMetricAndWeight ) // )+ otherlv_3= '}' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:647:1: - // (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= ruleMetricAndWeight ) )+ + // (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= + // ruleMetricAndWeight ) )+ // otherlv_3= '}' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:647:1: - // (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= ruleMetricAndWeight ) + // (otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= + // ruleMetricAndWeight ) // )+ otherlv_3= '}' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:647:3: - // otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= ruleMetricAndWeight ) + // otherlv_0= 'WeigthedSum' otherlv_1= '{' ( (lv_weights_2_0= + // ruleMetricAndWeight ) // )+ otherlv_3= '}' { - otherlv_0 = (Token) this.match(this.input, 27, FOLLOW_27_in_ruleWeightedMetric1375); + otherlv_0 = (Token) match(input, 27, FOLLOW_27_in_ruleWeightedMetric1375); - this.newLeafNode(otherlv_0, this.grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getWeightedMetricAccess().getWeigthedSumKeyword_0()); - otherlv_1 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleWeightedMetric1387); + otherlv_1 = (Token) match(input, 16, FOLLOW_16_in_ruleWeightedMetric1387); - this.newLeafNode(otherlv_1, - this.grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); + newLeafNode(otherlv_1, grammarAccess.getWeightedMetricAccess().getLeftCurlyBracketKeyword_1()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:655:1: // ( (lv_weights_2_0= ruleMetricAndWeight ) )+ int cnt8 = 0; loop8: do { int alt8 = 2; - final int LA8_0 = this.input.LA(1); + final int LA8_0 = input.LA(1); if ((LA8_0 == 33)) { alt8 = 1; @@ -1549,20 +1570,19 @@ public final EObject ruleWeightedMetric() throws RecognitionException { // lv_weights_2_0= ruleMetricAndWeight { - this.newCompositeNode(this.grammarAccess.getWeightedMetricAccess() + newCompositeNode(grammarAccess.getWeightedMetricAccess() .getWeightsMetricAndWeightParserRuleCall_2_0()); - this.pushFollow(FOLLOW_ruleMetricAndWeight_in_ruleWeightedMetric1408); - lv_weights_2_0 = this.ruleMetricAndWeight(); + pushFollow(FOLLOW_ruleMetricAndWeight_in_ruleWeightedMetric1408); + lv_weights_2_0 = ruleMetricAndWeight(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this - .createModelElementForParent(this.grammarAccess.getWeightedMetricRule()); + current = this.createModelElementForParent(grammarAccess.getWeightedMetricRule()); } this.add(current, "weights", lv_weights_2_0, "MetricAndWeight"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } @@ -1573,27 +1593,26 @@ public final EObject ruleWeightedMetric() throws RecognitionException { if (cnt8 >= 1) { break loop8; } - final EarlyExitException eee = new EarlyExitException(8, this.input); + final EarlyExitException eee = new EarlyExitException(8, input); throw eee; } cnt8++; } while (true); - otherlv_3 = (Token) this.match(this.input, 17, FOLLOW_17_in_ruleWeightedMetric1421); + otherlv_3 = (Token) match(input, 17, FOLLOW_17_in_ruleWeightedMetric1421); - this.newLeafNode(otherlv_3, - this.grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); + newLeafNode(otherlv_3, grammarAccess.getWeightedMetricAccess().getRightCurlyBracketKeyword_3()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1602,7 +1621,8 @@ public final EObject ruleWeightedMetric() throws RecognitionException { // $ANTLR start "entryRuleStepwiseMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:685:1: - // entryRuleStepwiseMetric returns [EObject current=null] : iv_ruleStepwiseMetric= + // entryRuleStepwiseMetric returns [EObject current=null] : + // iv_ruleStepwiseMetric= // ruleStepwiseMetric EOF ; public final EObject entryRuleStepwiseMetric() throws RecognitionException { EObject current = null; @@ -1615,22 +1635,22 @@ public final EObject entryRuleStepwiseMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:687:2: // iv_ruleStepwiseMetric= ruleStepwiseMetric EOF { - this.newCompositeNode(this.grammarAccess.getStepwiseMetricRule()); - this.pushFollow(FOLLOW_ruleStepwiseMetric_in_entryRuleStepwiseMetric1457); - iv_ruleStepwiseMetric = this.ruleStepwiseMetric(); + newCompositeNode(grammarAccess.getStepwiseMetricRule()); + pushFollow(FOLLOW_ruleStepwiseMetric_in_entryRuleStepwiseMetric1457); + iv_ruleStepwiseMetric = ruleStepwiseMetric(); - this.state._fsp--; + state._fsp--; current = iv_ruleStepwiseMetric; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleStepwiseMetric1467); + match(input, EOF, FOLLOW_EOF_in_entryRuleStepwiseMetric1467); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1639,8 +1659,10 @@ public final EObject entryRuleStepwiseMetric() throws RecognitionException { // $ANTLR start "ruleStepwiseMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:694:1: - // ruleStepwiseMetric returns [EObject current=null] : (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( - // ruleMYID ) ) otherlv_3= ']' otherlv_4= '{' ( (lv_steps_5_0= ruleBoundAndWeight ) )* + // ruleStepwiseMetric returns [EObject current=null] : (otherlv_0= 'Stepwise' + // otherlv_1= '[' ( ( + // ruleMYID ) ) otherlv_3= ']' otherlv_4= '{' ( (lv_steps_5_0= + // ruleBoundAndWeight ) )* // otherlv_6= '}' ) ; public final EObject ruleStepwiseMetric() throws RecognitionException { EObject current = null; @@ -1652,31 +1674,34 @@ public final EObject ruleStepwiseMetric() throws RecognitionException { Token otherlv_6 = null; EObject lv_steps_5_0 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:697:28: - // ( (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' otherlv_4= + // ( (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' + // otherlv_4= // '{' ( (lv_steps_5_0= ruleBoundAndWeight ) )* otherlv_6= '}' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:698:1: - // (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' otherlv_4= '{' + // (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' + // otherlv_4= '{' // ( (lv_steps_5_0= ruleBoundAndWeight ) )* otherlv_6= '}' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:698:1: - // (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' otherlv_4= + // (otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' + // otherlv_4= // '{' ( (lv_steps_5_0= ruleBoundAndWeight ) )* otherlv_6= '}' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:698:3: - // otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' otherlv_4= + // otherlv_0= 'Stepwise' otherlv_1= '[' ( ( ruleMYID ) ) otherlv_3= ']' + // otherlv_4= // '{' ( (lv_steps_5_0= ruleBoundAndWeight ) )* otherlv_6= '}' { - otherlv_0 = (Token) this.match(this.input, 28, FOLLOW_28_in_ruleStepwiseMetric1504); + otherlv_0 = (Token) match(input, 28, FOLLOW_28_in_ruleStepwiseMetric1504); - this.newLeafNode(otherlv_0, this.grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getStepwiseMetricAccess().getStepwiseKeyword_0()); - otherlv_1 = (Token) this.match(this.input, 29, FOLLOW_29_in_ruleStepwiseMetric1516); + otherlv_1 = (Token) match(input, 29, FOLLOW_29_in_ruleStepwiseMetric1516); - this.newLeafNode(otherlv_1, - this.grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); + newLeafNode(otherlv_1, grammarAccess.getStepwiseMetricAccess().getLeftSquareBracketKeyword_1()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:706:1: // ( ( ruleMYID ) ) @@ -1690,38 +1715,36 @@ public final EObject ruleStepwiseMetric() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getStepwiseMetricRule()); + current = this.createModelElement(grammarAccess.getStepwiseMetricRule()); } - this.newCompositeNode(this.grammarAccess.getStepwiseMetricAccess() - .getInnerMetricMetricCrossReference_2_0()); + newCompositeNode( + grammarAccess.getStepwiseMetricAccess().getInnerMetricMetricCrossReference_2_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleStepwiseMetric1539); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleStepwiseMetric1539); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_3 = (Token) this.match(this.input, 30, FOLLOW_30_in_ruleStepwiseMetric1551); + otherlv_3 = (Token) match(input, 30, FOLLOW_30_in_ruleStepwiseMetric1551); - this.newLeafNode(otherlv_3, - this.grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); + newLeafNode(otherlv_3, grammarAccess.getStepwiseMetricAccess().getRightSquareBracketKeyword_3()); - otherlv_4 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleStepwiseMetric1563); + otherlv_4 = (Token) match(input, 16, FOLLOW_16_in_ruleStepwiseMetric1563); - this.newLeafNode(otherlv_4, - this.grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getStepwiseMetricAccess().getLeftCurlyBracketKeyword_4()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:729:1: // ( (lv_steps_5_0= ruleBoundAndWeight ) )* loop9: do { int alt9 = 2; - final int LA9_0 = this.input.LA(1); + final int LA9_0 = input.LA(1); if ((LA9_0 == 33)) { alt9 = 1; @@ -1738,20 +1761,19 @@ public final EObject ruleStepwiseMetric() throws RecognitionException { // lv_steps_5_0= ruleBoundAndWeight { - this.newCompositeNode(this.grammarAccess.getStepwiseMetricAccess() + newCompositeNode(grammarAccess.getStepwiseMetricAccess() .getStepsBoundAndWeightParserRuleCall_5_0()); - this.pushFollow(FOLLOW_ruleBoundAndWeight_in_ruleStepwiseMetric1584); - lv_steps_5_0 = this.ruleBoundAndWeight(); + pushFollow(FOLLOW_ruleBoundAndWeight_in_ruleStepwiseMetric1584); + lv_steps_5_0 = ruleBoundAndWeight(); - this.state._fsp--; + state._fsp--; if (current == null) { - current = this - .createModelElementForParent(this.grammarAccess.getStepwiseMetricRule()); + current = this.createModelElementForParent(grammarAccess.getStepwiseMetricRule()); } this.add(current, "steps", lv_steps_5_0, "BoundAndWeight"); - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } @@ -1763,21 +1785,20 @@ public final EObject ruleStepwiseMetric() throws RecognitionException { } } while (true); - otherlv_6 = (Token) this.match(this.input, 17, FOLLOW_17_in_ruleStepwiseMetric1597); + otherlv_6 = (Token) match(input, 17, FOLLOW_17_in_ruleStepwiseMetric1597); - this.newLeafNode(otherlv_6, - this.grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); + newLeafNode(otherlv_6, grammarAccess.getStepwiseMetricAccess().getRightCurlyBracketKeyword_6()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1786,7 +1807,8 @@ public final EObject ruleStepwiseMetric() throws RecognitionException { // $ANTLR start "entryRuleRatioMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:759:1: - // entryRuleRatioMetric returns [EObject current=null] : iv_ruleRatioMetric= ruleRatioMetric EOF + // entryRuleRatioMetric returns [EObject current=null] : iv_ruleRatioMetric= + // ruleRatioMetric EOF // ; public final EObject entryRuleRatioMetric() throws RecognitionException { EObject current = null; @@ -1799,22 +1821,22 @@ public final EObject entryRuleRatioMetric() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:761:2: // iv_ruleRatioMetric= ruleRatioMetric EOF { - this.newCompositeNode(this.grammarAccess.getRatioMetricRule()); - this.pushFollow(FOLLOW_ruleRatioMetric_in_entryRuleRatioMetric1633); - iv_ruleRatioMetric = this.ruleRatioMetric(); + newCompositeNode(grammarAccess.getRatioMetricRule()); + pushFollow(FOLLOW_ruleRatioMetric_in_entryRuleRatioMetric1633); + iv_ruleRatioMetric = ruleRatioMetric(); - this.state._fsp--; + state._fsp--; current = iv_ruleRatioMetric; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleRatioMetric1643); + match(input, EOF, FOLLOW_EOF_in_entryRuleRatioMetric1643); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1823,7 +1845,8 @@ public final EObject entryRuleRatioMetric() throws RecognitionException { // $ANTLR start "ruleRatioMetric" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:768:1: - // ruleRatioMetric returns [EObject current=null] : (otherlv_0= 'Ratio' otherlv_1= '{' ( ( + // ruleRatioMetric returns [EObject current=null] : (otherlv_0= 'Ratio' + // otherlv_1= '{' ( ( // ruleMYID ) ) otherlv_3= '/' ( ( ruleMYID ) ) otherlv_5= '}' ) ; public final EObject ruleRatioMetric() throws RecognitionException { EObject current = null; @@ -1833,31 +1856,34 @@ public final EObject ruleRatioMetric() throws RecognitionException { Token otherlv_3 = null; Token otherlv_5 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:771:28: - // ( (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( ruleMYID ) ) + // ( (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( + // ruleMYID ) ) // otherlv_5= '}' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:772:1: - // (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( ruleMYID ) ) + // (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( + // ruleMYID ) ) // otherlv_5= '}' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:772:1: - // (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( ruleMYID ) + // (otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( + // ruleMYID ) // ) otherlv_5= '}' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:772:3: - // otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( ruleMYID ) + // otherlv_0= 'Ratio' otherlv_1= '{' ( ( ruleMYID ) ) otherlv_3= '/' ( ( + // ruleMYID ) // ) otherlv_5= '}' { - otherlv_0 = (Token) this.match(this.input, 31, FOLLOW_31_in_ruleRatioMetric1680); + otherlv_0 = (Token) match(input, 31, FOLLOW_31_in_ruleRatioMetric1680); - this.newLeafNode(otherlv_0, this.grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getRatioMetricAccess().getRatioKeyword_0()); - otherlv_1 = (Token) this.match(this.input, 16, FOLLOW_16_in_ruleRatioMetric1692); + otherlv_1 = (Token) match(input, 16, FOLLOW_16_in_ruleRatioMetric1692); - this.newLeafNode(otherlv_1, - this.grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); + newLeafNode(otherlv_1, grammarAccess.getRatioMetricAccess().getLeftCurlyBracketKeyword_1()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:780:1: // ( ( ruleMYID ) ) @@ -1871,26 +1897,26 @@ public final EObject ruleRatioMetric() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getRatioMetricRule()); + current = this.createModelElement(grammarAccess.getRatioMetricRule()); } - this.newCompositeNode(this.grammarAccess.getRatioMetricAccess() - .getNominatorMetricMetricCrossReference_2_0()); + newCompositeNode( + grammarAccess.getRatioMetricAccess().getNominatorMetricMetricCrossReference_2_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleRatioMetric1715); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleRatioMetric1715); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_3 = (Token) this.match(this.input, 32, FOLLOW_32_in_ruleRatioMetric1727); + otherlv_3 = (Token) match(input, 32, FOLLOW_32_in_ruleRatioMetric1727); - this.newLeafNode(otherlv_3, this.grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); + newLeafNode(otherlv_3, grammarAccess.getRatioMetricAccess().getSolidusKeyword_3()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:799:1: // ( ( ruleMYID ) ) @@ -1904,38 +1930,37 @@ public final EObject ruleRatioMetric() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getRatioMetricRule()); + current = this.createModelElement(grammarAccess.getRatioMetricRule()); } - this.newCompositeNode(this.grammarAccess.getRatioMetricAccess() + newCompositeNode(grammarAccess.getRatioMetricAccess() .getDenominatorMetricMetricCrossReference_4_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleRatioMetric1750); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleRatioMetric1750); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_5 = (Token) this.match(this.input, 17, FOLLOW_17_in_ruleRatioMetric1762); + otherlv_5 = (Token) match(input, 17, FOLLOW_17_in_ruleRatioMetric1762); - this.newLeafNode(otherlv_5, - this.grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); + newLeafNode(otherlv_5, grammarAccess.getRatioMetricAccess().getRightCurlyBracketKeyword_5()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1944,7 +1969,8 @@ public final EObject ruleRatioMetric() throws RecognitionException { // $ANTLR start "entryRuleBoundAndWeight" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:826:1: - // entryRuleBoundAndWeight returns [EObject current=null] : iv_ruleBoundAndWeight= + // entryRuleBoundAndWeight returns [EObject current=null] : + // iv_ruleBoundAndWeight= // ruleBoundAndWeight EOF ; public final EObject entryRuleBoundAndWeight() throws RecognitionException { EObject current = null; @@ -1957,22 +1983,22 @@ public final EObject entryRuleBoundAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:828:2: // iv_ruleBoundAndWeight= ruleBoundAndWeight EOF { - this.newCompositeNode(this.grammarAccess.getBoundAndWeightRule()); - this.pushFollow(FOLLOW_ruleBoundAndWeight_in_entryRuleBoundAndWeight1798); - iv_ruleBoundAndWeight = this.ruleBoundAndWeight(); + newCompositeNode(grammarAccess.getBoundAndWeightRule()); + pushFollow(FOLLOW_ruleBoundAndWeight_in_entryRuleBoundAndWeight1798); + iv_ruleBoundAndWeight = ruleBoundAndWeight(); - this.state._fsp--; + state._fsp--; current = iv_ruleBoundAndWeight; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleBoundAndWeight1808); + match(input, EOF, FOLLOW_EOF_in_entryRuleBoundAndWeight1808); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -1981,7 +2007,8 @@ public final EObject entryRuleBoundAndWeight() throws RecognitionException { // $ANTLR start "ruleBoundAndWeight" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:835:1: - // ruleBoundAndWeight returns [EObject current=null] : (otherlv_0= '<' ( ( ruleMYID ) ) + // ruleBoundAndWeight returns [EObject current=null] : (otherlv_0= '<' ( ( + // ruleMYID ) ) // otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) ; public final EObject ruleBoundAndWeight() throws RecognitionException { EObject current = null; @@ -1990,23 +2017,26 @@ public final EObject ruleBoundAndWeight() throws RecognitionException { Token otherlv_2 = null; Token otherlv_4 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:838:28: - // ( (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) ) + // ( (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:839:1: - // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) + // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:839:1: - // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) + // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:839:3: - // otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' + // otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' { - otherlv_0 = (Token) this.match(this.input, 33, FOLLOW_33_in_ruleBoundAndWeight1845); + otherlv_0 = (Token) match(input, 33, FOLLOW_33_in_ruleBoundAndWeight1845); - this.newLeafNode(otherlv_0, - this.grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getBoundAndWeightAccess().getLessThanSignKeyword_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:843:1: // ( ( ruleMYID ) ) @@ -2020,26 +2050,26 @@ public final EObject ruleBoundAndWeight() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getBoundAndWeightRule()); + current = this.createModelElement(grammarAccess.getBoundAndWeightRule()); } - this.newCompositeNode(this.grammarAccess.getBoundAndWeightAccess() - .getUpperBoundNumberCrossReference_1_0()); + newCompositeNode( + grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberCrossReference_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleBoundAndWeight1868); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleBoundAndWeight1868); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_2 = (Token) this.match(this.input, 20, FOLLOW_20_in_ruleBoundAndWeight1880); + otherlv_2 = (Token) match(input, 20, FOLLOW_20_in_ruleBoundAndWeight1880); - this.newLeafNode(otherlv_2, this.grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getBoundAndWeightAccess().getCommaKeyword_2()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:862:1: // ( ( ruleMYID ) ) @@ -2053,38 +2083,37 @@ public final EObject ruleBoundAndWeight() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getBoundAndWeightRule()); + current = this.createModelElement(grammarAccess.getBoundAndWeightRule()); } - this.newCompositeNode( - this.grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); + newCompositeNode( + grammarAccess.getBoundAndWeightAccess().getWeightNumberCrossReference_3_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleBoundAndWeight1903); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleBoundAndWeight1903); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_4 = (Token) this.match(this.input, 34, FOLLOW_34_in_ruleBoundAndWeight1915); + otherlv_4 = (Token) match(input, 34, FOLLOW_34_in_ruleBoundAndWeight1915); - this.newLeafNode(otherlv_4, - this.grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getBoundAndWeightAccess().getGreaterThanSignKeyword_4()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -2093,7 +2122,8 @@ public final EObject ruleBoundAndWeight() throws RecognitionException { // $ANTLR start "entryRuleMetricAndWeight" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:889:1: - // entryRuleMetricAndWeight returns [EObject current=null] : iv_ruleMetricAndWeight= + // entryRuleMetricAndWeight returns [EObject current=null] : + // iv_ruleMetricAndWeight= // ruleMetricAndWeight EOF ; public final EObject entryRuleMetricAndWeight() throws RecognitionException { EObject current = null; @@ -2106,22 +2136,22 @@ public final EObject entryRuleMetricAndWeight() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:891:2: // iv_ruleMetricAndWeight= ruleMetricAndWeight EOF { - this.newCompositeNode(this.grammarAccess.getMetricAndWeightRule()); - this.pushFollow(FOLLOW_ruleMetricAndWeight_in_entryRuleMetricAndWeight1951); - iv_ruleMetricAndWeight = this.ruleMetricAndWeight(); + newCompositeNode(grammarAccess.getMetricAndWeightRule()); + pushFollow(FOLLOW_ruleMetricAndWeight_in_entryRuleMetricAndWeight1951); + iv_ruleMetricAndWeight = ruleMetricAndWeight(); - this.state._fsp--; + state._fsp--; current = iv_ruleMetricAndWeight; - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMetricAndWeight1961); + match(input, EOF, FOLLOW_EOF_in_entryRuleMetricAndWeight1961); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -2130,7 +2160,8 @@ public final EObject entryRuleMetricAndWeight() throws RecognitionException { // $ANTLR start "ruleMetricAndWeight" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:898:1: - // ruleMetricAndWeight returns [EObject current=null] : (otherlv_0= '<' ( ( ruleMYID ) ) + // ruleMetricAndWeight returns [EObject current=null] : (otherlv_0= '<' ( ( + // ruleMYID ) ) // otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) ; public final EObject ruleMetricAndWeight() throws RecognitionException { EObject current = null; @@ -2139,23 +2170,26 @@ public final EObject ruleMetricAndWeight() throws RecognitionException { Token otherlv_2 = null; Token otherlv_4 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:901:28: - // ( (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) ) + // ( (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:902:1: - // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) + // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:902:1: - // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' ) + // (otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' ) // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:902:3: - // otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= '>' + // otherlv_0= '<' ( ( ruleMYID ) ) otherlv_2= ',' ( ( ruleMYID ) ) otherlv_4= + // '>' { - otherlv_0 = (Token) this.match(this.input, 33, FOLLOW_33_in_ruleMetricAndWeight1998); + otherlv_0 = (Token) match(input, 33, FOLLOW_33_in_ruleMetricAndWeight1998); - this.newLeafNode(otherlv_0, - this.grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getMetricAndWeightAccess().getLessThanSignKeyword_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:906:1: // ( ( ruleMYID ) ) @@ -2169,26 +2203,26 @@ public final EObject ruleMetricAndWeight() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getMetricAndWeightRule()); + current = this.createModelElement(grammarAccess.getMetricAndWeightRule()); } - this.newCompositeNode( - this.grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); + newCompositeNode( + grammarAccess.getMetricAndWeightAccess().getMetricMetricCrossReference_1_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleMetricAndWeight2021); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleMetricAndWeight2021); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_2 = (Token) this.match(this.input, 20, FOLLOW_20_in_ruleMetricAndWeight2033); + otherlv_2 = (Token) match(input, 20, FOLLOW_20_in_ruleMetricAndWeight2033); - this.newLeafNode(otherlv_2, this.grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getMetricAndWeightAccess().getCommaKeyword_2()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:925:1: // ( ( ruleMYID ) ) @@ -2202,38 +2236,37 @@ public final EObject ruleMetricAndWeight() throws RecognitionException { { if (current == null) { - current = this.createModelElement(this.grammarAccess.getMetricAndWeightRule()); + current = this.createModelElement(grammarAccess.getMetricAndWeightRule()); } - this.newCompositeNode( - this.grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); + newCompositeNode( + grammarAccess.getMetricAndWeightAccess().getWeightNumberCrossReference_3_0()); - this.pushFollow(FOLLOW_ruleMYID_in_ruleMetricAndWeight2056); - this.ruleMYID(); + pushFollow(FOLLOW_ruleMYID_in_ruleMetricAndWeight2056); + ruleMYID(); - this.state._fsp--; + state._fsp--; - this.afterParserOrEnumRuleCall(); + afterParserOrEnumRuleCall(); } } - otherlv_4 = (Token) this.match(this.input, 34, FOLLOW_34_in_ruleMetricAndWeight2068); + otherlv_4 = (Token) match(input, 34, FOLLOW_34_in_ruleMetricAndWeight2068); - this.newLeafNode(otherlv_4, - this.grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); + newLeafNode(otherlv_4, grammarAccess.getMetricAndWeightAccess().getGreaterThanSignKeyword_4()); } } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -2254,22 +2287,22 @@ public final String entryRuleMYID() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:954:2: // iv_ruleMYID= ruleMYID EOF { - this.newCompositeNode(this.grammarAccess.getMYIDRule()); - this.pushFollow(FOLLOW_ruleMYID_in_entryRuleMYID2105); - iv_ruleMYID = this.ruleMYID(); + newCompositeNode(grammarAccess.getMYIDRule()); + pushFollow(FOLLOW_ruleMYID_in_entryRuleMYID2105); + iv_ruleMYID = ruleMYID(); - this.state._fsp--; + state._fsp--; current = iv_ruleMYID.getText(); - this.match(this.input, EOF, FOLLOW_EOF_in_entryRuleMYID2116); + match(input, EOF, FOLLOW_EOF_in_entryRuleMYID2116); } } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; @@ -2278,7 +2311,8 @@ public final String entryRuleMYID() throws RecognitionException { // $ANTLR start "ruleMYID" // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:961:1: - // ruleMYID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= + // ruleMYID returns [AntlrDatatypeRuleToken current=new + // AntlrDatatypeRuleToken()] : (this_ID_0= // RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ; public final AntlrDatatypeRuleToken ruleMYID() throws RecognitionException { final AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -2287,7 +2321,7 @@ public final AntlrDatatypeRuleToken ruleMYID() throws RecognitionException { Token kw = null; Token this_ID_2 = null; - this.enterRule(); + enterRule(); try { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:964:28: @@ -2300,17 +2334,17 @@ public final AntlrDatatypeRuleToken ruleMYID() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:965:6: // this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* { - this_ID_0 = (Token) this.match(this.input, RULE_ID, FOLLOW_RULE_ID_in_ruleMYID2156); + this_ID_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleMYID2156); current.merge(this_ID_0); - this.newLeafNode(this_ID_0, this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); + newLeafNode(this_ID_0, grammarAccess.getMYIDAccess().getIDTerminalRuleCall_0()); // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:972:1: // (kw= '.' this_ID_2= RULE_ID )* loop10: do { int alt10 = 2; - final int LA10_0 = this.input.LA(1); + final int LA10_0 = input.LA(1); if ((LA10_0 == 35)) { alt10 = 1; @@ -2321,16 +2355,16 @@ public final AntlrDatatypeRuleToken ruleMYID() throws RecognitionException { // ../org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/parser/antlr/internal/InternalMetricDSL.g:973:2: // kw= '.' this_ID_2= RULE_ID { - kw = (Token) this.match(this.input, 35, FOLLOW_35_in_ruleMYID2175); + kw = (Token) match(input, 35, FOLLOW_35_in_ruleMYID2175); current.merge(kw); - this.newLeafNode(kw, this.grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); + newLeafNode(kw, grammarAccess.getMYIDAccess().getFullStopKeyword_1_0()); - this_ID_2 = (Token) this.match(this.input, RULE_ID, FOLLOW_RULE_ID_in_ruleMYID2190); + this_ID_2 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleMYID2190); current.merge(this_ID_2); - this.newLeafNode(this_ID_2, this.grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); + newLeafNode(this_ID_2, grammarAccess.getMYIDAccess().getIDTerminalRuleCall_1_1()); } break; @@ -2344,12 +2378,12 @@ public final AntlrDatatypeRuleToken ruleMYID() throws RecognitionException { } - this.leaveRule(); + leaveRule(); } catch (final RecognitionException re) { - this.recover(this.input, re); - this.appendSkippedTokens(); + recover(input, re); + appendSkippedTokens(); } finally { } return current; diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSemanticSequencer.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSemanticSequencer.java index 02397ae..7ffddb1 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSemanticSequencer.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSemanticSequencer.java @@ -31,85 +31,81 @@ public void createSequence(final EObject context, final EObject semanticObject) if (semanticObject.eClass().getEPackage() == MetricDSLPackage.eINSTANCE) { switch (semanticObject.eClass().getClassifierID()) { case MetricDSLPackage.BOUND_AND_WEIGHT: - if (context == this.grammarAccess.getBoundAndWeightRule()) { - this.sequence_BoundAndWeight(context, (BoundAndWeight) semanticObject); + if (context == grammarAccess.getBoundAndWeightRule()) { + sequence_BoundAndWeight(context, (BoundAndWeight) semanticObject); return; } else { break; } case MetricDSLPackage.CONSTANT: - if (context == this.grammarAccess.getConstantRule() || context == this.grammarAccess.getNumberRule()) { - this.sequence_Constant(context, (Constant) semanticObject); + if ((context == grammarAccess.getConstantRule()) || (context == grammarAccess.getNumberRule())) { + sequence_Constant(context, (Constant) semanticObject); return; } else { break; } case MetricDSLPackage.EXTERNAL_METRIC: - if (context == this.grammarAccess.getExternalMetricRule() - || context == this.grammarAccess.getMetricRule()) { - this.sequence_ExternalMetric(context, (ExternalMetric) semanticObject); + if ((context == grammarAccess.getExternalMetricRule()) || (context == grammarAccess.getMetricRule())) { + sequence_ExternalMetric(context, (ExternalMetric) semanticObject); return; } else { break; } case MetricDSLPackage.INTERNAL_METRIC: - if (context == this.grammarAccess.getInternalMetricRule() - || context == this.grammarAccess.getMetricRule()) { - this.sequence_InternalMetric(context, (InternalMetric) semanticObject); + if ((context == grammarAccess.getInternalMetricRule()) || (context == grammarAccess.getMetricRule())) { + sequence_InternalMetric(context, (InternalMetric) semanticObject); return; } else { break; } case MetricDSLPackage.METRIC_AND_WEIGHT: - if (context == this.grammarAccess.getMetricAndWeightRule()) { - this.sequence_MetricAndWeight(context, (MetricAndWeight) semanticObject); + if (context == grammarAccess.getMetricAndWeightRule()) { + sequence_MetricAndWeight(context, (MetricAndWeight) semanticObject); return; } else { break; } case MetricDSLPackage.METRIC_MODEL: - if (context == this.grammarAccess.getMetricModelRule()) { - this.sequence_MetricModel(context, (MetricModel) semanticObject); + if (context == grammarAccess.getMetricModelRule()) { + sequence_MetricModel(context, (MetricModel) semanticObject); return; } else { break; } case MetricDSLPackage.PARAMETER: - if (context == this.grammarAccess.getNumberRule() || context == this.grammarAccess.getParameterRule()) { - this.sequence_Parameter(context, (Parameter) semanticObject); + if ((context == grammarAccess.getNumberRule()) || (context == grammarAccess.getParameterRule())) { + sequence_Parameter(context, (Parameter) semanticObject); return; } else { break; } case MetricDSLPackage.RATIO_METRIC: - if (context == this.grammarAccess.getMetricDefinitionRule() - || context == this.grammarAccess.getRatioMetricRule()) { - this.sequence_RatioMetric(context, (RatioMetric) semanticObject); + if ((context == grammarAccess.getMetricDefinitionRule()) + || (context == grammarAccess.getRatioMetricRule())) { + sequence_RatioMetric(context, (RatioMetric) semanticObject); return; } else { break; } case MetricDSLPackage.STEPWISE_METRIC: - if (context == this.grammarAccess.getMetricDefinitionRule() - || context == this.grammarAccess.getStepwiseMetricRule()) { - this.sequence_StepwiseMetric(context, (StepwiseMetric) semanticObject); + if ((context == grammarAccess.getMetricDefinitionRule()) + || (context == grammarAccess.getStepwiseMetricRule())) { + sequence_StepwiseMetric(context, (StepwiseMetric) semanticObject); return; } else { break; } case MetricDSLPackage.WEIGHTED_METRIC: - if (context == this.grammarAccess.getMetricDefinitionRule() - || context == this.grammarAccess.getWeightedMetricRule()) { - this.sequence_WeightedMetric(context, (WeightedMetric) semanticObject); + if ((context == grammarAccess.getMetricDefinitionRule()) + || (context == grammarAccess.getWeightedMetricRule())) { + sequence_WeightedMetric(context, (WeightedMetric) semanticObject); return; - } else { - break; } + break; } } - if (this.errorAcceptor != null) { - this.errorAcceptor - .accept(this.diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context)); + if (errorAcceptor != null) { + errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context)); } } @@ -117,23 +113,23 @@ public void createSequence(final EObject context, final EObject semanticObject) * Constraint: (upperBound=[Number|MYID] weight=[Number|MYID]) */ protected void sequence_BoundAndWeight(final EObject context, final BoundAndWeight semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.BOUND_AND_WEIGHT__UPPER_BOUND) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.BOUND_AND_WEIGHT__UPPER_BOUND)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.BOUND_AND_WEIGHT__WEIGHT) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.BOUND_AND_WEIGHT__WEIGHT)); } } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberMYIDParserRuleCall_1_0_1(), + feeder.accept(grammarAccess.getBoundAndWeightAccess().getUpperBoundNumberMYIDParserRuleCall_1_0_1(), semanticObject.getUpperBound()); - feeder.accept(this.grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1(), + feeder.accept(grammarAccess.getBoundAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1(), semanticObject.getWeight()); feeder.finish(); } @@ -142,22 +138,22 @@ protected void sequence_BoundAndWeight(final EObject context, final BoundAndWeig * Constraint: (name=MYID value=DOUBLE) */ protected void sequence_Constant(final EObject context, final Constant semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.NUMBER__NAME) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.NUMBER__NAME)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.CONSTANT__VALUE) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.CONSTANT__VALUE)); } } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0(), semanticObject.getName()); - feeder.accept(this.grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0(), + feeder.accept(grammarAccess.getConstantAccess().getNameMYIDParserRuleCall_1_0(), semanticObject.getName()); + feeder.accept(grammarAccess.getConstantAccess().getValueDOUBLETerminalRuleCall_3_0(), semanticObject.getValue()); feeder.finish(); } @@ -166,17 +162,14 @@ protected void sequence_Constant(final EObject context, final Constant semanticO * Constraint: name=MYID */ protected void sequence_ExternalMetric(final EObject context, final ExternalMetric semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, - MetricDSLPackage.Literals.METRIC__NAME) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, - MetricDSLPackage.Literals.METRIC__NAME)); - } + if ((errorAcceptor != null) && (transientValues.isValueTransient(semanticObject, + MetricDSLPackage.Literals.METRIC__NAME) == ValueTransient.YES)) { + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, + MetricDSLPackage.Literals.METRIC__NAME)); } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0(), - semanticObject.getName()); + feeder.accept(grammarAccess.getExternalMetricAccess().getNameMYIDParserRuleCall_0(), semanticObject.getName()); feeder.finish(); } @@ -185,76 +178,77 @@ protected void sequence_ExternalMetric(final EObject context, final ExternalMetr * definition=MetricDefinition) */ protected void sequence_InternalMetric(final EObject context, final InternalMetric semanticObject) { - this.genericSequencer.createSequence(context, semanticObject); + genericSequencer.createSequence(context, semanticObject); } /** * Constraint: (metric=[Metric|MYID] weight=[Number|MYID]) */ protected void sequence_MetricAndWeight(final EObject context, final MetricAndWeight semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.METRIC_AND_WEIGHT__METRIC) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.METRIC_AND_WEIGHT__METRIC)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.METRIC_AND_WEIGHT__WEIGHT) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.METRIC_AND_WEIGHT__WEIGHT)); } } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getMetricAndWeightAccess().getMetricMetricMYIDParserRuleCall_1_0_1(), + feeder.accept(grammarAccess.getMetricAndWeightAccess().getMetricMetricMYIDParserRuleCall_1_0_1(), semanticObject.getMetric()); - feeder.accept(this.grammarAccess.getMetricAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1(), + feeder.accept(grammarAccess.getMetricAndWeightAccess().getWeightNumberMYIDParserRuleCall_3_0_1(), semanticObject.getWeight()); feeder.finish(); } /** - * Constraint: (importURI+=STRING* metrics+=ExternalMetric* metrics+=InternalMetric+) + * Constraint: (importURI+=STRING* metrics+=ExternalMetric* + * metrics+=InternalMetric+) */ protected void sequence_MetricModel(final EObject context, final MetricModel semanticObject) { - this.genericSequencer.createSequence(context, semanticObject); + genericSequencer.createSequence(context, semanticObject); } /** - * Constraint: (name=MYID shortname=STRING description=STRING defaultValue=DOUBLE) + * Constraint: (name=MYID shortname=STRING description=STRING + * defaultValue=DOUBLE) */ protected void sequence_Parameter(final EObject context, final Parameter semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.NUMBER__NAME) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.NUMBER__NAME)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.PARAMETER__SHORTNAME) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.PARAMETER__SHORTNAME)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.PARAMETER__DESCRIPTION) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.PARAMETER__DESCRIPTION)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.PARAMETER__DEFAULT_VALUE) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.PARAMETER__DEFAULT_VALUE)); } } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0(), - semanticObject.getName()); - feeder.accept(this.grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0(), + feeder.accept(grammarAccess.getParameterAccess().getNameMYIDParserRuleCall_1_0(), semanticObject.getName()); + feeder.accept(grammarAccess.getParameterAccess().getShortnameSTRINGTerminalRuleCall_3_0(), semanticObject.getShortname()); - feeder.accept(this.grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0(), + feeder.accept(grammarAccess.getParameterAccess().getDescriptionSTRINGTerminalRuleCall_5_0(), semanticObject.getDescription()); - feeder.accept(this.grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0(), + feeder.accept(grammarAccess.getParameterAccess().getDefaultValueDOUBLETerminalRuleCall_7_0(), semanticObject.getDefaultValue()); feeder.finish(); } @@ -263,23 +257,23 @@ protected void sequence_Parameter(final EObject context, final Parameter semanti * Constraint: (nominatorMetric=[Metric|MYID] denominatorMetric=[Metric|MYID]) */ protected void sequence_RatioMetric(final EObject context, final RatioMetric semanticObject) { - if (this.errorAcceptor != null) { - if (this.transientValues.isValueTransient(semanticObject, + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.RATIO_METRIC__NOMINATOR_METRIC) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.RATIO_METRIC__NOMINATOR_METRIC)); } - if (this.transientValues.isValueTransient(semanticObject, + if (transientValues.isValueTransient(semanticObject, MetricDSLPackage.Literals.RATIO_METRIC__DENOMINATOR_METRIC) == ValueTransient.YES) { - this.errorAcceptor.accept(this.diagnosticProvider.createFeatureValueMissing(semanticObject, + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MetricDSLPackage.Literals.RATIO_METRIC__DENOMINATOR_METRIC)); } } - final INodesForEObjectProvider nodes = this.createNodeProvider(semanticObject); + final INodesForEObjectProvider nodes = createNodeProvider(semanticObject); final SequenceFeeder feeder = this.createSequencerFeeder(semanticObject, nodes); - feeder.accept(this.grammarAccess.getRatioMetricAccess().getNominatorMetricMetricMYIDParserRuleCall_2_0_1(), + feeder.accept(grammarAccess.getRatioMetricAccess().getNominatorMetricMetricMYIDParserRuleCall_2_0_1(), semanticObject.getNominatorMetric()); - feeder.accept(this.grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricMYIDParserRuleCall_4_0_1(), + feeder.accept(grammarAccess.getRatioMetricAccess().getDenominatorMetricMetricMYIDParserRuleCall_4_0_1(), semanticObject.getDenominatorMetric()); feeder.finish(); } @@ -288,13 +282,13 @@ protected void sequence_RatioMetric(final EObject context, final RatioMetric sem * Constraint: (innerMetric=[Metric|MYID] steps+=BoundAndWeight*) */ protected void sequence_StepwiseMetric(final EObject context, final StepwiseMetric semanticObject) { - this.genericSequencer.createSequence(context, semanticObject); + genericSequencer.createSequence(context, semanticObject); } /** * Constraint: weights+=MetricAndWeight+ */ protected void sequence_WeightedMetric(final EObject context, final WeightedMetric semanticObject) { - this.genericSequencer.createSequence(context, semanticObject); + genericSequencer.createSequence(context, semanticObject); } } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSyntacticSequencer.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSyntacticSequencer.java index a8b66f8..a80fdf4 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSyntacticSequencer.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/serializer/MetricDSLSyntacticSequencer.java @@ -24,14 +24,13 @@ public class MetricDSLSyntacticSequencer extends AbstractSyntacticSequencer { @Inject protected void init(final IGrammarAccess access) { - this.grammarAccess = (MetricDSLGrammarAccess) access; - this.match_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q = new GroupAlias( + grammarAccess = (MetricDSLGrammarAccess) access; + match_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q = new GroupAlias( false, true, - new TokenAlias(false, false, this.grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()), + new TokenAlias(false, false, grammarAccess.getInternalMetricAccess().getParametersKeyword_8_0()), + new TokenAlias(false, false, grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()), new TokenAlias(false, false, - this.grammarAccess.getInternalMetricAccess().getLeftCurlyBracketKeyword_8_1()), - new TokenAlias(false, false, - this.grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3())); + grammarAccess.getInternalMetricAccess().getRightCurlyBracketKeyword_8_3())); } @Override @@ -46,15 +45,15 @@ protected void emitUnassignedTokens(final EObject semanticObject, final ISynTran if (transition.getAmbiguousSyntaxes().isEmpty()) { return; } - final List transitionNodes = this.collectNodes(fromNode, toNode); + final List transitionNodes = collectNodes(fromNode, toNode); for (final AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) { - final List syntaxNodes = this.getNodesFor(transitionNodes, syntax); - if (this.match_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q + final List syntaxNodes = getNodesFor(transitionNodes, syntax); + if (match_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q .equals(syntax)) { - this.emit_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q( - semanticObject, this.getLastNavigableState(), syntaxNodes); + emit_InternalMetric___ParametersKeyword_8_0_LeftCurlyBracketKeyword_8_1_RightCurlyBracketKeyword_8_3__q( + semanticObject, getLastNavigableState(), syntaxNodes); } else { - this.acceptNodes(this.getLastNavigableState(), syntaxNodes); + this.acceptNodes(getLastNavigableState(), syntaxNodes); } } } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/services/MetricDSLGrammarAccess.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/services/MetricDSLGrammarAccess.java index 1fa45c0..23fef66 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/services/MetricDSLGrammarAccess.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/services/MetricDSLGrammarAccess.java @@ -26,954 +26,948 @@ public class MetricDSLGrammarAccess extends AbstractGrammarElementFinder { public class MetricModelElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "MetricModel"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Group cGroup_0 = (Group) this.cGroup.eContents().get(0); - private final Keyword cImportKeyword_0_0 = (Keyword) this.cGroup_0.eContents().get(0); - private final Assignment cImportURIAssignment_0_1 = (Assignment) this.cGroup_0.eContents().get(1); - private final RuleCall cImportURISTRINGTerminalRuleCall_0_1_0 = (RuleCall) this.cImportURIAssignment_0_1 - .eContents().get(0); - private final Keyword cSemicolonKeyword_0_2 = (Keyword) this.cGroup_0.eContents().get(2); - private final Group cGroup_1 = (Group) this.cGroup.eContents().get(1); - private final Keyword cExternKeyword_1_0 = (Keyword) this.cGroup_1.eContents().get(0); - private final Assignment cMetricsAssignment_1_1 = (Assignment) this.cGroup_1.eContents().get(1); - private final RuleCall cMetricsExternalMetricParserRuleCall_1_1_0 = (RuleCall) this.cMetricsAssignment_1_1 - .eContents().get(0); - private final Keyword cSemicolonKeyword_1_2 = (Keyword) this.cGroup_1.eContents().get(2); - private final Keyword cMetricsKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword) this.cGroup.eContents().get(3); - private final Assignment cMetricsAssignment_4 = (Assignment) this.cGroup.eContents().get(4); - private final RuleCall cMetricsInternalMetricParserRuleCall_4_0 = (RuleCall) this.cMetricsAssignment_4 + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MetricModel"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Group cGroup_0 = (Group) cGroup.eContents().get(0); + private final Keyword cImportKeyword_0_0 = (Keyword) cGroup_0.eContents().get(0); + private final Assignment cImportURIAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1); + private final RuleCall cImportURISTRINGTerminalRuleCall_0_1_0 = (RuleCall) cImportURIAssignment_0_1.eContents() + .get(0); + private final Keyword cSemicolonKeyword_0_2 = (Keyword) cGroup_0.eContents().get(2); + private final Group cGroup_1 = (Group) cGroup.eContents().get(1); + private final Keyword cExternKeyword_1_0 = (Keyword) cGroup_1.eContents().get(0); + private final Assignment cMetricsAssignment_1_1 = (Assignment) cGroup_1.eContents().get(1); + private final RuleCall cMetricsExternalMetricParserRuleCall_1_1_0 = (RuleCall) cMetricsAssignment_1_1 .eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) this.cGroup.eContents().get(5); + private final Keyword cSemicolonKeyword_1_2 = (Keyword) cGroup_1.eContents().get(2); + private final Keyword cMetricsKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword) cGroup.eContents().get(3); + private final Assignment cMetricsAssignment_4 = (Assignment) cGroup.eContents().get(4); + private final RuleCall cMetricsInternalMetricParserRuleCall_4_0 = (RuleCall) cMetricsAssignment_4.eContents() + .get(0); + private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) cGroup.eContents().get(5); // MetricModel: - // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* "Metrics" "{" + // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* + // "Metrics" "{" // metrics+=InternalMetric+ "}"; @Override public ParserRule getRule() { - return this.rule; + return rule; } - // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* "Metrics" "{" + // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* + // "Metrics" "{" // metrics+=InternalMetric+ "}" public Group getGroup() { - return this.cGroup; + return cGroup; } // ("import" importURI+=STRING ";")* public Group getGroup_0() { - return this.cGroup_0; + return cGroup_0; } // "import" public Keyword getImportKeyword_0_0() { - return this.cImportKeyword_0_0; + return cImportKeyword_0_0; } // importURI+=STRING public Assignment getImportURIAssignment_0_1() { - return this.cImportURIAssignment_0_1; + return cImportURIAssignment_0_1; } // STRING public RuleCall getImportURISTRINGTerminalRuleCall_0_1_0() { - return this.cImportURISTRINGTerminalRuleCall_0_1_0; + return cImportURISTRINGTerminalRuleCall_0_1_0; } // ";" public Keyword getSemicolonKeyword_0_2() { - return this.cSemicolonKeyword_0_2; + return cSemicolonKeyword_0_2; } // ("extern" metrics+=ExternalMetric ";")* public Group getGroup_1() { - return this.cGroup_1; + return cGroup_1; } // "extern" public Keyword getExternKeyword_1_0() { - return this.cExternKeyword_1_0; + return cExternKeyword_1_0; } // metrics+=ExternalMetric public Assignment getMetricsAssignment_1_1() { - return this.cMetricsAssignment_1_1; + return cMetricsAssignment_1_1; } // ExternalMetric public RuleCall getMetricsExternalMetricParserRuleCall_1_1_0() { - return this.cMetricsExternalMetricParserRuleCall_1_1_0; + return cMetricsExternalMetricParserRuleCall_1_1_0; } // ";" public Keyword getSemicolonKeyword_1_2() { - return this.cSemicolonKeyword_1_2; + return cSemicolonKeyword_1_2; } // "Metrics" public Keyword getMetricsKeyword_2() { - return this.cMetricsKeyword_2; + return cMetricsKeyword_2; } // "{" public Keyword getLeftCurlyBracketKeyword_3() { - return this.cLeftCurlyBracketKeyword_3; + return cLeftCurlyBracketKeyword_3; } // metrics+=InternalMetric+ public Assignment getMetricsAssignment_4() { - return this.cMetricsAssignment_4; + return cMetricsAssignment_4; } // InternalMetric public RuleCall getMetricsInternalMetricParserRuleCall_4_0() { - return this.cMetricsInternalMetricParserRuleCall_4_0; + return cMetricsInternalMetricParserRuleCall_4_0; } // "}" public Keyword getRightCurlyBracketKeyword_5() { - return this.cRightCurlyBracketKeyword_5; + return cRightCurlyBracketKeyword_5; } } public class MetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "Metric"); - private final Alternatives cAlternatives = (Alternatives) this.rule.eContents().get(1); - private final RuleCall cExternalMetricParserRuleCall_0 = (RuleCall) this.cAlternatives.eContents().get(0); - private final RuleCall cInternalMetricParserRuleCall_1 = (RuleCall) this.cAlternatives.eContents().get(1); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Metric"); + private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1); + private final RuleCall cExternalMetricParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0); + private final RuleCall cInternalMetricParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1); // Metric: // ExternalMetric | InternalMetric; @Override public ParserRule getRule() { - return this.rule; + return rule; } // ExternalMetric | InternalMetric public Alternatives getAlternatives() { - return this.cAlternatives; + return cAlternatives; } // ExternalMetric public RuleCall getExternalMetricParserRuleCall_0() { - return this.cExternalMetricParserRuleCall_0; + return cExternalMetricParserRuleCall_0; } // InternalMetric public RuleCall getInternalMetricParserRuleCall_1() { - return this.cInternalMetricParserRuleCall_1; + return cInternalMetricParserRuleCall_1; } } public class ExternalMetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "ExternalMetric"); - private final Assignment cNameAssignment = (Assignment) this.rule.eContents().get(1); - private final RuleCall cNameMYIDParserRuleCall_0 = (RuleCall) this.cNameAssignment.eContents().get(0); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExternalMetric"); + private final Assignment cNameAssignment = (Assignment) rule.eContents().get(1); + private final RuleCall cNameMYIDParserRuleCall_0 = (RuleCall) cNameAssignment.eContents().get(0); // ExternalMetric: // name=MYID; @Override public ParserRule getRule() { - return this.rule; + return rule; } // name=MYID public Assignment getNameAssignment() { - return this.cNameAssignment; + return cNameAssignment; } // MYID public RuleCall getNameMYIDParserRuleCall_0() { - return this.cNameMYIDParserRuleCall_0; + return cNameMYIDParserRuleCall_0; } } public class InternalMetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "InternalMetric"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cMetricKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Assignment cNameAssignment_1 = (Assignment) this.cGroup.eContents().get(1); - private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) this.cNameAssignment_1.eContents().get(0); - private final Keyword cLeftParenthesisKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Assignment cShortNameAssignment_3 = (Assignment) this.cGroup.eContents().get(3); - private final RuleCall cShortNameSTRINGTerminalRuleCall_3_0 = (RuleCall) this.cShortNameAssignment_3.eContents() + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InternalMetric"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cMetricKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1); + private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0); + private final Keyword cLeftParenthesisKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Assignment cShortNameAssignment_3 = (Assignment) cGroup.eContents().get(3); + private final RuleCall cShortNameSTRINGTerminalRuleCall_3_0 = (RuleCall) cShortNameAssignment_3.eContents() .get(0); - private final Keyword cCommaKeyword_4 = (Keyword) this.cGroup.eContents().get(4); - private final Assignment cDescriptionAssignment_5 = (Assignment) this.cGroup.eContents().get(5); - private final RuleCall cDescriptionSTRINGTerminalRuleCall_5_0 = (RuleCall) this.cDescriptionAssignment_5 - .eContents().get(0); - private final Keyword cRightParenthesisKeyword_6 = (Keyword) this.cGroup.eContents().get(6); - private final Keyword cLeftCurlyBracketKeyword_7 = (Keyword) this.cGroup.eContents().get(7); - private final Group cGroup_8 = (Group) this.cGroup.eContents().get(8); - private final Keyword cParametersKeyword_8_0 = (Keyword) this.cGroup_8.eContents().get(0); - private final Keyword cLeftCurlyBracketKeyword_8_1 = (Keyword) this.cGroup_8.eContents().get(1); - private final Assignment cParameterAssignment_8_2 = (Assignment) this.cGroup_8.eContents().get(2); - private final RuleCall cParameterNumberParserRuleCall_8_2_0 = (RuleCall) this.cParameterAssignment_8_2 - .eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_8_3 = (Keyword) this.cGroup_8.eContents().get(3); - private final Assignment cDefinitionAssignment_9 = (Assignment) this.cGroup.eContents().get(9); - private final RuleCall cDefinitionMetricDefinitionParserRuleCall_9_0 = (RuleCall) this.cDefinitionAssignment_9 + private final Keyword cCommaKeyword_4 = (Keyword) cGroup.eContents().get(4); + private final Assignment cDescriptionAssignment_5 = (Assignment) cGroup.eContents().get(5); + private final RuleCall cDescriptionSTRINGTerminalRuleCall_5_0 = (RuleCall) cDescriptionAssignment_5.eContents() + .get(0); + private final Keyword cRightParenthesisKeyword_6 = (Keyword) cGroup.eContents().get(6); + private final Keyword cLeftCurlyBracketKeyword_7 = (Keyword) cGroup.eContents().get(7); + private final Group cGroup_8 = (Group) cGroup.eContents().get(8); + private final Keyword cParametersKeyword_8_0 = (Keyword) cGroup_8.eContents().get(0); + private final Keyword cLeftCurlyBracketKeyword_8_1 = (Keyword) cGroup_8.eContents().get(1); + private final Assignment cParameterAssignment_8_2 = (Assignment) cGroup_8.eContents().get(2); + private final RuleCall cParameterNumberParserRuleCall_8_2_0 = (RuleCall) cParameterAssignment_8_2.eContents() + .get(0); + private final Keyword cRightCurlyBracketKeyword_8_3 = (Keyword) cGroup_8.eContents().get(3); + private final Assignment cDefinitionAssignment_9 = (Assignment) cGroup.eContents().get(9); + private final RuleCall cDefinitionMetricDefinitionParserRuleCall_9_0 = (RuleCall) cDefinitionAssignment_9 .eContents().get(0); - private final Keyword cRightCurlyBracketSemicolonKeyword_10 = (Keyword) this.cGroup.eContents().get(10); + private final Keyword cRightCurlyBracketSemicolonKeyword_10 = (Keyword) cGroup.eContents().get(10); // InternalMetric: - // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" ("parameters" "{" + // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" + // ("parameters" "{" // parameter+=Number* "}")? // definition=MetricDefinition "};"; @Override public ParserRule getRule() { - return this.rule; + return rule; } - // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" ("parameters" "{" + // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" + // ("parameters" "{" // parameter+=Number* "}")? // definition=MetricDefinition "};" public Group getGroup() { - return this.cGroup; + return cGroup; } // "Metric" public Keyword getMetricKeyword_0() { - return this.cMetricKeyword_0; + return cMetricKeyword_0; } // name=MYID public Assignment getNameAssignment_1() { - return this.cNameAssignment_1; + return cNameAssignment_1; } // MYID public RuleCall getNameMYIDParserRuleCall_1_0() { - return this.cNameMYIDParserRuleCall_1_0; + return cNameMYIDParserRuleCall_1_0; } // "(" public Keyword getLeftParenthesisKeyword_2() { - return this.cLeftParenthesisKeyword_2; + return cLeftParenthesisKeyword_2; } // shortName=STRING public Assignment getShortNameAssignment_3() { - return this.cShortNameAssignment_3; + return cShortNameAssignment_3; } // STRING public RuleCall getShortNameSTRINGTerminalRuleCall_3_0() { - return this.cShortNameSTRINGTerminalRuleCall_3_0; + return cShortNameSTRINGTerminalRuleCall_3_0; } // "," public Keyword getCommaKeyword_4() { - return this.cCommaKeyword_4; + return cCommaKeyword_4; } // description=STRING public Assignment getDescriptionAssignment_5() { - return this.cDescriptionAssignment_5; + return cDescriptionAssignment_5; } // STRING public RuleCall getDescriptionSTRINGTerminalRuleCall_5_0() { - return this.cDescriptionSTRINGTerminalRuleCall_5_0; + return cDescriptionSTRINGTerminalRuleCall_5_0; } // ")" public Keyword getRightParenthesisKeyword_6() { - return this.cRightParenthesisKeyword_6; + return cRightParenthesisKeyword_6; } // "{" public Keyword getLeftCurlyBracketKeyword_7() { - return this.cLeftCurlyBracketKeyword_7; + return cLeftCurlyBracketKeyword_7; } // ("parameters" "{" parameter+=Number* "}")? public Group getGroup_8() { - return this.cGroup_8; + return cGroup_8; } // "parameters" public Keyword getParametersKeyword_8_0() { - return this.cParametersKeyword_8_0; + return cParametersKeyword_8_0; } // "{" public Keyword getLeftCurlyBracketKeyword_8_1() { - return this.cLeftCurlyBracketKeyword_8_1; + return cLeftCurlyBracketKeyword_8_1; } // parameter+=Number* public Assignment getParameterAssignment_8_2() { - return this.cParameterAssignment_8_2; + return cParameterAssignment_8_2; } // Number public RuleCall getParameterNumberParserRuleCall_8_2_0() { - return this.cParameterNumberParserRuleCall_8_2_0; + return cParameterNumberParserRuleCall_8_2_0; } // "}" public Keyword getRightCurlyBracketKeyword_8_3() { - return this.cRightCurlyBracketKeyword_8_3; + return cRightCurlyBracketKeyword_8_3; } // definition=MetricDefinition public Assignment getDefinitionAssignment_9() { - return this.cDefinitionAssignment_9; + return cDefinitionAssignment_9; } // MetricDefinition public RuleCall getDefinitionMetricDefinitionParserRuleCall_9_0() { - return this.cDefinitionMetricDefinitionParserRuleCall_9_0; + return cDefinitionMetricDefinitionParserRuleCall_9_0; } // "};" public Keyword getRightCurlyBracketSemicolonKeyword_10() { - return this.cRightCurlyBracketSemicolonKeyword_10; + return cRightCurlyBracketSemicolonKeyword_10; } } public class NumberElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "Number"); - private final Alternatives cAlternatives = (Alternatives) this.rule.eContents().get(1); - private final RuleCall cParameterParserRuleCall_0 = (RuleCall) this.cAlternatives.eContents().get(0); - private final RuleCall cConstantParserRuleCall_1 = (RuleCall) this.cAlternatives.eContents().get(1); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Number"); + private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1); + private final RuleCall cParameterParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0); + private final RuleCall cConstantParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1); // Number: // Parameter | Constant; @Override public ParserRule getRule() { - return this.rule; + return rule; } // Parameter | Constant public Alternatives getAlternatives() { - return this.cAlternatives; + return cAlternatives; } // Parameter public RuleCall getParameterParserRuleCall_0() { - return this.cParameterParserRuleCall_0; + return cParameterParserRuleCall_0; } // Constant public RuleCall getConstantParserRuleCall_1() { - return this.cConstantParserRuleCall_1; + return cConstantParserRuleCall_1; } } public class ParameterElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "Parameter"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cParameterKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Assignment cNameAssignment_1 = (Assignment) this.cGroup.eContents().get(1); - private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) this.cNameAssignment_1.eContents().get(0); - private final Keyword cLeftParenthesisKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Assignment cShortnameAssignment_3 = (Assignment) this.cGroup.eContents().get(3); - private final RuleCall cShortnameSTRINGTerminalRuleCall_3_0 = (RuleCall) this.cShortnameAssignment_3.eContents() + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Parameter"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cParameterKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1); + private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0); + private final Keyword cLeftParenthesisKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Assignment cShortnameAssignment_3 = (Assignment) cGroup.eContents().get(3); + private final RuleCall cShortnameSTRINGTerminalRuleCall_3_0 = (RuleCall) cShortnameAssignment_3.eContents() .get(0); - private final Keyword cCommaKeyword_4 = (Keyword) this.cGroup.eContents().get(4); - private final Assignment cDescriptionAssignment_5 = (Assignment) this.cGroup.eContents().get(5); - private final RuleCall cDescriptionSTRINGTerminalRuleCall_5_0 = (RuleCall) this.cDescriptionAssignment_5 - .eContents().get(0); - private final Keyword cCommaKeyword_6 = (Keyword) this.cGroup.eContents().get(6); - private final Assignment cDefaultValueAssignment_7 = (Assignment) this.cGroup.eContents().get(7); - private final RuleCall cDefaultValueDOUBLETerminalRuleCall_7_0 = (RuleCall) this.cDefaultValueAssignment_7 + private final Keyword cCommaKeyword_4 = (Keyword) cGroup.eContents().get(4); + private final Assignment cDescriptionAssignment_5 = (Assignment) cGroup.eContents().get(5); + private final RuleCall cDescriptionSTRINGTerminalRuleCall_5_0 = (RuleCall) cDescriptionAssignment_5.eContents() + .get(0); + private final Keyword cCommaKeyword_6 = (Keyword) cGroup.eContents().get(6); + private final Assignment cDefaultValueAssignment_7 = (Assignment) cGroup.eContents().get(7); + private final RuleCall cDefaultValueDOUBLETerminalRuleCall_7_0 = (RuleCall) cDefaultValueAssignment_7 .eContents().get(0); - private final Keyword cRightParenthesisKeyword_8 = (Keyword) this.cGroup.eContents().get(8); - private final Keyword cSemicolonKeyword_9 = (Keyword) this.cGroup.eContents().get(9); + private final Keyword cRightParenthesisKeyword_8 = (Keyword) cGroup.eContents().get(8); + private final Keyword cSemicolonKeyword_9 = (Keyword) cGroup.eContents().get(9); // Parameter: - // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," defaultValue=DOUBLE + // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," + // defaultValue=DOUBLE // ")" ";"; @Override public ParserRule getRule() { - return this.rule; + return rule; } - // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," defaultValue=DOUBLE + // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," + // defaultValue=DOUBLE // ")" ";" public Group getGroup() { - return this.cGroup; + return cGroup; } // "Parameter" public Keyword getParameterKeyword_0() { - return this.cParameterKeyword_0; + return cParameterKeyword_0; } // name=MYID public Assignment getNameAssignment_1() { - return this.cNameAssignment_1; + return cNameAssignment_1; } // MYID public RuleCall getNameMYIDParserRuleCall_1_0() { - return this.cNameMYIDParserRuleCall_1_0; + return cNameMYIDParserRuleCall_1_0; } // "(" public Keyword getLeftParenthesisKeyword_2() { - return this.cLeftParenthesisKeyword_2; + return cLeftParenthesisKeyword_2; } // shortname=STRING public Assignment getShortnameAssignment_3() { - return this.cShortnameAssignment_3; + return cShortnameAssignment_3; } // STRING public RuleCall getShortnameSTRINGTerminalRuleCall_3_0() { - return this.cShortnameSTRINGTerminalRuleCall_3_0; + return cShortnameSTRINGTerminalRuleCall_3_0; } // "," public Keyword getCommaKeyword_4() { - return this.cCommaKeyword_4; + return cCommaKeyword_4; } // description=STRING public Assignment getDescriptionAssignment_5() { - return this.cDescriptionAssignment_5; + return cDescriptionAssignment_5; } // STRING public RuleCall getDescriptionSTRINGTerminalRuleCall_5_0() { - return this.cDescriptionSTRINGTerminalRuleCall_5_0; + return cDescriptionSTRINGTerminalRuleCall_5_0; } // "," public Keyword getCommaKeyword_6() { - return this.cCommaKeyword_6; + return cCommaKeyword_6; } // defaultValue=DOUBLE public Assignment getDefaultValueAssignment_7() { - return this.cDefaultValueAssignment_7; + return cDefaultValueAssignment_7; } // DOUBLE public RuleCall getDefaultValueDOUBLETerminalRuleCall_7_0() { - return this.cDefaultValueDOUBLETerminalRuleCall_7_0; + return cDefaultValueDOUBLETerminalRuleCall_7_0; } // ")" public Keyword getRightParenthesisKeyword_8() { - return this.cRightParenthesisKeyword_8; + return cRightParenthesisKeyword_8; } // ";" public Keyword getSemicolonKeyword_9() { - return this.cSemicolonKeyword_9; + return cSemicolonKeyword_9; } } public class ConstantElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "Constant"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cConstKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Assignment cNameAssignment_1 = (Assignment) this.cGroup.eContents().get(1); - private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) this.cNameAssignment_1.eContents().get(0); - private final Keyword cEqualsSignKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Assignment cValueAssignment_3 = (Assignment) this.cGroup.eContents().get(3); - private final RuleCall cValueDOUBLETerminalRuleCall_3_0 = (RuleCall) this.cValueAssignment_3.eContents().get(0); - private final Keyword cSemicolonKeyword_4 = (Keyword) this.cGroup.eContents().get(4); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Constant"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cConstKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1); + private final RuleCall cNameMYIDParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0); + private final Keyword cEqualsSignKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Assignment cValueAssignment_3 = (Assignment) cGroup.eContents().get(3); + private final RuleCall cValueDOUBLETerminalRuleCall_3_0 = (RuleCall) cValueAssignment_3.eContents().get(0); + private final Keyword cSemicolonKeyword_4 = (Keyword) cGroup.eContents().get(4); // Constant: // "Const" name=MYID "=" value=DOUBLE ";"; @Override public ParserRule getRule() { - return this.rule; + return rule; } // "Const" name=MYID "=" value=DOUBLE ";" public Group getGroup() { - return this.cGroup; + return cGroup; } // "Const" public Keyword getConstKeyword_0() { - return this.cConstKeyword_0; + return cConstKeyword_0; } // name=MYID public Assignment getNameAssignment_1() { - return this.cNameAssignment_1; + return cNameAssignment_1; } // MYID public RuleCall getNameMYIDParserRuleCall_1_0() { - return this.cNameMYIDParserRuleCall_1_0; + return cNameMYIDParserRuleCall_1_0; } // "=" public Keyword getEqualsSignKeyword_2() { - return this.cEqualsSignKeyword_2; + return cEqualsSignKeyword_2; } // value=DOUBLE public Assignment getValueAssignment_3() { - return this.cValueAssignment_3; + return cValueAssignment_3; } // DOUBLE public RuleCall getValueDOUBLETerminalRuleCall_3_0() { - return this.cValueDOUBLETerminalRuleCall_3_0; + return cValueDOUBLETerminalRuleCall_3_0; } // ";" public Keyword getSemicolonKeyword_4() { - return this.cSemicolonKeyword_4; + return cSemicolonKeyword_4; } } public class MetricDefinitionElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "MetricDefinition"); - private final Alternatives cAlternatives = (Alternatives) this.rule.eContents().get(1); - private final RuleCall cWeightedMetricParserRuleCall_0 = (RuleCall) this.cAlternatives.eContents().get(0); - private final RuleCall cStepwiseMetricParserRuleCall_1 = (RuleCall) this.cAlternatives.eContents().get(1); - private final RuleCall cRatioMetricParserRuleCall_2 = (RuleCall) this.cAlternatives.eContents().get(2); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MetricDefinition"); + private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1); + private final RuleCall cWeightedMetricParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0); + private final RuleCall cStepwiseMetricParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1); + private final RuleCall cRatioMetricParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2); // MetricDefinition: // WeightedMetric | StepwiseMetric | RatioMetric; @Override public ParserRule getRule() { - return this.rule; + return rule; } // WeightedMetric | StepwiseMetric | RatioMetric public Alternatives getAlternatives() { - return this.cAlternatives; + return cAlternatives; } // WeightedMetric public RuleCall getWeightedMetricParserRuleCall_0() { - return this.cWeightedMetricParserRuleCall_0; + return cWeightedMetricParserRuleCall_0; } // StepwiseMetric public RuleCall getStepwiseMetricParserRuleCall_1() { - return this.cStepwiseMetricParserRuleCall_1; + return cStepwiseMetricParserRuleCall_1; } // RatioMetric public RuleCall getRatioMetricParserRuleCall_2() { - return this.cRatioMetricParserRuleCall_2; + return cRatioMetricParserRuleCall_2; } } public class WeightedMetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "WeightedMetric"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cWeigthedSumKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword) this.cGroup.eContents().get(1); - private final Assignment cWeightsAssignment_2 = (Assignment) this.cGroup.eContents().get(2); - private final RuleCall cWeightsMetricAndWeightParserRuleCall_2_0 = (RuleCall) this.cWeightsAssignment_2 - .eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_3 = (Keyword) this.cGroup.eContents().get(3); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WeightedMetric"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cWeigthedSumKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword) cGroup.eContents().get(1); + private final Assignment cWeightsAssignment_2 = (Assignment) cGroup.eContents().get(2); + private final RuleCall cWeightsMetricAndWeightParserRuleCall_2_0 = (RuleCall) cWeightsAssignment_2.eContents() + .get(0); + private final Keyword cRightCurlyBracketKeyword_3 = (Keyword) cGroup.eContents().get(3); // WeightedMetric: // "WeigthedSum" "{" weights+=MetricAndWeight+ "}"; @Override public ParserRule getRule() { - return this.rule; + return rule; } // "WeigthedSum" "{" weights+=MetricAndWeight+ "}" public Group getGroup() { - return this.cGroup; + return cGroup; } // "WeigthedSum" public Keyword getWeigthedSumKeyword_0() { - return this.cWeigthedSumKeyword_0; + return cWeigthedSumKeyword_0; } // "{" public Keyword getLeftCurlyBracketKeyword_1() { - return this.cLeftCurlyBracketKeyword_1; + return cLeftCurlyBracketKeyword_1; } // weights+=MetricAndWeight+ public Assignment getWeightsAssignment_2() { - return this.cWeightsAssignment_2; + return cWeightsAssignment_2; } // MetricAndWeight public RuleCall getWeightsMetricAndWeightParserRuleCall_2_0() { - return this.cWeightsMetricAndWeightParserRuleCall_2_0; + return cWeightsMetricAndWeightParserRuleCall_2_0; } // "}" public Keyword getRightCurlyBracketKeyword_3() { - return this.cRightCurlyBracketKeyword_3; + return cRightCurlyBracketKeyword_3; } } public class StepwiseMetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "StepwiseMetric"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cStepwiseKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Keyword cLeftSquareBracketKeyword_1 = (Keyword) this.cGroup.eContents().get(1); - private final Assignment cInnerMetricAssignment_2 = (Assignment) this.cGroup.eContents().get(2); - private final CrossReference cInnerMetricMetricCrossReference_2_0 = (CrossReference) this.cInnerMetricAssignment_2 + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StepwiseMetric"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cStepwiseKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Keyword cLeftSquareBracketKeyword_1 = (Keyword) cGroup.eContents().get(1); + private final Assignment cInnerMetricAssignment_2 = (Assignment) cGroup.eContents().get(2); + private final CrossReference cInnerMetricMetricCrossReference_2_0 = (CrossReference) cInnerMetricAssignment_2 .eContents().get(0); - private final RuleCall cInnerMetricMetricMYIDParserRuleCall_2_0_1 = (RuleCall) this.cInnerMetricMetricCrossReference_2_0 + private final RuleCall cInnerMetricMetricMYIDParserRuleCall_2_0_1 = (RuleCall) cInnerMetricMetricCrossReference_2_0 .eContents().get(1); - private final Keyword cRightSquareBracketKeyword_3 = (Keyword) this.cGroup.eContents().get(3); - private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword) this.cGroup.eContents().get(4); - private final Assignment cStepsAssignment_5 = (Assignment) this.cGroup.eContents().get(5); - private final RuleCall cStepsBoundAndWeightParserRuleCall_5_0 = (RuleCall) this.cStepsAssignment_5.eContents() + private final Keyword cRightSquareBracketKeyword_3 = (Keyword) cGroup.eContents().get(3); + private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword) cGroup.eContents().get(4); + private final Assignment cStepsAssignment_5 = (Assignment) cGroup.eContents().get(5); + private final RuleCall cStepsBoundAndWeightParserRuleCall_5_0 = (RuleCall) cStepsAssignment_5.eContents() .get(0); - private final Keyword cRightCurlyBracketKeyword_6 = (Keyword) this.cGroup.eContents().get(6); + private final Keyword cRightCurlyBracketKeyword_6 = (Keyword) cGroup.eContents().get(6); // StepwiseMetric: // "Stepwise" "[" innerMetric=[Metric|MYID] "]" "{" steps+=BoundAndWeight* "}"; @Override public ParserRule getRule() { - return this.rule; + return rule; } // "Stepwise" "[" innerMetric=[Metric|MYID] "]" "{" steps+=BoundAndWeight* "}" public Group getGroup() { - return this.cGroup; + return cGroup; } // "Stepwise" public Keyword getStepwiseKeyword_0() { - return this.cStepwiseKeyword_0; + return cStepwiseKeyword_0; } // "[" public Keyword getLeftSquareBracketKeyword_1() { - return this.cLeftSquareBracketKeyword_1; + return cLeftSquareBracketKeyword_1; } // innerMetric=[Metric|MYID] public Assignment getInnerMetricAssignment_2() { - return this.cInnerMetricAssignment_2; + return cInnerMetricAssignment_2; } // [Metric|MYID] public CrossReference getInnerMetricMetricCrossReference_2_0() { - return this.cInnerMetricMetricCrossReference_2_0; + return cInnerMetricMetricCrossReference_2_0; } // MYID public RuleCall getInnerMetricMetricMYIDParserRuleCall_2_0_1() { - return this.cInnerMetricMetricMYIDParserRuleCall_2_0_1; + return cInnerMetricMetricMYIDParserRuleCall_2_0_1; } // "]" public Keyword getRightSquareBracketKeyword_3() { - return this.cRightSquareBracketKeyword_3; + return cRightSquareBracketKeyword_3; } // "{" public Keyword getLeftCurlyBracketKeyword_4() { - return this.cLeftCurlyBracketKeyword_4; + return cLeftCurlyBracketKeyword_4; } // steps+=BoundAndWeight* public Assignment getStepsAssignment_5() { - return this.cStepsAssignment_5; + return cStepsAssignment_5; } // BoundAndWeight public RuleCall getStepsBoundAndWeightParserRuleCall_5_0() { - return this.cStepsBoundAndWeightParserRuleCall_5_0; + return cStepsBoundAndWeightParserRuleCall_5_0; } // "}" public Keyword getRightCurlyBracketKeyword_6() { - return this.cRightCurlyBracketKeyword_6; + return cRightCurlyBracketKeyword_6; } } public class RatioMetricElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "RatioMetric"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cRatioKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword) this.cGroup.eContents().get(1); - private final Assignment cNominatorMetricAssignment_2 = (Assignment) this.cGroup.eContents().get(2); - private final CrossReference cNominatorMetricMetricCrossReference_2_0 = (CrossReference) this.cNominatorMetricAssignment_2 + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RatioMetric"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cRatioKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword) cGroup.eContents().get(1); + private final Assignment cNominatorMetricAssignment_2 = (Assignment) cGroup.eContents().get(2); + private final CrossReference cNominatorMetricMetricCrossReference_2_0 = (CrossReference) cNominatorMetricAssignment_2 .eContents().get(0); - private final RuleCall cNominatorMetricMetricMYIDParserRuleCall_2_0_1 = (RuleCall) this.cNominatorMetricMetricCrossReference_2_0 + private final RuleCall cNominatorMetricMetricMYIDParserRuleCall_2_0_1 = (RuleCall) cNominatorMetricMetricCrossReference_2_0 .eContents().get(1); - private final Keyword cSolidusKeyword_3 = (Keyword) this.cGroup.eContents().get(3); - private final Assignment cDenominatorMetricAssignment_4 = (Assignment) this.cGroup.eContents().get(4); - private final CrossReference cDenominatorMetricMetricCrossReference_4_0 = (CrossReference) this.cDenominatorMetricAssignment_4 + private final Keyword cSolidusKeyword_3 = (Keyword) cGroup.eContents().get(3); + private final Assignment cDenominatorMetricAssignment_4 = (Assignment) cGroup.eContents().get(4); + private final CrossReference cDenominatorMetricMetricCrossReference_4_0 = (CrossReference) cDenominatorMetricAssignment_4 .eContents().get(0); - private final RuleCall cDenominatorMetricMetricMYIDParserRuleCall_4_0_1 = (RuleCall) this.cDenominatorMetricMetricCrossReference_4_0 + private final RuleCall cDenominatorMetricMetricMYIDParserRuleCall_4_0_1 = (RuleCall) cDenominatorMetricMetricCrossReference_4_0 .eContents().get(1); - private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) this.cGroup.eContents().get(5); + private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) cGroup.eContents().get(5); // RatioMetric: - // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] "}"; + // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] + // "}"; @Override public ParserRule getRule() { - return this.rule; + return rule; } - // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] "}" + // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] + // "}" public Group getGroup() { - return this.cGroup; + return cGroup; } // "Ratio" public Keyword getRatioKeyword_0() { - return this.cRatioKeyword_0; + return cRatioKeyword_0; } // "{" public Keyword getLeftCurlyBracketKeyword_1() { - return this.cLeftCurlyBracketKeyword_1; + return cLeftCurlyBracketKeyword_1; } // nominatorMetric=[Metric|MYID] public Assignment getNominatorMetricAssignment_2() { - return this.cNominatorMetricAssignment_2; + return cNominatorMetricAssignment_2; } // [Metric|MYID] public CrossReference getNominatorMetricMetricCrossReference_2_0() { - return this.cNominatorMetricMetricCrossReference_2_0; + return cNominatorMetricMetricCrossReference_2_0; } // MYID public RuleCall getNominatorMetricMetricMYIDParserRuleCall_2_0_1() { - return this.cNominatorMetricMetricMYIDParserRuleCall_2_0_1; + return cNominatorMetricMetricMYIDParserRuleCall_2_0_1; } // "/" public Keyword getSolidusKeyword_3() { - return this.cSolidusKeyword_3; + return cSolidusKeyword_3; } // denominatorMetric=[Metric|MYID] public Assignment getDenominatorMetricAssignment_4() { - return this.cDenominatorMetricAssignment_4; + return cDenominatorMetricAssignment_4; } // [Metric|MYID] public CrossReference getDenominatorMetricMetricCrossReference_4_0() { - return this.cDenominatorMetricMetricCrossReference_4_0; + return cDenominatorMetricMetricCrossReference_4_0; } // MYID public RuleCall getDenominatorMetricMetricMYIDParserRuleCall_4_0_1() { - return this.cDenominatorMetricMetricMYIDParserRuleCall_4_0_1; + return cDenominatorMetricMetricMYIDParserRuleCall_4_0_1; } // "}" public Keyword getRightCurlyBracketKeyword_5() { - return this.cRightCurlyBracketKeyword_5; + return cRightCurlyBracketKeyword_5; } } public class BoundAndWeightElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "BoundAndWeight"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cLessThanSignKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Assignment cUpperBoundAssignment_1 = (Assignment) this.cGroup.eContents().get(1); - private final CrossReference cUpperBoundNumberCrossReference_1_0 = (CrossReference) this.cUpperBoundAssignment_1 + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BoundAndWeight"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cLessThanSignKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Assignment cUpperBoundAssignment_1 = (Assignment) cGroup.eContents().get(1); + private final CrossReference cUpperBoundNumberCrossReference_1_0 = (CrossReference) cUpperBoundAssignment_1 .eContents().get(0); - private final RuleCall cUpperBoundNumberMYIDParserRuleCall_1_0_1 = (RuleCall) this.cUpperBoundNumberCrossReference_1_0 + private final RuleCall cUpperBoundNumberMYIDParserRuleCall_1_0_1 = (RuleCall) cUpperBoundNumberCrossReference_1_0 .eContents().get(1); - private final Keyword cCommaKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Assignment cWeightAssignment_3 = (Assignment) this.cGroup.eContents().get(3); - private final CrossReference cWeightNumberCrossReference_3_0 = (CrossReference) this.cWeightAssignment_3 - .eContents().get(0); - private final RuleCall cWeightNumberMYIDParserRuleCall_3_0_1 = (RuleCall) this.cWeightNumberCrossReference_3_0 + private final Keyword cCommaKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Assignment cWeightAssignment_3 = (Assignment) cGroup.eContents().get(3); + private final CrossReference cWeightNumberCrossReference_3_0 = (CrossReference) cWeightAssignment_3.eContents() + .get(0); + private final RuleCall cWeightNumberMYIDParserRuleCall_3_0_1 = (RuleCall) cWeightNumberCrossReference_3_0 .eContents().get(1); - private final Keyword cGreaterThanSignKeyword_4 = (Keyword) this.cGroup.eContents().get(4); + private final Keyword cGreaterThanSignKeyword_4 = (Keyword) cGroup.eContents().get(4); // BoundAndWeight: // "<" upperBound=[Number|MYID] "," weight=[Number|MYID] ">"; @Override public ParserRule getRule() { - return this.rule; + return rule; } // "<" upperBound=[Number|MYID] "," weight=[Number|MYID] ">" public Group getGroup() { - return this.cGroup; + return cGroup; } // "<" public Keyword getLessThanSignKeyword_0() { - return this.cLessThanSignKeyword_0; + return cLessThanSignKeyword_0; } // upperBound=[Number|MYID] public Assignment getUpperBoundAssignment_1() { - return this.cUpperBoundAssignment_1; + return cUpperBoundAssignment_1; } // [Number|MYID] public CrossReference getUpperBoundNumberCrossReference_1_0() { - return this.cUpperBoundNumberCrossReference_1_0; + return cUpperBoundNumberCrossReference_1_0; } // MYID public RuleCall getUpperBoundNumberMYIDParserRuleCall_1_0_1() { - return this.cUpperBoundNumberMYIDParserRuleCall_1_0_1; + return cUpperBoundNumberMYIDParserRuleCall_1_0_1; } // "," public Keyword getCommaKeyword_2() { - return this.cCommaKeyword_2; + return cCommaKeyword_2; } // weight=[Number|MYID] public Assignment getWeightAssignment_3() { - return this.cWeightAssignment_3; + return cWeightAssignment_3; } // [Number|MYID] public CrossReference getWeightNumberCrossReference_3_0() { - return this.cWeightNumberCrossReference_3_0; + return cWeightNumberCrossReference_3_0; } // MYID public RuleCall getWeightNumberMYIDParserRuleCall_3_0_1() { - return this.cWeightNumberMYIDParserRuleCall_3_0_1; + return cWeightNumberMYIDParserRuleCall_3_0_1; } // ">" public Keyword getGreaterThanSignKeyword_4() { - return this.cGreaterThanSignKeyword_4; + return cGreaterThanSignKeyword_4; } } public class MetricAndWeightElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "MetricAndWeight"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final Keyword cLessThanSignKeyword_0 = (Keyword) this.cGroup.eContents().get(0); - private final Assignment cMetricAssignment_1 = (Assignment) this.cGroup.eContents().get(1); - private final CrossReference cMetricMetricCrossReference_1_0 = (CrossReference) this.cMetricAssignment_1 - .eContents().get(0); - private final RuleCall cMetricMetricMYIDParserRuleCall_1_0_1 = (RuleCall) this.cMetricMetricCrossReference_1_0 + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MetricAndWeight"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final Keyword cLessThanSignKeyword_0 = (Keyword) cGroup.eContents().get(0); + private final Assignment cMetricAssignment_1 = (Assignment) cGroup.eContents().get(1); + private final CrossReference cMetricMetricCrossReference_1_0 = (CrossReference) cMetricAssignment_1.eContents() + .get(0); + private final RuleCall cMetricMetricMYIDParserRuleCall_1_0_1 = (RuleCall) cMetricMetricCrossReference_1_0 .eContents().get(1); - private final Keyword cCommaKeyword_2 = (Keyword) this.cGroup.eContents().get(2); - private final Assignment cWeightAssignment_3 = (Assignment) this.cGroup.eContents().get(3); - private final CrossReference cWeightNumberCrossReference_3_0 = (CrossReference) this.cWeightAssignment_3 - .eContents().get(0); - private final RuleCall cWeightNumberMYIDParserRuleCall_3_0_1 = (RuleCall) this.cWeightNumberCrossReference_3_0 + private final Keyword cCommaKeyword_2 = (Keyword) cGroup.eContents().get(2); + private final Assignment cWeightAssignment_3 = (Assignment) cGroup.eContents().get(3); + private final CrossReference cWeightNumberCrossReference_3_0 = (CrossReference) cWeightAssignment_3.eContents() + .get(0); + private final RuleCall cWeightNumberMYIDParserRuleCall_3_0_1 = (RuleCall) cWeightNumberCrossReference_3_0 .eContents().get(1); - private final Keyword cGreaterThanSignKeyword_4 = (Keyword) this.cGroup.eContents().get(4); + private final Keyword cGreaterThanSignKeyword_4 = (Keyword) cGroup.eContents().get(4); // MetricAndWeight: // "<" metric=[Metric|MYID] "," weight=[Number|MYID] ">"; @Override public ParserRule getRule() { - return this.rule; + return rule; } // "<" metric=[Metric|MYID] "," weight=[Number|MYID] ">" public Group getGroup() { - return this.cGroup; + return cGroup; } // "<" public Keyword getLessThanSignKeyword_0() { - return this.cLessThanSignKeyword_0; + return cLessThanSignKeyword_0; } // metric=[Metric|MYID] public Assignment getMetricAssignment_1() { - return this.cMetricAssignment_1; + return cMetricAssignment_1; } // [Metric|MYID] public CrossReference getMetricMetricCrossReference_1_0() { - return this.cMetricMetricCrossReference_1_0; + return cMetricMetricCrossReference_1_0; } // MYID public RuleCall getMetricMetricMYIDParserRuleCall_1_0_1() { - return this.cMetricMetricMYIDParserRuleCall_1_0_1; + return cMetricMetricMYIDParserRuleCall_1_0_1; } // "," public Keyword getCommaKeyword_2() { - return this.cCommaKeyword_2; + return cCommaKeyword_2; } // weight=[Number|MYID] public Assignment getWeightAssignment_3() { - return this.cWeightAssignment_3; + return cWeightAssignment_3; } // [Number|MYID] public CrossReference getWeightNumberCrossReference_3_0() { - return this.cWeightNumberCrossReference_3_0; + return cWeightNumberCrossReference_3_0; } // MYID public RuleCall getWeightNumberMYIDParserRuleCall_3_0_1() { - return this.cWeightNumberMYIDParserRuleCall_3_0_1; + return cWeightNumberMYIDParserRuleCall_3_0_1; } // ">" public Keyword getGreaterThanSignKeyword_4() { - return this.cGreaterThanSignKeyword_4; + return cGreaterThanSignKeyword_4; } } public class MYIDElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil - .findRuleForName(MetricDSLGrammarAccess.this.getGrammar(), "MYID"); - private final Group cGroup = (Group) this.rule.eContents().get(1); - private final RuleCall cIDTerminalRuleCall_0 = (RuleCall) this.cGroup.eContents().get(0); - private final Group cGroup_1 = (Group) this.cGroup.eContents().get(1); - private final Keyword cFullStopKeyword_1_0 = (Keyword) this.cGroup_1.eContents().get(0); - private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall) this.cGroup_1.eContents().get(1); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MYID"); + private final Group cGroup = (Group) rule.eContents().get(1); + private final RuleCall cIDTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0); + private final Group cGroup_1 = (Group) cGroup.eContents().get(1); + private final Keyword cFullStopKeyword_1_0 = (Keyword) cGroup_1.eContents().get(0); + private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1); // MYID returns ecore::EString: // ID ("." ID)*; @Override public ParserRule getRule() { - return this.rule; + return rule; } // ID ("." ID)* public Group getGroup() { - return this.cGroup; + return cGroup; } // ID public RuleCall getIDTerminalRuleCall_0() { - return this.cIDTerminalRuleCall_0; + return cIDTerminalRuleCall_0; } // ("." ID)* public Group getGroup_1() { - return this.cGroup_1; + return cGroup_1; } // "." public Keyword getFullStopKeyword_1_0() { - return this.cFullStopKeyword_1_0; + return cFullStopKeyword_1_0; } // ID public RuleCall getIDTerminalRuleCall_1_1() { - return this.cIDTerminalRuleCall_1_1; + return cIDTerminalRuleCall_1_1; } } @@ -999,7 +993,7 @@ public RuleCall getIDTerminalRuleCall_1_1() { @Inject public MetricDSLGrammarAccess(final GrammarProvider grammarProvider, final TerminalsGrammarAccess gaTerminals) { - this.grammar = this.internalFindGrammar(grammarProvider); + grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; } @@ -1010,223 +1004,220 @@ protected Grammar internalFindGrammar(final GrammarProvider grammarProvider) { return grammar; } final List grammars = grammar.getUsedGrammars(); - if (!grammars.isEmpty()) { - grammar = grammars.iterator().next(); - } else { + if (grammars.isEmpty()) { return null; } + grammar = grammars.iterator().next(); } return grammar; } @Override public Grammar getGrammar() { - return this.grammar; + return grammar; } public TerminalsGrammarAccess getTerminalsGrammarAccess() { - return this.gaTerminals; + return gaTerminals; } // MetricModel: - // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* "Metrics" "{" + // ("import" importURI+=STRING ";")* ("extern" metrics+=ExternalMetric ";")* + // "Metrics" "{" // metrics+=InternalMetric+ "}"; public MetricModelElements getMetricModelAccess() { - return (this.pMetricModel != null) ? this.pMetricModel : (this.pMetricModel = new MetricModelElements()); + return (pMetricModel != null) ? pMetricModel : (pMetricModel = new MetricModelElements()); } public ParserRule getMetricModelRule() { - return this.getMetricModelAccess().getRule(); + return getMetricModelAccess().getRule(); } // Metric: // ExternalMetric | InternalMetric; public MetricElements getMetricAccess() { - return (this.pMetric != null) ? this.pMetric : (this.pMetric = new MetricElements()); + return (pMetric != null) ? pMetric : (pMetric = new MetricElements()); } public ParserRule getMetricRule() { - return this.getMetricAccess().getRule(); + return getMetricAccess().getRule(); } // ExternalMetric: // name=MYID; public ExternalMetricElements getExternalMetricAccess() { - return (this.pExternalMetric != null) ? this.pExternalMetric - : (this.pExternalMetric = new ExternalMetricElements()); + return (pExternalMetric != null) ? pExternalMetric : (pExternalMetric = new ExternalMetricElements()); } public ParserRule getExternalMetricRule() { - return this.getExternalMetricAccess().getRule(); + return getExternalMetricAccess().getRule(); } // InternalMetric: - // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" ("parameters" "{" + // "Metric" name=MYID "(" shortName=STRING "," description=STRING ")" "{" + // ("parameters" "{" // parameter+=Number* "}")? // definition=MetricDefinition "};"; public InternalMetricElements getInternalMetricAccess() { - return (this.pInternalMetric != null) ? this.pInternalMetric - : (this.pInternalMetric = new InternalMetricElements()); + return (pInternalMetric != null) ? pInternalMetric : (pInternalMetric = new InternalMetricElements()); } public ParserRule getInternalMetricRule() { - return this.getInternalMetricAccess().getRule(); + return getInternalMetricAccess().getRule(); } // Number: // Parameter | Constant; public NumberElements getNumberAccess() { - return (this.pNumber != null) ? this.pNumber : (this.pNumber = new NumberElements()); + return (pNumber != null) ? pNumber : (pNumber = new NumberElements()); } public ParserRule getNumberRule() { - return this.getNumberAccess().getRule(); + return getNumberAccess().getRule(); } // Parameter: - // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," defaultValue=DOUBLE ")" + // "Parameter" name=MYID "(" shortname=STRING "," description=STRING "," + // defaultValue=DOUBLE ")" // ";"; public ParameterElements getParameterAccess() { - return (this.pParameter != null) ? this.pParameter : (this.pParameter = new ParameterElements()); + return (pParameter != null) ? pParameter : (pParameter = new ParameterElements()); } public ParserRule getParameterRule() { - return this.getParameterAccess().getRule(); + return getParameterAccess().getRule(); } // Constant: // "Const" name=MYID "=" value=DOUBLE ";"; public ConstantElements getConstantAccess() { - return (this.pConstant != null) ? this.pConstant : (this.pConstant = new ConstantElements()); + return (pConstant != null) ? pConstant : (pConstant = new ConstantElements()); } public ParserRule getConstantRule() { - return this.getConstantAccess().getRule(); + return getConstantAccess().getRule(); } // MetricDefinition: // WeightedMetric | StepwiseMetric | RatioMetric; public MetricDefinitionElements getMetricDefinitionAccess() { - return (this.pMetricDefinition != null) ? this.pMetricDefinition - : (this.pMetricDefinition = new MetricDefinitionElements()); + return (pMetricDefinition != null) ? pMetricDefinition : (pMetricDefinition = new MetricDefinitionElements()); } public ParserRule getMetricDefinitionRule() { - return this.getMetricDefinitionAccess().getRule(); + return getMetricDefinitionAccess().getRule(); } // WeightedMetric: // "WeigthedSum" "{" weights+=MetricAndWeight+ "}"; public WeightedMetricElements getWeightedMetricAccess() { - return (this.pWeightedMetric != null) ? this.pWeightedMetric - : (this.pWeightedMetric = new WeightedMetricElements()); + return (pWeightedMetric != null) ? pWeightedMetric : (pWeightedMetric = new WeightedMetricElements()); } public ParserRule getWeightedMetricRule() { - return this.getWeightedMetricAccess().getRule(); + return getWeightedMetricAccess().getRule(); } // StepwiseMetric: // "Stepwise" "[" innerMetric=[Metric|MYID] "]" "{" steps+=BoundAndWeight* "}"; public StepwiseMetricElements getStepwiseMetricAccess() { - return (this.pStepwiseMetric != null) ? this.pStepwiseMetric - : (this.pStepwiseMetric = new StepwiseMetricElements()); + return (pStepwiseMetric != null) ? pStepwiseMetric : (pStepwiseMetric = new StepwiseMetricElements()); } public ParserRule getStepwiseMetricRule() { - return this.getStepwiseMetricAccess().getRule(); + return getStepwiseMetricAccess().getRule(); } // RatioMetric: - // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] "}"; + // "Ratio" "{" nominatorMetric=[Metric|MYID] "/" denominatorMetric=[Metric|MYID] + // "}"; public RatioMetricElements getRatioMetricAccess() { - return (this.pRatioMetric != null) ? this.pRatioMetric : (this.pRatioMetric = new RatioMetricElements()); + return (pRatioMetric != null) ? pRatioMetric : (pRatioMetric = new RatioMetricElements()); } public ParserRule getRatioMetricRule() { - return this.getRatioMetricAccess().getRule(); + return getRatioMetricAccess().getRule(); } // BoundAndWeight: // "<" upperBound=[Number|MYID] "," weight=[Number|MYID] ">"; public BoundAndWeightElements getBoundAndWeightAccess() { - return (this.pBoundAndWeight != null) ? this.pBoundAndWeight - : (this.pBoundAndWeight = new BoundAndWeightElements()); + return (pBoundAndWeight != null) ? pBoundAndWeight : (pBoundAndWeight = new BoundAndWeightElements()); } public ParserRule getBoundAndWeightRule() { - return this.getBoundAndWeightAccess().getRule(); + return getBoundAndWeightAccess().getRule(); } // MetricAndWeight: // "<" metric=[Metric|MYID] "," weight=[Number|MYID] ">"; public MetricAndWeightElements getMetricAndWeightAccess() { - return (this.pMetricAndWeight != null) ? this.pMetricAndWeight - : (this.pMetricAndWeight = new MetricAndWeightElements()); + return (pMetricAndWeight != null) ? pMetricAndWeight : (pMetricAndWeight = new MetricAndWeightElements()); } public ParserRule getMetricAndWeightRule() { - return this.getMetricAndWeightAccess().getRule(); + return getMetricAndWeightAccess().getRule(); } // MYID returns ecore::EString: // ID ("." ID)*; public MYIDElements getMYIDAccess() { - return (this.pMYID != null) ? this.pMYID : (this.pMYID = new MYIDElements()); + return (pMYID != null) ? pMYID : (pMYID = new MYIDElements()); } public ParserRule getMYIDRule() { - return this.getMYIDAccess().getRule(); + return getMYIDAccess().getRule(); } // terminal DOUBLE returns ecore::EDouble: // "-"? INT "." INT; public TerminalRule getDOUBLERule() { - return (this.tDOUBLE != null) ? this.tDOUBLE - : (this.tDOUBLE = (TerminalRule) GrammarUtil.findRuleForName(this.getGrammar(), "DOUBLE")); + return (tDOUBLE != null) ? tDOUBLE + : (tDOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DOUBLE")); } // terminal ID: // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; public TerminalRule getIDRule() { - return this.gaTerminals.getIDRule(); + return gaTerminals.getIDRule(); } // terminal INT returns ecore::EInt: // "0".."9"+; public TerminalRule getINTRule() { - return this.gaTerminals.getINTRule(); + return gaTerminals.getINTRule(); } // terminal STRING: - // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | + // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" + // | "\""))* "\"" | // "\'" ("\\" ("b" | "t" | // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'"; public TerminalRule getSTRINGRule() { - return this.gaTerminals.getSTRINGRule(); + return gaTerminals.getSTRINGRule(); } // terminal ML_COMMENT: // "/ *"->"* /"; public TerminalRule getML_COMMENTRule() { - return this.gaTerminals.getML_COMMENTRule(); + return gaTerminals.getML_COMMENTRule(); } // terminal SL_COMMENT: // "//" !("\n" | "\r")* ("\r"? "\n")?; public TerminalRule getSL_COMMENTRule() { - return this.gaTerminals.getSL_COMMENTRule(); + return gaTerminals.getSL_COMMENTRule(); } // terminal WS: // (" " | "\t" | "\r" | "\n")+; public TerminalRule getWSRule() { - return this.gaTerminals.getWSRule(); + return gaTerminals.getWSRule(); } // terminal ANY_OTHER: // .; public TerminalRule getANY_OTHERRule() { - return this.gaTerminals.getANY_OTHERRule(); + return gaTerminals.getANY_OTHERRule(); } } diff --git a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/validation/AbstractMetricDSLValidator.java b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/validation/AbstractMetricDSLValidator.java index 8db3641..ea825bc 100644 --- a/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/validation/AbstractMetricDSLValidator.java +++ b/bundles/org.somox.metrics.dsl/src-gen/org/somox/metrics/dsl/validation/AbstractMetricDSLValidator.java @@ -12,7 +12,7 @@ public class AbstractMetricDSLValidator extends org.eclipse.xtext.validation.Abs @Override protected List getEPackages() { - final List result = new ArrayList(); + final List result = new ArrayList<>(); result.add(org.somox.metrics.dsl.metricDSL.MetricDSLPackage.eINSTANCE); return result; } diff --git a/bundles/org.somox.metrics/META-INF/MANIFEST.MF b/bundles/org.somox.metrics/META-INF/MANIFEST.MF index 71d77a4..ec130ac 100644 --- a/bundles/org.somox.metrics/META-INF/MANIFEST.MF +++ b/bundles/org.somox.metrics/META-INF/MANIFEST.MF @@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.core.runtime, org.somox.filter, org.somox.kdmhelper, org.somox.sourcecodedecorator, - org.emftext.language.java, org.jgrapht.core, org.apache.log4j, - org.somox.sourcecodedecorator + org.somox.sourcecodedecorator, + tools.mdsd.jamopp.model.java Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.somox.metrics, diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/IMetric.java b/bundles/org.somox.metrics/src/org/somox/metrics/IMetric.java index 5e943e0..9d57ebc 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/IMetric.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/IMetric.java @@ -2,7 +2,6 @@ import java.util.Map; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.metamodeladdition.Root; @@ -11,6 +10,8 @@ import org.somox.metrics.parameter.ParameterDescriptor; import org.somox.metrics.tabs.MetricTab; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * Base interface for all SoMoX metrics. * diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractComposedMetric.java b/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractComposedMetric.java index aa0aae2..3cda14a 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractComposedMetric.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractComposedMetric.java @@ -3,7 +3,6 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.metamodeladdition.Root; @@ -14,6 +13,8 @@ import org.somox.metrics.helper.ClassAccessGraphEdge; import org.somox.metrics.helper.ComponentToImplementingClassesHelper; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.core.Root; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractMetric.java b/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractMetric.java index 2302149..1101594 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractMetric.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/abstractmetrics/AbstractMetric.java @@ -5,7 +5,6 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.metamodeladdition.Root; @@ -21,6 +20,8 @@ //import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * Abstract base class of all metrics, contains convenience functions and basic * method implementations diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/AbstractTypesCount.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/AbstractTypesCount.java index a5a8d0e..0dd72ee 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/AbstractTypesCount.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/AbstractTypesCount.java @@ -2,7 +2,6 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; import org.somox.filter.FilteredCollectionsFactory; import org.somox.kdmhelper.KDMHelper; @@ -10,6 +9,8 @@ import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + public class AbstractTypesCount extends AbstractCountingMetric { public static final MetricID METRIC_ID = new MetricID("org.somox.metric.basic.AbstractTypesCount"); diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/AfferentCoupling.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/AfferentCoupling.java index fb7a231..744acb8 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/AfferentCoupling.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/AfferentCoupling.java @@ -2,11 +2,12 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.types.GASTClass; /** diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/EfferentCoupling.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/EfferentCoupling.java index 301f971..b6551a1 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/EfferentCoupling.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/EfferentCoupling.java @@ -2,11 +2,12 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.types.GASTClass; /** diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/InterfaceAccessesCount.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/InterfaceAccessesCount.java index e4bbe8a..9d175c4 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/InterfaceAccessesCount.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/InterfaceAccessesCount.java @@ -3,7 +3,6 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; import org.somox.filter.FilteredCollectionsFactory; import org.somox.kdmhelper.KDMHelper; @@ -11,6 +10,8 @@ import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + public class InterfaceAccessesCount extends AbstractCountingMetric { private static final Logger logger = Logger.getLogger(InterfaceAccessesCount.class); diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/InternalAccessesCount.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/InternalAccessesCount.java index 4c056df..ae75cf2 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/InternalAccessesCount.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/InternalAccessesCount.java @@ -2,11 +2,12 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + public class InternalAccessesCount extends AbstractCountingMetric { public final static MetricID METRIC_ID = new MetricID("org.somox.metrics.basic.InternalAccessesCount"); diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/basic/TotalTypesCount.java b/bundles/org.somox.metrics/src/org/somox/metrics/basic/TotalTypesCount.java index 20c2066..27854b1 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/basic/TotalTypesCount.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/basic/TotalTypesCount.java @@ -2,11 +2,12 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractCountingMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + public class TotalTypesCount extends AbstractCountingMetric { public static final MetricID METRIC_ID = new MetricID("org.somox.metrics.basic.TotalTypesCount"); diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/helper/Class2ClassAccessGraphHelper.java b/bundles/org.somox.metrics/src/org/somox/metrics/helper/Class2ClassAccessGraphHelper.java index 4b66259..3a2ebce 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/helper/Class2ClassAccessGraphHelper.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/helper/Class2ClassAccessGraphHelper.java @@ -4,9 +4,6 @@ import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; -import org.emftext.language.java.types.TypeReference; import org.jgrapht.Graph; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; @@ -16,6 +13,10 @@ import org.somox.kdmhelper.KDMHelper; import org.somox.metrics.util.GraphPrinter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; +import tools.mdsd.jamopp.model.java.types.TypeReference; + //import de.fzi.gast.accesses.Access; //import de.fzi.gast.accesses.accessesPackage; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/helper/ClassAccessGraphEdge.java b/bundles/org.somox.metrics/src/org/somox/metrics/helper/ClassAccessGraphEdge.java index a57c564..5eecebe 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/helper/ClassAccessGraphEdge.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/helper/ClassAccessGraphEdge.java @@ -1,8 +1,9 @@ package org.somox.metrics.helper; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.types.GASTClass; /** diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/helper/ComponentToImplementingClassesHelper.java b/bundles/org.somox.metrics/src/org/somox/metrics/helper/ComponentToImplementingClassesHelper.java index c28c685..579ba6a 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/helper/ComponentToImplementingClassesHelper.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/helper/ComponentToImplementingClassesHelper.java @@ -6,12 +6,13 @@ import java.util.Map; import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; //import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; import org.somox.sourcecodedecorator.InterfaceSourceCodeLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Helper for calculating recursively associated classes for a component. * diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/helper/SourceClassEdgeFilter.java b/bundles/org.somox.metrics/src/org/somox/metrics/helper/SourceClassEdgeFilter.java index a242da4..f7c594c 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/helper/SourceClassEdgeFilter.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/helper/SourceClassEdgeFilter.java @@ -2,9 +2,10 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.types.GASTClass; public class SourceClassEdgeFilter extends BaseFilter { diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/helper/TargetClassEdgeFilter.java b/bundles/org.somox.metrics/src/org/somox/metrics/helper/TargetClassEdgeFilter.java index 3401031..7bd5791 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/helper/TargetClassEdgeFilter.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/helper/TargetClassEdgeFilter.java @@ -2,9 +2,10 @@ import java.util.Set; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.somox.filter.BaseFilter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.types.GASTClass; public class TargetClassEdgeFilter extends BaseFilter { diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/AbstractHierarchyMapping.java b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/AbstractHierarchyMapping.java index 92b3d6d..c323be0 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/AbstractHierarchyMapping.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/AbstractHierarchyMapping.java @@ -6,11 +6,12 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.abstractmetrics.AbstractMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.core.ModelElement; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/DirectoryMapping.java b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/DirectoryMapping.java index 7e17681..3e1b9c4 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/DirectoryMapping.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/DirectoryMapping.java @@ -1,12 +1,13 @@ package org.somox.metrics.hierarchy; -import org.emftext.language.java.containers.Package; +import org.somox.kdmhelper.KDMHelper; +import org.somox.metrics.MetricID; + +import tools.mdsd.jamopp.model.java.containers.Package; //package org.somox.metrics.hierarchy; -import org.emftext.language.java.types.Type; -import org.somox.kdmhelper.KDMHelper; -import org.somox.metrics.MetricID; +import tools.mdsd.jamopp.model.java.types.Type; //import de.fzi.gast.core.Package; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/PackageMapping.java b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/PackageMapping.java index 4d74a14..7a077c1 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/PackageMapping.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/hierarchy/PackageMapping.java @@ -1,12 +1,13 @@ package org.somox.metrics.hierarchy; -import org.emftext.language.java.containers.Package; +import org.somox.kdmhelper.KDMHelper; +import org.somox.metrics.MetricID; + +import tools.mdsd.jamopp.model.java.containers.Package; //import de.fzi.gast.core.Package; //import de.fzi.gast.types.GASTClass; //import Type; -import org.emftext.language.java.types.Type; -import org.somox.kdmhelper.KDMHelper; -import org.somox.metrics.MetricID; +import tools.mdsd.jamopp.model.java.types.Type; /** * PackageMapping metric: Checks how well component candidates are arranged in diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/naming/NameResemblance.java b/bundles/org.somox.metrics/src/org/somox/metrics/naming/NameResemblance.java index ce793b9..c287be4 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/naming/NameResemblance.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/naming/NameResemblance.java @@ -8,8 +8,6 @@ import java.util.StringTokenizer; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.KDMHelper; @@ -23,6 +21,9 @@ import org.somox.metrics.tabs.MetricTab; import org.somox.metrics.tabs.NameResemblanceTab; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + class NamePair { private final Type class1; private final Type class2; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/structure/SliceLayerArchitectureQuality.java b/bundles/org.somox.metrics/src/org/somox/metrics/structure/SliceLayerArchitectureQuality.java index 0d7aa15..a648bfb 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/structure/SliceLayerArchitectureQuality.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/structure/SliceLayerArchitectureQuality.java @@ -3,13 +3,14 @@ import java.util.Set; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; import org.somox.metrics.ClusteringRelation; import org.somox.metrics.MetricID; import org.somox.metrics.abstractmetrics.AbstractMetric; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.types.GASTClass; /** @@ -47,18 +48,18 @@ protected void internalComputeDirected(final ClusteringRelation relationToComput .deriveImplementingClasses(relationToCompute.getTargetComponent()); // compute overall prefix - final org.emftext.language.java.containers.Package prefixPackage = computePrefix(classes1, classes2); + final tools.mdsd.jamopp.model.java.containers.Package prefixPackage = computePrefix(classes1, classes2); if (prefixPackage == null) { relationToCompute.setResultMetric(getMID(), 0.0); return; } - final EList slices = KDMHelper.getOwnedPackages(prefixPackage); - EList layers = null; + final EList slices = KDMHelper.getOwnedPackages(prefixPackage); + EList layers = null; // compute the maximum number of layers in a slice int max = 0; - for (final org.emftext.language.java.containers.Package current : slices) { + for (final tools.mdsd.jamopp.model.java.containers.Package current : slices) { if (KDMHelper.getOwnedPackages(current).size() >= max) { layers = KDMHelper.getOwnedPackages(current); max = layers.size(); @@ -72,11 +73,11 @@ protected void internalComputeDirected(final ClusteringRelation relationToComput final int expectedSubsystems = slices.size() * layers.size(); int existingSubsystems = 0; - for (final org.emftext.language.java.containers.Package currentSlice : slices) { - final EList currentLayers = KDMHelper + for (final tools.mdsd.jamopp.model.java.containers.Package currentSlice : slices) { + final EList currentLayers = KDMHelper .getOwnedPackages(currentSlice); - for (final org.emftext.language.java.containers.Package currentReferencePackage : layers) { - for (final org.emftext.language.java.containers.Package currentLayer : currentLayers) { + for (final tools.mdsd.jamopp.model.java.containers.Package currentReferencePackage : layers) { + for (final tools.mdsd.jamopp.model.java.containers.Package currentLayer : currentLayers) { if (currentLayer.getName().equals(currentReferencePackage.getName())) { existingSubsystems++; break; @@ -117,10 +118,10 @@ public MetricID getMID() { * @return the last package in the package-hierarchy in which all elements are * included */ - private org.emftext.language.java.containers.Package computePrefix(final Set elements1, + private tools.mdsd.jamopp.model.java.containers.Package computePrefix(final Set elements1, final Set elements2) { boolean prefixFound = false; - org.emftext.language.java.containers.Package currentPackage = null; + tools.mdsd.jamopp.model.java.containers.Package currentPackage = null; for (final Type current : elements1) { if (KDMHelper.getSurroundingPackage(current) != null) { diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/structure/SubsystemComponent.java b/bundles/org.somox.metrics/src/org/somox/metrics/structure/SubsystemComponent.java index fd2b7ff..e371f67 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/structure/SubsystemComponent.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/structure/SubsystemComponent.java @@ -5,9 +5,6 @@ import java.util.Set; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.containers.Package; -import org.emftext.language.java.types.Type; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.KDMHelper; @@ -19,6 +16,10 @@ import org.somox.metrics.helper.ClassAccessGraphEdge; import org.somox.metrics.helper.ComponentToImplementingClassesHelper; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.containers.Package; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.core.Package; //import de.fzi.gast.core.Root; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/BlacklistTab.java b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/BlacklistTab.java index ff5237b..1a7c85e 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/BlacklistTab.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/BlacklistTab.java @@ -28,12 +28,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; -import org.emftext.language.java.commons.Commentable; -import org.emftext.language.java.types.Type; import org.somox.configuration.SoMoXConfiguration; import org.somox.kdmhelper.KDMHelper; import org.somox.kdmhelper.metamodeladdition.Root; +import tools.mdsd.jamopp.model.java.commons.Commentable; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.core.Root; //import de.fzi.gast.types.GASTClass; @@ -306,9 +307,9 @@ private void initializeTreeViewer(final Set wildcardSet) { checkboxTreeViewer.collapseAll(); for (final Object currentElement : elements) { - if (currentElement instanceof org.emftext.language.java.containers.Package) { - if (wildcardSet.contains(KDMHelper - .computeFullQualifiedName(((org.emftext.language.java.containers.Package) currentElement)))) { + if (currentElement instanceof tools.mdsd.jamopp.model.java.containers.Package) { + if (wildcardSet.contains(KDMHelper.computeFullQualifiedName( + ((tools.mdsd.jamopp.model.java.containers.Package) currentElement)))) { checkboxTreeViewer.setChecked(currentElement, true); } } else if ((currentElement instanceof Type) @@ -347,12 +348,12 @@ private Set getTreeSelection() { if (current instanceof Type) { // wildcards[i] = ((GASTClass) current).getQualifiedName(); wildcards.add(KDMHelper.computeFullQualifiedName(((Type) current))); - } else if (current instanceof org.emftext.language.java.containers.Package) { + } else if (current instanceof tools.mdsd.jamopp.model.java.containers.Package) { // wildcards[i] = ((de.fzi.gast.core.Package) current).getQualifiedName()+ ".*"; // TODO: wildcard for packages conflict with usability - wildcards.add( - KDMHelper.computeFullQualifiedName(((org.emftext.language.java.containers.Package) current))); + wildcards.add(KDMHelper + .computeFullQualifiedName(((tools.mdsd.jamopp.model.java.containers.Package) current))); } // i++; } diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxContentProvider.java b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxContentProvider.java index a2b629e..c4e9a2e 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxContentProvider.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxContentProvider.java @@ -2,11 +2,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.emftext.language.java.containers.Package; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.KDMHelper; import org.somox.kdmhelper.metamodeladdition.Root; +import tools.mdsd.jamopp.model.java.containers.Package; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.core.Root; //import de.fzi.gast.types.GASTClass; @@ -18,7 +19,8 @@ public Object[] getChildren(final Object parentElement) { return ((Root) parentElement).getPackages().toArray(); } if (parentElement instanceof Package) { - return KDMHelper.getOwnedPackages((org.emftext.language.java.containers.Package) parentElement).toArray(); + return KDMHelper.getOwnedPackages((tools.mdsd.jamopp.model.java.containers.Package) parentElement) + .toArray(); // Object [] classes = ((Package) parentElement).getOwnedElements().toArray(); // // Object [] elements = new Object [packages.length + classes.length]; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxLabelProvider.java b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxLabelProvider.java index 473a57a..837cd04 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxLabelProvider.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/tabs/CheckboxLabelProvider.java @@ -3,9 +3,10 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.swt.graphics.Image; -import org.emftext.language.java.types.Type; import org.somox.kdmhelper.metamodeladdition.Root; +import tools.mdsd.jamopp.model.java.types.Type; + //import de.fzi.gast.core.Root; //import de.fzi.gast.types.GASTClass; diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/util/AccessCacheGraph.java b/bundles/org.somox.metrics/src/org/somox/metrics/util/AccessCacheGraph.java index acf7991..e46ef7c 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/util/AccessCacheGraph.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/util/AccessCacheGraph.java @@ -4,7 +4,6 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.jgrapht.graph.DefaultDirectedGraph; import org.somox.filter.BaseFilter; import org.somox.filter.NotFilter; @@ -12,6 +11,8 @@ import org.somox.metrics.helper.SourceClassEdgeFilter; import org.somox.metrics.helper.TargetClassEdgeFilter; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + //import de.fzi.gast.types.GASTClass; /** diff --git a/bundles/org.somox.metrics/src/org/somox/metrics/util/GraphPrinter.java b/bundles/org.somox.metrics/src/org/somox/metrics/util/GraphPrinter.java index 5a821cf..a63f665 100644 --- a/bundles/org.somox.metrics/src/org/somox/metrics/util/GraphPrinter.java +++ b/bundles/org.somox.metrics/src/org/somox/metrics/util/GraphPrinter.java @@ -10,14 +10,15 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; -import org.emftext.language.java.classifiers.ConcreteClassifier; -import org.emftext.language.java.types.Type; import org.jgrapht.Graph; import org.somox.kdmhelper.KDMHelper; import org.somox.metrics.helper.ComponentToImplementingClassesHelper; //import de.fzi.gast.types.GASTClass; import org.somox.sourcecodedecorator.ComponentImplementingClassesLink; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; +import tools.mdsd.jamopp.model.java.types.Type; + /** * Helper class used in SoMoX to dump internal graphs in GraphML and DOT file * format for debugging and metric calibration diff --git a/bundles/org.somox.metricvaluesstorage/META-INF/MANIFEST.MF b/bundles/org.somox.metricvaluesstorage/META-INF/MANIFEST.MF index 3e4c963..2b34cf2 100644 --- a/bundles/org.somox.metricvaluesstorage/META-INF/MANIFEST.MF +++ b/bundles/org.somox.metricvaluesstorage/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Export-Package: metricvalues, metricvalues.impl, metricvalues.util Require-Bundle: org.eclipse.emf.ecore.xmi, - org.emftext.language.java, org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport + org.eclipse.emf.ecore;visibility:=reexport, + tools.mdsd.jamopp.model.java Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.somox.metricvaluesstorage diff --git a/bundles/org.somox.metricvaluesstorage/MetricValues2.ecore b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecore old mode 100755 new mode 100644 similarity index 97% rename from bundles/org.somox.metricvaluesstorage/MetricValues2.ecore rename to bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecore index 0c7fa37..20759d5 --- a/bundles/org.somox.metricvaluesstorage/MetricValues2.ecore +++ b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecore @@ -1,72 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.somox.metricvaluesstorage/MetricValues2.ecorediag b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecorediag old mode 100755 new mode 100644 similarity index 98% rename from bundles/org.somox.metricvaluesstorage/MetricValues2.ecorediag rename to bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecorediag index 4e82ceb..6733837 --- a/bundles/org.somox.metricvaluesstorage/MetricValues2.ecorediag +++ b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.ecorediag @@ -1,236 +1,236 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.somox.metricvaluesstorage/MetricValues2.genmodel b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.genmodel old mode 100755 new mode 100644 similarity index 89% rename from bundles/org.somox.metricvaluesstorage/MetricValues2.genmodel rename to bundles/org.somox.metricvaluesstorage/model/MetricValues2.genmodel index c14b744..8dc98d0 --- a/bundles/org.somox.metricvaluesstorage/MetricValues2.genmodel +++ b/bundles/org.somox.metricvaluesstorage/model/MetricValues2.genmodel @@ -1,60 +1,63 @@ - - - MetricValues2.ecore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + MetricValues2.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.somox.metricvaluesstorage/src/metricvalues/Component.java b/bundles/org.somox.metricvaluesstorage/src/metricvalues/Component.java index eeb5085..9f0dc77 100755 --- a/bundles/org.somox.metricvaluesstorage/src/metricvalues/Component.java +++ b/bundles/org.somox.metricvaluesstorage/src/metricvalues/Component.java @@ -4,7 +4,8 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.types.Type; + +import tools.mdsd.jamopp.model.java.types.Type; /** * A representation of the model object @@ -100,7 +101,7 @@ public interface Component extends EObject { /** * Returns the value of the 'Classes' reference list. The list - * contents are of type {@link org.emftext.language.java.types.Type}. *

        * If the meaning of the 'Classes' reference list isn't clear, there diff --git a/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/ComponentImpl.java b/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/ComponentImpl.java index 55c7e33..52ca4a4 100755 --- a/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/ComponentImpl.java +++ b/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/ComponentImpl.java @@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.emftext.language.java.types.Type; import metricvalues.Component; import metricvalues.MetricvaluesPackage; +import tools.mdsd.jamopp.model.java.types.Type; /** * An implementation of the model object diff --git a/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/MetricvaluesPackageImpl.java b/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/MetricvaluesPackageImpl.java index 6c9d6f2..8117816 100755 --- a/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/MetricvaluesPackageImpl.java +++ b/bundles/org.somox.metricvaluesstorage/src/metricvalues/impl/MetricvaluesPackageImpl.java @@ -7,24 +7,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.emftext.language.java.annotations.AnnotationsPackage; -import org.emftext.language.java.arrays.ArraysPackage; -import org.emftext.language.java.classifiers.ClassifiersPackage; -import org.emftext.language.java.commons.CommonsPackage; -import org.emftext.language.java.containers.ContainersPackage; -import org.emftext.language.java.expressions.ExpressionsPackage; -import org.emftext.language.java.generics.GenericsPackage; -import org.emftext.language.java.imports.ImportsPackage; -import org.emftext.language.java.instantiations.InstantiationsPackage; -import org.emftext.language.java.literals.LiteralsPackage; -import org.emftext.language.java.members.MembersPackage; -import org.emftext.language.java.modifiers.ModifiersPackage; -import org.emftext.language.java.operators.OperatorsPackage; -import org.emftext.language.java.parameters.ParametersPackage; -import org.emftext.language.java.references.ReferencesPackage; -import org.emftext.language.java.statements.StatementsPackage; -import org.emftext.language.java.types.TypesPackage; -import org.emftext.language.java.variables.VariablesPackage; import metricvalues.Component; import metricvalues.ComponentCandidate; @@ -33,6 +15,24 @@ import metricvalues.MetricValuesModel; import metricvalues.MetricvaluesFactory; import metricvalues.MetricvaluesPackage; +import tools.mdsd.jamopp.model.java.annotations.AnnotationsPackage; +import tools.mdsd.jamopp.model.java.arrays.ArraysPackage; +import tools.mdsd.jamopp.model.java.classifiers.ClassifiersPackage; +import tools.mdsd.jamopp.model.java.commons.CommonsPackage; +import tools.mdsd.jamopp.model.java.containers.ContainersPackage; +import tools.mdsd.jamopp.model.java.expressions.ExpressionsPackage; +import tools.mdsd.jamopp.model.java.generics.GenericsPackage; +import tools.mdsd.jamopp.model.java.imports.ImportsPackage; +import tools.mdsd.jamopp.model.java.instantiations.InstantiationsPackage; +import tools.mdsd.jamopp.model.java.literals.LiteralsPackage; +import tools.mdsd.jamopp.model.java.members.MembersPackage; +import tools.mdsd.jamopp.model.java.modifiers.ModifiersPackage; +import tools.mdsd.jamopp.model.java.operators.OperatorsPackage; +import tools.mdsd.jamopp.model.java.parameters.ParametersPackage; +import tools.mdsd.jamopp.model.java.references.ReferencesPackage; +import tools.mdsd.jamopp.model.java.statements.StatementsPackage; +import tools.mdsd.jamopp.model.java.types.TypesPackage; +import tools.mdsd.jamopp.model.java.variables.VariablesPackage; /** * An implementation of the model Package. + * This is the item provider adapter for a + * {@link org.somox.seff2javaast.SEFF2JavaAST} object. + * * * @generated */ public class SEFF2JavaASTItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. + * This constructs an instance from a factory and a notifier. * * @generated */ @@ -40,36 +41,36 @@ public SEFF2JavaASTItemProvider(final AdapterFactory adapterFactory) { } /** - * This returns the property descriptors for the adapted class. + * This returns the property descriptors for the adapted class. * * @generated */ @Override public List getPropertyDescriptors(final Object object) { - if (this.itemPropertyDescriptors == null) { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); } - return this.itemPropertyDescriptors; + return itemPropertyDescriptors; } /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate - * feature for an {@link org.eclipse.emf.edit.command.AddCommand}, + * This specifies how to implement {@link #getChildren} and is used to deduce an + * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * * * @generated */ @Override public Collection getChildrenFeatures(final Object object) { - if (this.childrenFeatures == null) { + if (childrenFeatures == null) { super.getChildrenFeatures(object); - this.childrenFeatures.add(Seff2javaastPackage.Literals.SEFF2_JAVA_AST__SEFF2_METHOD_MAPPINGS); + childrenFeatures.add(Seff2javaastPackage.Literals.SEFF2_JAVA_AST__SEFF2_METHOD_MAPPINGS); } - return this.childrenFeatures; + return childrenFeatures; } /** @@ -79,7 +80,8 @@ public Collection getChildrenFeatures(final Object */ @Override protected EStructuralFeature getChildFeature(final Object object, final Object child) { - // Check the type of the specified child object and return the proper feature to use for + // Check the type of the specified child object and return the proper feature to + // use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); @@ -92,12 +94,12 @@ protected EStructuralFeature getChildFeature(final Object object, final Object c */ @Override public Object getImage(final Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SEFF2JavaAST")); + return overlayImage(object, this.getResourceLocator().getImage("full/obj16/SEFF2JavaAST")); } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @@ -107,27 +109,28 @@ public String getText(final Object object) { } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged} - * . + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged} . * * @generated */ @Override public void notifyChanged(final Notification notification) { - this.updateChildren(notification); + updateChildren(notification); switch (notification.getFeatureID(SEFF2JavaAST.class)) { case Seff2javaastPackage.SEFF2_JAVA_AST__SEFF2_METHOD_MAPPINGS: - this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } super.notifyChanged(notification); } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that - * can be created under this object. + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * * * @generated */ @@ -135,14 +138,13 @@ public void notifyChanged(final Notification notification) { protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors - .add(this.createChildParameter(Seff2javaastPackage.Literals.SEFF2_JAVA_AST__SEFF2_METHOD_MAPPINGS, - Seff2javaastFactory.eINSTANCE.createSEFF2MethodMapping())); + newChildDescriptors.add(createChildParameter(Seff2javaastPackage.Literals.SEFF2_JAVA_AST__SEFF2_METHOD_MAPPINGS, + Seff2javaastFactory.eINSTANCE.createSEFF2MethodMapping())); } /** - * Return the resource locator for this item provider's resources. + * Return the resource locator for this item provider's resources. * * @generated */ diff --git a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/SEFF2MethodMappingItemProvider.java b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/SEFF2MethodMappingItemProvider.java index a4a162b..fbcc3ee 100644 --- a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/SEFF2MethodMappingItemProvider.java +++ b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/SEFF2MethodMappingItemProvider.java @@ -19,16 +19,17 @@ import org.somox.seff2javaast.Seff2javaastPackage; /** - * This is the item provider adapter for a {@link org.somox.seff2javaast.SEFF2MethodMapping} object. - * + * This is the item provider adapter for a + * {@link org.somox.seff2javaast.SEFF2MethodMapping} object. * * @generated */ public class SEFF2MethodMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. + * This constructs an instance from a factory and a notifier. * * @generated */ @@ -37,66 +38,67 @@ public SEFF2MethodMappingItemProvider(final AdapterFactory adapterFactory) { } /** - * This returns the property descriptors for the adapted class. + * This returns the property descriptors for the adapted class. * * @generated */ @Override public List getPropertyDescriptors(final Object object) { - if (this.itemPropertyDescriptors == null) { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - this.addBlockstatementPropertyDescriptor(object); - this.addSeffPropertyDescriptor(object); + addBlockstatementPropertyDescriptor(object); + addSeffPropertyDescriptor(object); } - return this.itemPropertyDescriptors; + return itemPropertyDescriptors; } /** - * This adds a property descriptor for the Blockstatement feature. + * This adds a property descriptor for the Blockstatement feature. * * @generated */ protected void addBlockstatementPropertyDescriptor(final Object object) { - this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor( - ((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SEFF2MethodMapping_blockstatement_feature"), - this.getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_blockstatement_feature", - "_UI_SEFF2MethodMapping_type"), - Seff2javaastPackage.Literals.SEFF2_METHOD_MAPPING__BLOCKSTATEMENT, true, false, true, null, null, - null)); + itemPropertyDescriptors.add( + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + this.getResourceLocator(), this.getString("_UI_SEFF2MethodMapping_blockstatement_feature"), + this.getString("_UI_PropertyDescriptor_description", + "_UI_SEFF2MethodMapping_blockstatement_feature", "_UI_SEFF2MethodMapping_type"), + Seff2javaastPackage.Literals.SEFF2_METHOD_MAPPING__BLOCKSTATEMENT, true, false, true, null, + null, null)); } /** - * This adds a property descriptor for the Seff feature. + * This adds a property descriptor for the Seff feature. + * * * @generated */ protected void addSeffPropertyDescriptor(final Object object) { - this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor( - ((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SEFF2MethodMapping_seff_feature"), - this.getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_seff_feature", - "_UI_SEFF2MethodMapping_type"), - Seff2javaastPackage.Literals.SEFF2_METHOD_MAPPING__SEFF, true, false, true, null, null, null)); + itemPropertyDescriptors.add( + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + this.getResourceLocator(), this.getString("_UI_SEFF2MethodMapping_seff_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_seff_feature", + "_UI_SEFF2MethodMapping_type"), + Seff2javaastPackage.Literals.SEFF2_METHOD_MAPPING__SEFF, true, false, true, null, null, null)); } /** - * This returns SEFF2MethodMapping.gif. + * This returns SEFF2MethodMapping.gif. * * @generated */ @Override public Object getImage(final Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SEFF2MethodMapping")); + return overlayImage(object, this.getResourceLocator().getImage("full/obj16/SEFF2MethodMapping")); } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @@ -106,21 +108,22 @@ public String getText(final Object object) { } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged} - * . + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged} . * * @generated */ @Override public void notifyChanged(final Notification notification) { - this.updateChildren(notification); + updateChildren(notification); super.notifyChanged(notification); } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that - * can be created under this object. + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * * * @generated */ @@ -130,8 +133,8 @@ protected void collectNewChildDescriptors(final Collection newChildDescr } /** - * Return the resource locator for this item provider's resources. + * Return the resource locator for this item provider's resources. * * @generated */ diff --git a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2java_astEditPlugin.java b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2java_astEditPlugin.java index 4a259cb..4c1423e 100644 --- a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2java_astEditPlugin.java +++ b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2java_astEditPlugin.java @@ -4,17 +4,17 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.emftext.language.java.annotations.provider.JavaEditPlugin; import org.palladiosimulator.pcm.core.provider.PalladioComponentModelEditPlugin; import de.uka.ipd.sdq.identifier.provider.IdentifierEditPlugin; import de.uka.ipd.sdq.probfunction.provider.ProbabilityFunctionEditPlugin; import de.uka.ipd.sdq.stoex.provider.StoexEditPlugin; import de.uka.ipd.sdq.units.provider.UnitsEditPlugin; +import tools.mdsd.jamopp.model.java.annotations.provider.JavaEditPlugin; /** - * This is the central singleton for the Seff2java_ast edit plugin. + * This is the central singleton for the Seff2java_ast edit plugin. * * @generated */ @@ -45,8 +45,8 @@ public Seff2java_astEditPlugin() { } /** - * Returns the singleton instance of the Eclipse plugin. + * Returns the singleton instance of the Eclipse plugin. + * * * @return the singleton instance. * @generated @@ -57,8 +57,8 @@ public ResourceLocator getPluginResourceLocator() { } /** - * Returns the singleton instance of the Eclipse plugin. + * Returns the singleton instance of the Eclipse plugin. + * * * @return the singleton instance. * @generated @@ -68,8 +68,8 @@ public static Implementation getPlugin() { } /** - * The actual implementation of the Eclipse Plugin. + * The actual implementation of the Eclipse Plugin. * * @generated */ @@ -80,8 +80,6 @@ public static class Implementation extends EclipsePlugin { * @generated */ public Implementation() { - super(); - // Remember the static instance. // plugin = this; diff --git a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2javaastItemProviderAdapterFactory.java b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2javaastItemProviderAdapterFactory.java index 5c03d57..f62df95 100644 --- a/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2javaastItemProviderAdapterFactory.java +++ b/bundles/org.somox.seff2javaast.edit/src/org/somox/seff2javaast/provider/Seff2javaastItemProviderAdapterFactory.java @@ -22,10 +22,11 @@ import org.somox.seff2javaast.util.Seff2javaastAdapterFactory; /** - * This is the factory that is used to provide the interfaces needed to support Viewers. The - * adapters generated by this factory convert EMF adapter notifications into calls to - * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets. - * Note that most of the adapters are shared among multiple instances. * * @generated @@ -33,28 +34,30 @@ public class Seff2javaastItemProviderAdapterFactory extends Seff2javaastAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this adapter factory. + * This keeps track of the root adapter factory that delegates to this adapter + * factory. * * @generated */ protected ComposedAdapterFactory parentAdapterFactory; /** - * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. + * This is used to implement + * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. * * @generated */ protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** - * This keeps track of all the supported types checked by {@link #isFactoryForType - * isFactoryForType}. + * This keeps track of all the supported types checked by + * {@link #isFactoryForType isFactoryForType}. * * @generated */ - protected Collection supportedTypes = new ArrayList(); + protected Collection supportedTypes = new ArrayList<>(); /** * This constructs an instance. @@ -62,74 +65,76 @@ public class Seff2javaastItemProviderAdapterFactory extends Seff2javaastAdapterF * @generated */ public Seff2javaastItemProviderAdapterFactory() { - this.supportedTypes.add(IEditingDomainItemProvider.class); - this.supportedTypes.add(IStructuredItemContentProvider.class); - this.supportedTypes.add(ITreeItemContentProvider.class); - this.supportedTypes.add(IItemLabelProvider.class); - this.supportedTypes.add(IItemPropertySource.class); + supportedTypes.add(IEditingDomainItemProvider.class); + supportedTypes.add(IStructuredItemContentProvider.class); + supportedTypes.add(ITreeItemContentProvider.class); + supportedTypes.add(IItemLabelProvider.class); + supportedTypes.add(IItemPropertySource.class); } /** * This keeps track of the one adapter used for all - * {@link org.somox.seff2javaast.SEFF2MethodMapping} instances. + * {@link org.somox.seff2javaast.SEFF2MethodMapping} instances. * * @generated */ protected SEFF2MethodMappingItemProvider seff2MethodMappingItemProvider; /** - * This creates an adapter for a {@link org.somox.seff2javaast.SEFF2MethodMapping}. + * This creates an adapter for a + * {@link org.somox.seff2javaast.SEFF2MethodMapping}. + * * * @generated */ @Override public Adapter createSEFF2MethodMappingAdapter() { - if (this.seff2MethodMappingItemProvider == null) { - this.seff2MethodMappingItemProvider = new SEFF2MethodMappingItemProvider(this); + if (seff2MethodMappingItemProvider == null) { + seff2MethodMappingItemProvider = new SEFF2MethodMappingItemProvider(this); } - return this.seff2MethodMappingItemProvider; + return seff2MethodMappingItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.somox.seff2javaast.SEFF2JavaAST} - * instances. + * This keeps track of the one adapter used for all + * {@link org.somox.seff2javaast.SEFF2JavaAST} instances. * * @generated */ protected SEFF2JavaASTItemProvider seff2JavaASTItemProvider; /** - * This creates an adapter for a {@link org.somox.seff2javaast.SEFF2JavaAST}. + * This creates an adapter for a {@link org.somox.seff2javaast.SEFF2JavaAST}. + * * * @generated */ @Override public Adapter createSEFF2JavaASTAdapter() { - if (this.seff2JavaASTItemProvider == null) { - this.seff2JavaASTItemProvider = new SEFF2JavaASTItemProvider(this); + if (seff2JavaASTItemProvider == null) { + seff2JavaASTItemProvider = new SEFF2JavaASTItemProvider(this); } - return this.seff2JavaASTItemProvider; + return seff2JavaASTItemProvider; } /** - * This returns the root adapter factory that contains this factory. - * + * This returns the root adapter factory that contains this factory. * * @generated */ @Override public ComposeableAdapterFactory getRootAdapterFactory() { - return this.parentAdapterFactory == null ? this : this.parentAdapterFactory.getRootAdapterFactory(); + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); } /** - * This sets the composed adapter factory that contains this factory. - * + * This sets the composed adapter factory that contains this factory. * * @generated */ @@ -145,12 +150,12 @@ public void setParentAdapterFactory(final ComposedAdapterFactory parentAdapterFa */ @Override public boolean isFactoryForType(final Object type) { - return this.supportedTypes.contains(type) || super.isFactoryForType(type); + return supportedTypes.contains(type) || super.isFactoryForType(type); } /** - * This implementation substitutes the factory itself as the key for the adapter. + * This implementation substitutes the factory itself as the key for the + * adapter. * * @generated */ @@ -166,7 +171,7 @@ public Adapter adapt(final Notifier notifier, final Object type) { */ @Override public Object adapt(final Object object, final Object type) { - if (this.isFactoryForType(type)) { + if (isFactoryForType(type)) { final Object adapter = super.adapt(object, type); if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) { return adapter; @@ -183,7 +188,7 @@ public Object adapt(final Object object, final Object type) { */ @Override public void addListener(final INotifyChangedListener notifyChangedListener) { - this.changeNotifier.addListener(notifyChangedListener); + changeNotifier.addListener(notifyChangedListener); } /** @@ -193,37 +198,37 @@ public void addListener(final INotifyChangedListener notifyChangedListener) { */ @Override public void removeListener(final INotifyChangedListener notifyChangedListener) { - this.changeNotifier.removeListener(notifyChangedListener); + changeNotifier.removeListener(notifyChangedListener); } /** - * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. + * This delegates to {@link #changeNotifier} and to + * {@link #parentAdapterFactory}. * * @generated */ @Override public void fireNotifyChanged(final Notification notification) { - this.changeNotifier.fireNotifyChanged(notification); + changeNotifier.fireNotifyChanged(notification); - if (this.parentAdapterFactory != null) { - this.parentAdapterFactory.fireNotifyChanged(notification); + if (parentAdapterFactory != null) { + parentAdapterFactory.fireNotifyChanged(notification); } } /** - * This disposes all of the item providers created by this factory. + * This disposes all of the item providers created by this factory. * * @generated */ @Override public void dispose() { - if (this.seff2MethodMappingItemProvider != null) { - this.seff2MethodMappingItemProvider.dispose(); + if (seff2MethodMappingItemProvider != null) { + seff2MethodMappingItemProvider.dispose(); } - if (this.seff2JavaASTItemProvider != null) { - this.seff2JavaASTItemProvider.dispose(); + if (seff2JavaASTItemProvider != null) { + seff2JavaASTItemProvider.dispose(); } } diff --git a/bundles/org.somox.seff2javaast.editor/META-INF/MANIFEST.MF b/bundles/org.somox.seff2javaast.editor/META-INF/MANIFEST.MF index a97f019..59570fe 100644 --- a/bundles/org.somox.seff2javaast.editor/META-INF/MANIFEST.MF +++ b/bundles/org.somox.seff2javaast.editor/META-INF/MANIFEST.MF @@ -16,10 +16,11 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit.ui;visibility:=reexport, org.eclipse.ui.ide;visibility:=reexport, de.uka.ipd.sdq.identifier.edit;visibility:=reexport, - org.emftext.language.java.edit;visibility:=reexport, org.palladiosimulator.pcm.edit;visibility:=reexport, de.uka.ipd.sdq.probfunction.edit;visibility:=reexport, de.uka.ipd.sdq.stoex.edit;visibility:=reexport, - de.uka.ipd.sdq.units.edit;visibility:=reexport + de.uka.ipd.sdq.units.edit;visibility:=reexport, + tools.mdsd.jamopp.model.java, + tools.mdsd.jamopp.model.java.edit Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.somox.seff2javaast.editor diff --git a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2java_astEditorPlugin.java b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2java_astEditorPlugin.java index 9ab7724..15158d8 100644 --- a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2java_astEditorPlugin.java +++ b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2java_astEditorPlugin.java @@ -5,17 +5,17 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.ui.EclipseUIPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.emftext.language.java.annotations.provider.JavaEditPlugin; import org.palladiosimulator.pcm.core.provider.PalladioComponentModelEditPlugin; import de.uka.ipd.sdq.identifier.provider.IdentifierEditPlugin; import de.uka.ipd.sdq.probfunction.provider.ProbabilityFunctionEditPlugin; import de.uka.ipd.sdq.stoex.provider.StoexEditPlugin; import de.uka.ipd.sdq.units.provider.UnitsEditPlugin; +import tools.mdsd.jamopp.model.java.annotations.provider.JavaEditPlugin; /** - * This is the central singleton for the Seff2java_ast editor plugin. + * This is the central singleton for the Seff2java_ast editor plugin. * * @generated */ @@ -46,8 +46,8 @@ public Seff2java_astEditorPlugin() { } /** - * Returns the singleton instance of the Eclipse plugin. + * Returns the singleton instance of the Eclipse plugin. + * * * @return the singleton instance. * @generated @@ -58,8 +58,8 @@ public ResourceLocator getPluginResourceLocator() { } /** - * Returns the singleton instance of the Eclipse plugin. + * Returns the singleton instance of the Eclipse plugin. + * * * @return the singleton instance. * @generated @@ -69,8 +69,8 @@ public static Implementation getPlugin() { } /** - * The actual implementation of the Eclipse Plugin. + * The actual implementation of the Eclipse Plugin. * * @generated */ @@ -81,8 +81,6 @@ public static class Implementation extends EclipseUIPlugin { * @generated */ public Implementation() { - super(); - // Remember the static instance. // plugin = this; diff --git a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastActionBarContributor.java b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastActionBarContributor.java index 3d18a28..a8bb8c0 100644 --- a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastActionBarContributor.java +++ b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastActionBarContributor.java @@ -19,7 +19,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IContributionManager; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; @@ -35,30 +34,32 @@ import org.eclipse.ui.PartInitException; /** - * This is the action bar contributor for the Seff2javaast model editor. - * + * This is the action bar contributor for the Seff2javaast model editor. * * @generated */ public class Seff2javaastActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener { /** - * This keeps track of the active editor. + * This keeps track of the active editor. * * @generated */ protected IEditorPart activeEditorPart; /** - * This keeps track of the current selection provider. + * This keeps track of the current selection provider. + * * * @generated */ protected ISelectionProvider selectionProvider; /** - * This action opens the Properties view. + * This action opens the Properties view. * * @generated */ @@ -75,9 +76,9 @@ public void run() { }; /** - * This action refreshes the viewer of the current editor if the editor implements - * {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. + * This action refreshes the viewer of the current editor if the editor + * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. * * @generated */ @@ -85,14 +86,13 @@ public void run() { Seff2java_astEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { @Override public boolean isEnabled() { - return Seff2javaastActionBarContributor.this.activeEditorPart instanceof IViewerProvider; + return activeEditorPart instanceof IViewerProvider; } @Override public void run() { - if (Seff2javaastActionBarContributor.this.activeEditorPart instanceof IViewerProvider) { - final Viewer viewer = ((IViewerProvider) Seff2javaastActionBarContributor.this.activeEditorPart) - .getViewer(); + if (activeEditorPart instanceof IViewerProvider) { + final Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer(); if (viewer != null) { viewer.refresh(); } @@ -101,25 +101,27 @@ public void run() { }; /** - * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding - * to each descriptor generated for the current selection by the item provider. + * This will contain one + * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to + * each descriptor generated for the current selection by the item provider. + * * * @generated */ protected Collection createChildActions; /** - * This is the menu manager into which menu contribution items should be added for CreateChild - * actions. + * This is the menu manager into which menu contribution items should be added + * for CreateChild actions. * * @generated */ protected IMenuManager createChildMenuManager; /** - * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} - * corresponding to each descriptor generated for the current selection by the item provider. + * This will contain one + * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to + * each descriptor generated for the current selection by the item provider. * * * @generated @@ -127,28 +129,29 @@ public void run() { protected Collection createSiblingActions; /** - * This is the menu manager into which menu contribution items should be added for CreateSibling - * actions. + * This is the menu manager into which menu contribution items should be added + * for CreateSibling actions. * * @generated */ protected IMenuManager createSiblingMenuManager; /** - * This creates an instance of the contributor. + * This creates an instance of the contributor. * * @generated */ public Seff2javaastActionBarContributor() { super(ADDITIONS_LAST_STYLE); - this.loadResourceAction = new LoadResourceAction(); - this.validateAction = new ValidateAction(); - this.controlAction = new ControlAction(); + loadResourceAction = new LoadResourceAction(); + validateAction = new ValidateAction(); + controlAction = new ControlAction(); } /** - * This adds Separators for editor additions to the tool bar. + * This adds Separators for editor additions to the tool bar. * * @generated */ @@ -159,8 +162,9 @@ public void contributeToToolBar(final IToolBarManager toolBarManager) { } /** - * This adds to the menu bar a menu and some separators for editor additions, as well as the - * sub-menus for object creation items. + * This adds to the menu bar a menu and some separators for editor additions, as + * well as the sub-menus for object creation items. * * @generated */ @@ -179,64 +183,58 @@ public void contributeToMenu(final IMenuManager menuManager) { // Prepare for CreateChild item addition or removal. // - this.createChildMenuManager = new MenuManager( + createChildMenuManager = new MenuManager( Seff2java_astEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - submenuManager.insertBefore("additions", this.createChildMenuManager); + submenuManager.insertBefore("additions", createChildMenuManager); // Prepare for CreateSibling item addition or removal. // - this.createSiblingMenuManager = new MenuManager( + createSiblingMenuManager = new MenuManager( Seff2java_astEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); - submenuManager.insertBefore("additions", this.createSiblingMenuManager); + submenuManager.insertBefore("additions", createSiblingMenuManager); // Force an update because Eclipse hides empty menus now. // - submenuManager.addMenuListener(new IMenuListener() { - @Override - public void menuAboutToShow(final IMenuManager menuManager) { - menuManager.updateAll(true); - } - }); + submenuManager.addMenuListener(menuManager1 -> menuManager1.updateAll(true)); - this.addGlobalActions(submenuManager); + addGlobalActions(submenuManager); } /** - * When the active editor changes, this remembers the change and registers with it as a - * selection provider. + * When the active editor changes, this remembers the change and registers with + * it as a selection provider. * * @generated */ @Override public void setActiveEditor(final IEditorPart part) { super.setActiveEditor(part); - this.activeEditorPart = part; + activeEditorPart = part; // Switch to the new selection provider. // - if (this.selectionProvider != null) { - this.selectionProvider.removeSelectionChangedListener(this); + if (selectionProvider != null) { + selectionProvider.removeSelectionChangedListener(this); } if (part == null) { - this.selectionProvider = null; + selectionProvider = null; } else { - this.selectionProvider = part.getSite().getSelectionProvider(); - this.selectionProvider.addSelectionChangedListener(this); + selectionProvider = part.getSite().getSelectionProvider(); + selectionProvider.addSelectionChangedListener(this); // Fake a selection changed event to update the menus. // - if (this.selectionProvider.getSelection() != null) { - this.selectionChanged( - new SelectionChangedEvent(this.selectionProvider, this.selectionProvider.getSelection())); + if (selectionProvider.getSelection() != null) { + selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection())); } } } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling - * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and - * siblings that can be added to the selected object and updating the menus accordingly. + * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, + * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying + * for the children and siblings that can be added to the selected object and + * updating the menus accordingly. * * @generated */ @@ -244,11 +242,11 @@ public void setActiveEditor(final IEditorPart part) { public void selectionChanged(final SelectionChangedEvent event) { // Remove any menu items for old selection. // - if (this.createChildMenuManager != null) { - this.depopulateManager(this.createChildMenuManager, this.createChildActions); + if (createChildMenuManager != null) { + depopulateManager(createChildMenuManager, createChildActions); } - if (this.createSiblingMenuManager != null) { - this.depopulateManager(this.createSiblingMenuManager, this.createSiblingActions); + if (createSiblingMenuManager != null) { + depopulateManager(createSiblingMenuManager, createSiblingActions); } // Query the new selection for appropriate new child/sibling descriptors @@ -257,10 +255,10 @@ public void selectionChanged(final SelectionChangedEvent event) { Collection newSiblingDescriptors = null; final ISelection selection = event.getSelection(); - if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) { + if ((selection instanceof IStructuredSelection) && (((IStructuredSelection) selection).size() == 1)) { final Object object = ((IStructuredSelection) selection).getFirstElement(); - final EditingDomain domain = ((IEditingDomainProvider) this.activeEditorPart).getEditingDomain(); + final EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain(); newChildDescriptors = domain.getNewChildDescriptors(object, null); newSiblingDescriptors = domain.getNewChildDescriptors(null, object); @@ -268,50 +266,50 @@ public void selectionChanged(final SelectionChangedEvent event) { // Generate actions for selection; populate and redraw the menus. // - this.createChildActions = this.generateCreateChildActions(newChildDescriptors, selection); - this.createSiblingActions = this.generateCreateSiblingActions(newSiblingDescriptors, selection); + createChildActions = generateCreateChildActions(newChildDescriptors, selection); + createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection); - if (this.createChildMenuManager != null) { - this.populateManager(this.createChildMenuManager, this.createChildActions, null); - this.createChildMenuManager.update(true); + if (createChildMenuManager != null) { + populateManager(createChildMenuManager, createChildActions, null); + createChildMenuManager.update(true); } - if (this.createSiblingMenuManager != null) { - this.populateManager(this.createSiblingMenuManager, this.createSiblingActions, null); - this.createSiblingMenuManager.update(true); + if (createSiblingMenuManager != null) { + populateManager(createSiblingMenuManager, createSiblingActions, null); + createSiblingMenuManager.update(true); } } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in - * descriptors, and returns the collection of these actions. + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for + * each object in descriptors, and returns the collection of these + * actions. * * @generated */ protected Collection generateCreateChildActions(final Collection descriptors, final ISelection selection) { - final Collection actions = new ArrayList(); + final Collection actions = new ArrayList<>(); if (descriptors != null) { for (final Object descriptor : descriptors) { - actions.add(new CreateChildAction(this.activeEditorPart, selection, descriptor)); + actions.add(new CreateChildAction(activeEditorPart, selection, descriptor)); } } return actions; } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object - * in descriptors, and returns the collection of these actions. + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} + * for each object in descriptors, and returns the collection of + * these actions. * * @generated */ protected Collection generateCreateSiblingActions(final Collection descriptors, final ISelection selection) { - final Collection actions = new ArrayList(); + final Collection actions = new ArrayList<>(); if (descriptors != null) { for (final Object descriptor : descriptors) { - actions.add(new CreateSiblingAction(this.activeEditorPart, selection, descriptor)); + actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor)); } } return actions; @@ -320,10 +318,11 @@ protected Collection generateCreateSiblingActions(final Collection d /** * This populates the specified manager with * {@link org.eclipse.jface.action.ActionContributionItem}s based on the - * {@link org.eclipse.jface.action.IAction}s contained in the actions collection, - * by inserting them before the specified contribution item contributionID. If - * contributionID is null, they are simply added. + * {@link org.eclipse.jface.action.IAction}s contained in the + * actions collection, by inserting them before the specified + * contribution item contributionID. If contributionID + * is null, they are simply added. * * @generated */ @@ -343,8 +342,9 @@ protected void populateManager(final IContributionManager manager, final Collect /** * This removes from the specified manager all * {@link org.eclipse.jface.action.ActionContributionItem}s based on the - * {@link org.eclipse.jface.action.IAction}s contained in the actions collection. - * + * {@link org.eclipse.jface.action.IAction}s contained in the + * actions collection. * * @generated */ @@ -372,45 +372,45 @@ protected void depopulateManager(final IContributionManager manager, final Colle } /** - * This populates the pop-up menu before it appears. + * This populates the pop-up menu before it appears. + * * * @generated */ @Override public void menuAboutToShow(final IMenuManager menuManager) { super.menuAboutToShow(menuManager); - MenuManager submenuManager = null; + MenuManager submenuManager = new MenuManager( + Seff2java_astEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - submenuManager = new MenuManager(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - this.populateManager(submenuManager, this.createChildActions, null); + populateManager(submenuManager, createChildActions, null); menuManager.insertBefore("edit", submenuManager); submenuManager = new MenuManager(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); - this.populateManager(submenuManager, this.createSiblingActions, null); + populateManager(submenuManager, createSiblingActions, null); menuManager.insertBefore("edit", submenuManager); } /** - * This inserts global actions before the "additions-end" separator. - * + * This inserts global actions before the "additions-end" separator. * * @generated */ @Override protected void addGlobalActions(final IMenuManager menuManager) { menuManager.insertAfter("additions-end", new Separator("ui-actions")); - menuManager.insertAfter("ui-actions", this.showPropertiesViewAction); + menuManager.insertAfter("ui-actions", showPropertiesViewAction); - this.refreshViewerAction.setEnabled(this.refreshViewerAction.isEnabled()); - menuManager.insertAfter("ui-actions", this.refreshViewerAction); + refreshViewerAction.setEnabled(refreshViewerAction.isEnabled()); + menuManager.insertAfter("ui-actions", refreshViewerAction); super.addGlobalActions(menuManager); } /** - * This ensures that a delete action will clean up all references to deleted objects. + * This ensures that a delete action will clean up all references to deleted + * objects. * * @generated */ diff --git a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastEditor.java b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastEditor.java index 4b7a452..e8dff82 100644 --- a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastEditor.java +++ b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastEditor.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.EventObject; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -29,7 +28,6 @@ import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; -import org.eclipse.emf.common.command.CommandStackListener; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.ui.MarkerHelper; @@ -116,25 +114,6 @@ import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.PropertySheet; import org.eclipse.ui.views.properties.PropertySheetPage; -import org.emftext.commons.layout.provider.LayoutItemProviderAdapterFactory; -import org.emftext.language.java.annotations.provider.AnnotationsItemProviderAdapterFactory; -import org.emftext.language.java.arrays.provider.ArraysItemProviderAdapterFactory; -import org.emftext.language.java.classifiers.provider.ClassifiersItemProviderAdapterFactory; -import org.emftext.language.java.commons.provider.CommonsItemProviderAdapterFactory; -import org.emftext.language.java.containers.provider.ContainersItemProviderAdapterFactory; -import org.emftext.language.java.expressions.provider.ExpressionsItemProviderAdapterFactory; -import org.emftext.language.java.generics.provider.GenericsItemProviderAdapterFactory; -import org.emftext.language.java.imports.provider.ImportsItemProviderAdapterFactory; -import org.emftext.language.java.instantiations.provider.InstantiationsItemProviderAdapterFactory; -import org.emftext.language.java.literals.provider.LiteralsItemProviderAdapterFactory; -import org.emftext.language.java.members.provider.MembersItemProviderAdapterFactory; -import org.emftext.language.java.modifiers.provider.ModifiersItemProviderAdapterFactory; -import org.emftext.language.java.operators.provider.OperatorsItemProviderAdapterFactory; -import org.emftext.language.java.parameters.provider.ParametersItemProviderAdapterFactory; -import org.emftext.language.java.references.provider.ReferencesItemProviderAdapterFactory; -import org.emftext.language.java.statements.provider.StatementsItemProviderAdapterFactory; -import org.emftext.language.java.types.provider.TypesItemProviderAdapterFactory; -import org.emftext.language.java.variables.provider.VariablesItemProviderAdapterFactory; import org.palladiosimulator.pcm.allocation.provider.AllocationItemProviderAdapterFactory; import org.palladiosimulator.pcm.core.composition.provider.CompositionItemProviderAdapterFactory; import org.palladiosimulator.pcm.core.entity.provider.EntityItemProviderAdapterFactory; @@ -161,32 +140,53 @@ import de.uka.ipd.sdq.probfunction.provider.ProbfunctionItemProviderAdapterFactory; import de.uka.ipd.sdq.stoex.provider.StoexItemProviderAdapterFactory; import de.uka.ipd.sdq.units.provider.UnitsItemProviderAdapterFactory; +import tools.mdsd.jamopp.commons.layout.provider.LayoutItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.annotations.provider.AnnotationsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.arrays.provider.ArraysItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.classifiers.provider.ClassifiersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.commons.provider.CommonsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.containers.provider.ContainersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.expressions.provider.ExpressionsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.generics.provider.GenericsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.imports.provider.ImportsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.instantiations.provider.InstantiationsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.literals.provider.LiteralsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.members.provider.MembersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.modifiers.provider.ModifiersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.operators.provider.OperatorsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.parameters.provider.ParametersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.references.provider.ReferencesItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.statements.provider.StatementsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.types.provider.TypesItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.variables.provider.VariablesItemProviderAdapterFactory; /** - * This is an example of a Seff2javaast model editor. + * This is an example of a Seff2javaast model editor. + * * * @generated */ public class Seff2javaastEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { /** - * This keeps track of the editing domain that is used to track all changes to the model. + * This keeps track of the editing domain that is used to track all changes to + * the model. * * @generated */ protected AdapterFactoryEditingDomain editingDomain; /** - * This is the one adapter factory used for providing views of the model. + * This is the one adapter factory used for providing views of the model. * * @generated */ protected ComposedAdapterFactory adapterFactory; /** - * This is the content outline page. + * This is the content outline page. * * @generated */ @@ -200,115 +200,124 @@ public class Seff2javaastEditor extends MultiPageEditorPart protected IStatusLineManager contentOutlineStatusLineManager; /** - * This is the content outline page's viewer. + * This is the content outline page's viewer. * * @generated */ protected TreeViewer contentOutlineViewer; /** - * This is the property sheet page. + * This is the property sheet page. * * @generated */ - protected List propertySheetPages = new ArrayList(); + protected List propertySheetPages = new ArrayList<>(); /** - * This is the viewer that shadows the selection in the content outline. The parent relation - * must be correctly defined for this to work. + * This is the viewer that shadows the selection in the content outline. The + * parent relation must be correctly defined for this to work. * * @generated */ protected TreeViewer selectionViewer; /** - * This inverts the roll of parent and child in the content provider and show parents as a tree. - * + * This inverts the roll of parent and child in the content provider and show + * parents as a tree. * * @generated */ protected TreeViewer parentViewer; /** - * This shows how a tree view works. + * This shows how a tree view works. * * @generated */ protected TreeViewer treeViewer; /** - * This shows how a list view works. A list viewer doesn't support icons. + * This shows how a list view works. A list viewer doesn't support icons. * * @generated */ protected ListViewer listViewer; /** - * This shows how a table view works. A table can be used as a list with icons. + * This shows how a table view works. A table can be used as a list with icons. + * * * @generated */ protected TableViewer tableViewer; /** - * This shows how a tree view with columns works. + * This shows how a tree view with columns works. * * @generated */ protected TreeViewer treeViewerWithColumns; /** - * This keeps track of the active viewer pane, in the book. + * This keeps track of the active viewer pane, in the book. * * @generated */ protected ViewerPane currentViewerPane; /** - * This keeps track of the active content viewer, which may be either one of the viewers in the - * pages or the content outline viewer. + * This keeps track of the active content viewer, which may be either one of the + * viewers in the pages or the content outline viewer. + * * * @generated */ protected Viewer currentViewer; /** - * This listens to which ever viewer is active. + * This listens to which ever viewer is active. * * @generated */ protected ISelectionChangedListener selectionChangedListener; /** - * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that - * are listening to this editor. + * This keeps track of all the + * {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are + * listening to this editor. * * @generated */ - protected Collection selectionChangedListeners = new ArrayList(); + protected Collection selectionChangedListeners = new ArrayList<>(); /** - * This keeps track of the selection of the editor as a whole. + * This keeps track of the selection of the editor as a whole. * * @generated */ protected ISelection editorSelection = StructuredSelection.EMPTY; /** - * The MarkerHelper is responsible for creating workspace resource markers presented in - * Eclipse's Problems View. + * The MarkerHelper is responsible for creating workspace resource markers + * presented in Eclipse's Problems View. * * @generated */ protected MarkerHelper markerHelper = new EditUIMarkerHelper(); /** - * This listens for when the outline becomes active + * This listens for when the outline becomes active * * @generated */ @@ -316,13 +325,13 @@ public class Seff2javaastEditor extends MultiPageEditorPart @Override public void partActivated(final IWorkbenchPart p) { if (p instanceof ContentOutline) { - if (((ContentOutline) p).getCurrentPage() == Seff2javaastEditor.this.contentOutlinePage) { + if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) { Seff2javaastEditor.this.getActionBarContributor().setActiveEditor(Seff2javaastEditor.this); - Seff2javaastEditor.this.setCurrentViewer(Seff2javaastEditor.this.contentOutlineViewer); + Seff2javaastEditor.this.setCurrentViewer(contentOutlineViewer); } } else if (p instanceof PropertySheet) { - if (Seff2javaastEditor.this.propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) { + if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) { Seff2javaastEditor.this.getActionBarContributor().setActiveEditor(Seff2javaastEditor.this); Seff2javaastEditor.this.handleActivate(); } @@ -353,47 +362,47 @@ public void partOpened(final IWorkbenchPart p) { }; /** - * Resources that have been removed since last activation. + * Resources that have been removed since last activation. * * @generated */ - protected Collection removedResources = new ArrayList(); + protected Collection removedResources = new ArrayList<>(); /** - * Resources that have been changed since last activation. + * Resources that have been changed since last activation. * * @generated */ - protected Collection changedResources = new ArrayList(); + protected Collection changedResources = new ArrayList<>(); /** * Resources that have been saved. * * @generated */ - protected Collection savedResources = new ArrayList(); + protected Collection savedResources = new ArrayList<>(); /** - * Map to store the diagnostic associated with a resource. + * Map to store the diagnostic associated with a resource. * * @generated */ - protected Map resourceToDiagnosticMap = new LinkedHashMap(); + protected Map resourceToDiagnosticMap = new LinkedHashMap<>(); /** - * Controls whether the problem indication should be updated. + * Controls whether the problem indication should be updated. * * @generated */ protected boolean updateProblemIndication = true; /** - * Adapter used to update the problem indication when resources are demanded loaded. + * Adapter used to update the problem indication when resources are demanded + * loaded. * * @generated */ @@ -408,18 +417,14 @@ public void notifyChanged(final Notification notification) { final Resource resource = (Resource) notification.getNotifier(); final Diagnostic diagnostic = Seff2javaastEditor.this.analyzeResourceProblems(resource, null); if (diagnostic.getSeverity() != Diagnostic.OK) { - Seff2javaastEditor.this.resourceToDiagnosticMap.put(resource, diagnostic); + resourceToDiagnosticMap.put(resource, diagnostic); } else { - Seff2javaastEditor.this.resourceToDiagnosticMap.remove(resource); + resourceToDiagnosticMap.remove(resource); } - if (Seff2javaastEditor.this.updateProblemIndication) { - Seff2javaastEditor.this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.updateProblemIndication(); - } - }); + if (updateProblemIndication) { + Seff2javaastEditor.this.getSite().getShell().getDisplay() + .asyncExec(Seff2javaastEditor.this::updateProblemIndication); } break; } @@ -431,213 +436,200 @@ public void run() { @Override protected void setTarget(final Resource target) { - this.basicSetTarget(target); + basicSetTarget(target); } @Override protected void unsetTarget(final Resource target) { - this.basicUnsetTarget(target); - Seff2javaastEditor.this.resourceToDiagnosticMap.remove(target); - if (Seff2javaastEditor.this.updateProblemIndication) { - Seff2javaastEditor.this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.updateProblemIndication(); - } - }); + basicUnsetTarget(target); + resourceToDiagnosticMap.remove(target); + if (updateProblemIndication) { + Seff2javaastEditor.this.getSite().getShell().getDisplay() + .asyncExec(Seff2javaastEditor.this::updateProblemIndication); } } }; /** - * This listens for workspace changes. + * This listens for workspace changes. * * @generated */ - protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() { - @Override - public void resourceChanged(final IResourceChangeEvent event) { - final IResourceDelta delta = event.getDelta(); - try { - class ResourceDeltaVisitor implements IResourceDeltaVisitor { - protected ResourceSet resourceSet = Seff2javaastEditor.this.editingDomain.getResourceSet(); - protected Collection changedResources = new ArrayList(); - protected Collection removedResources = new ArrayList(); + protected IResourceChangeListener resourceChangeListener = event -> { + final IResourceDelta delta = event.getDelta(); + try { + class ResourceDeltaVisitor implements IResourceDeltaVisitor { + protected ResourceSet resourceSet = editingDomain.getResourceSet(); + protected Collection changedResources = new ArrayList<>(); + protected Collection removedResources = new ArrayList<>(); - @Override - public boolean visit(final IResourceDelta delta) { - if (delta.getResource().getType() == IResource.FILE) { - if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED - && delta.getFlags() != IResourceDelta.MARKERS) { - final Resource resource = this.resourceSet.getResource( - URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false); - if (resource != null) { - if (delta.getKind() == IResourceDelta.REMOVED) { - this.removedResources.add(resource); - } else if (!Seff2javaastEditor.this.savedResources.remove(resource)) { - this.changedResources.add(resource); - } + @Override + public boolean visit(final IResourceDelta delta) { + if (delta.getResource().getType() == IResource.FILE) { + if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getKind() == IResourceDelta.CHANGED) + && (delta.getFlags() != IResourceDelta.MARKERS))) { + final Resource resource = resourceSet.getResource( + URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false); + if (resource != null) { + if (delta.getKind() == IResourceDelta.REMOVED) { + removedResources.add(resource); + } else if (!savedResources.remove(resource)) { + changedResources.add(resource); } } - return false; } - - return true; + return false; } - public Collection getChangedResources() { - return this.changedResources; - } - - public Collection getRemovedResources() { - return this.removedResources; - } + return true; } - final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(); - delta.accept(visitor); - - if (!visitor.getRemovedResources().isEmpty()) { - Seff2javaastEditor.this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.removedResources.addAll(visitor.getRemovedResources()); - if (!Seff2javaastEditor.this.isDirty()) { - Seff2javaastEditor.this.getSite().getPage().closeEditor(Seff2javaastEditor.this, false); - } - } - }); + public Collection getChangedResources() { + return changedResources; } - if (!visitor.getChangedResources().isEmpty()) { - Seff2javaastEditor.this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.changedResources.addAll(visitor.getChangedResources()); - if (Seff2javaastEditor.this.getSite().getPage() - .getActiveEditor() == Seff2javaastEditor.this) { - Seff2javaastEditor.this.handleActivate(); - } - } - }); + public Collection getRemovedResources() { + return removedResources; } - } catch (final CoreException exception) { - Seff2java_astEditorPlugin.INSTANCE.log(exception); } + + final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(); + delta.accept(visitor); + + if (!visitor.getRemovedResources().isEmpty()) { + getSite().getShell().getDisplay().asyncExec(() -> { + removedResources.addAll(visitor.getRemovedResources()); + if (!isDirty()) { + getSite().getPage().closeEditor(this, false); + } + }); + } + + if (!visitor.getChangedResources().isEmpty()) { + getSite().getShell().getDisplay().asyncExec(() -> { + changedResources.addAll(visitor.getChangedResources()); + if (getSite().getPage().getActiveEditor() == this) { + handleActivate(); + } + }); + } + } catch (final CoreException exception) { + Seff2java_astEditorPlugin.INSTANCE.log(exception); } }; /** - * Handles activation of the editor or it's associated views. + * Handles activation of the editor or it's associated views. * * @generated */ protected void handleActivate() { // Recompute the read only state. // - if (this.editingDomain.getResourceToReadOnlyMap() != null) { - this.editingDomain.getResourceToReadOnlyMap().clear(); + if (editingDomain.getResourceToReadOnlyMap() != null) { + editingDomain.getResourceToReadOnlyMap().clear(); // Refresh any actions that may become enabled or disabled. // - this.setSelection(this.getSelection()); + setSelection(getSelection()); } - if (!this.removedResources.isEmpty()) { - if (this.handleDirtyConflict()) { - this.getSite().getPage().closeEditor(Seff2javaastEditor.this, false); + if (!removedResources.isEmpty()) { + if (handleDirtyConflict()) { + getSite().getPage().closeEditor(Seff2javaastEditor.this, false); } else { - this.removedResources.clear(); - this.changedResources.clear(); - this.savedResources.clear(); + removedResources.clear(); + changedResources.clear(); + savedResources.clear(); } - } else if (!this.changedResources.isEmpty()) { - this.changedResources.removeAll(this.savedResources); - this.handleChangedResources(); - this.changedResources.clear(); - this.savedResources.clear(); + } else if (!changedResources.isEmpty()) { + changedResources.removeAll(savedResources); + handleChangedResources(); + changedResources.clear(); + savedResources.clear(); } } /** - * Handles what to do with changed resources on activation. + * Handles what to do with changed resources on activation. * * @generated */ protected void handleChangedResources() { - if (!this.changedResources.isEmpty() && (!this.isDirty() || this.handleDirtyConflict())) { - if (this.isDirty()) { - this.changedResources.addAll(this.editingDomain.getResourceSet().getResources()); + if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { + if (isDirty()) { + changedResources.addAll(editingDomain.getResourceSet().getResources()); } - this.editingDomain.getCommandStack().flush(); + editingDomain.getCommandStack().flush(); - this.updateProblemIndication = false; - for (final Resource resource : this.changedResources) { + updateProblemIndication = false; + for (final Resource resource : changedResources) { if (resource.isLoaded()) { resource.unload(); try { resource.load(Collections.EMPTY_MAP); } catch (final IOException exception) { - if (!this.resourceToDiagnosticMap.containsKey(resource)) { - this.resourceToDiagnosticMap.put(resource, - this.analyzeResourceProblems(resource, exception)); + if (!resourceToDiagnosticMap.containsKey(resource)) { + resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); } } } } - if (AdapterFactoryEditingDomain.isStale(this.editorSelection)) { - this.setSelection(StructuredSelection.EMPTY); + if (AdapterFactoryEditingDomain.isStale(editorSelection)) { + setSelection(StructuredSelection.EMPTY); } - this.updateProblemIndication = true; - this.updateProblemIndication(); + updateProblemIndication = true; + updateProblemIndication(); } } /** - * Updates the problems indication with the information described in the specified diagnostic. - * + * Updates the problems indication with the information described in the + * specified diagnostic. * * @generated */ protected void updateProblemIndication() { - if (this.updateProblemIndication) { + if (updateProblemIndication) { final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.somox.seff2javaast.editor", 0, - null, new Object[] { this.editingDomain.getResourceSet() }); - for (final Diagnostic childDiagnostic : this.resourceToDiagnosticMap.values()) { + null, new Object[] { editingDomain.getResourceSet() }); + for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) { if (childDiagnostic.getSeverity() != Diagnostic.OK) { diagnostic.add(childDiagnostic); } } - int lastEditorPage = this.getPageCount() - 1; - if (lastEditorPage >= 0 && this.getEditor(lastEditorPage) instanceof ProblemEditorPart) { - ((ProblemEditorPart) this.getEditor(lastEditorPage)).setDiagnostic(diagnostic); + int lastEditorPage = getPageCount() - 1; + if ((lastEditorPage >= 0) && (getEditor(lastEditorPage) instanceof ProblemEditorPart)) { + ((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic); if (diagnostic.getSeverity() != Diagnostic.OK) { - this.setActivePage(lastEditorPage); + setActivePage(lastEditorPage); } } else if (diagnostic.getSeverity() != Diagnostic.OK) { final ProblemEditorPart problemEditorPart = new ProblemEditorPart(); problemEditorPart.setDiagnostic(diagnostic); - problemEditorPart.setMarkerHelper(this.markerHelper); + problemEditorPart.setMarkerHelper(markerHelper); try { - this.addPage(++lastEditorPage, problemEditorPart, this.getEditorInput()); - this.setPageText(lastEditorPage, problemEditorPart.getPartName()); - this.setActivePage(lastEditorPage); - this.showTabs(); + lastEditorPage++; + this.addPage(lastEditorPage, problemEditorPart, getEditorInput()); + setPageText(lastEditorPage, problemEditorPart.getPartName()); + setActivePage(lastEditorPage); + showTabs(); } catch (final PartInitException exception) { Seff2java_astEditorPlugin.INSTANCE.log(exception); } } - if (this.markerHelper.hasMarkers(this.editingDomain.getResourceSet())) { - this.markerHelper.deleteMarkers(this.editingDomain.getResourceSet()); + if (markerHelper.hasMarkers(editingDomain.getResourceSet())) { + markerHelper.deleteMarkers(editingDomain.getResourceSet()); if (diagnostic.getSeverity() != Diagnostic.OK) { try { - this.markerHelper.createMarkers(diagnostic); + markerHelper.createMarkers(diagnostic); } catch (final CoreException exception) { Seff2java_astEditorPlugin.INSTANCE.log(exception); } @@ -647,13 +639,13 @@ protected void updateProblemIndication() { } /** - * Shows a dialog that asks if conflicting changes should be discarded. - * + * Shows a dialog that asks if conflicting changes should be discarded. * * @generated */ protected boolean handleDirtyConflict() { - return MessageDialog.openQuestion(this.getSite().getShell(), getString("_UI_FileConflict_label"), + return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict")); } @@ -663,112 +655,104 @@ protected boolean handleDirtyConflict() { * @generated */ public Seff2javaastEditor() { - super(); - this.initializeEditingDomain(); + initializeEditingDomain(); } /** - * This sets up the editing domain for the model editor. + * This sets up the editing domain for the model editor. + * * * @generated */ protected void initializeEditingDomain() { // Create an adapter factory that yields item providers. // - this.adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - - this.adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new Seff2javaastItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new AnnotationsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ArraysItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ClassifiersItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new CommonsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ContainersItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new GenericsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ImportsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new InstantiationsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new LiteralsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new MembersItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ModifiersItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new OperatorsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ParametersItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ReferencesItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new StatementsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new TypesItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new VariablesItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new LayoutItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new PcmItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new EntityItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new CompositionItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new UsagemodelItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new RepositoryItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ProtocolItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ParameterItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ReliabilityItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new SeffItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new SeffPerformanceItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new SeffReliabilityItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new QosannotationsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new QosPerformanceItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new QosReliabilityItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new SystemItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ResourceenvironmentItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new AllocationItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new SubsystemItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ProbfunctionItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new StoexItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new UnitsItemProviderAdapterFactory()); - this.adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); - - // Create the command stack that will notify this editor as commands are executed. + adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + + adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Seff2javaastItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new AnnotationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ArraysItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ClassifiersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CommonsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ContainersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new GenericsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ImportsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new InstantiationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new LiteralsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new MembersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ModifiersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new OperatorsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ParametersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReferencesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new StatementsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new TypesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new VariablesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new LayoutItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new PcmItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new EntityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CompositionItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new UsagemodelItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new RepositoryItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ProtocolItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ParameterItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffPerformanceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosannotationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosPerformanceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SystemItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ResourceenvironmentItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new AllocationItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SubsystemItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ProbfunctionItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new StoexItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new UnitsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + + // Create the command stack that will notify this editor as commands are + // executed. // final BasicCommandStack commandStack = new BasicCommandStack(); - // Add a listener to set the most recent command's affected objects to be the selection of + // Add a listener to set the most recent command's affected objects to be the + // selection of // the viewer with focus. // - commandStack.addCommandStackListener(new CommandStackListener() { - @Override - public void commandStackChanged(final EventObject event) { - Seff2javaastEditor.this.getContainer().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.firePropertyChange(IEditorPart.PROP_DIRTY); + commandStack + .addCommandStackListener(event -> Seff2javaastEditor.this.getContainer().getDisplay().asyncExec(() -> { + Seff2javaastEditor.this.firePropertyChange(IEditorPart.PROP_DIRTY); - // Try to select the affected objects. - // - final Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand(); - if (mostRecentCommand != null) { - Seff2javaastEditor.this.setSelectionToViewer(mostRecentCommand.getAffectedObjects()); - } - for (final Iterator i = Seff2javaastEditor.this.propertySheetPages - .iterator(); i.hasNext();) { - final PropertySheetPage propertySheetPage = i.next(); - if (propertySheetPage.getControl().isDisposed()) { - i.remove(); - } else { - propertySheetPage.refresh(); - } + // Try to select the affected objects. + // + final Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand(); + if (mostRecentCommand != null) { + Seff2javaastEditor.this.setSelectionToViewer(mostRecentCommand.getAffectedObjects()); + } + for (final Iterator i = propertySheetPages.iterator(); i.hasNext();) { + final PropertySheetPage propertySheetPage = i.next(); + if (propertySheetPage.getControl().isDisposed()) { + i.remove(); + } else { + propertySheetPage.refresh(); } } - }); - } - }); + })); // Create the editing domain with a special command stack. // - this.editingDomain = new AdapterFactoryEditingDomain(this.adapterFactory, commandStack, - new HashMap()); + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap()); } /** - * This is here for the listener to be able to call it. + * This is here for the listener to be able to call it. + * * * @generated */ @@ -778,8 +762,8 @@ protected void firePropertyChange(final int action) { } /** - * This sets the selection into whichever viewer is active. + * This sets the selection into whichever viewer is active. * * @generated */ @@ -787,33 +771,30 @@ public void setSelectionToViewer(final Collection collection) { final Collection theSelection = collection; // Make sure it's okay. // - if (theSelection != null && !theSelection.isEmpty()) { - final Runnable runnable = new Runnable() { - @Override - public void run() { - // Try to select the items in the current content viewer of the editor. - // - if (Seff2javaastEditor.this.currentViewer != null) { - Seff2javaastEditor.this.currentViewer - .setSelection(new StructuredSelection(theSelection.toArray()), true); - } + if ((theSelection != null) && !theSelection.isEmpty()) { + final Runnable runnable = () -> { + // Try to select the items in the current content viewer of the editor. + // + if (currentViewer != null) { + currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true); } }; - this.getSite().getShell().getDisplay().asyncExec(runnable); + getSite().getShell().getDisplay().asyncExec(runnable); } } /** - * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. - * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} - * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. + * This returns the editing domain as required by the + * {@link IEditingDomainProvider} interface. This is important for implementing + * the static methods of {@link AdapterFactoryEditingDomain} and for supporting + * {@link org.eclipse.emf.edit.ui.action.CommandAction}. + * * * @generated */ @Override public EditingDomain getEditingDomain() { - return this.editingDomain; + return editingDomain; } /** @@ -881,75 +862,70 @@ public Object getParent(final Object object) { * @generated */ public void setCurrentViewerPane(final ViewerPane viewerPane) { - if (this.currentViewerPane != viewerPane) { - if (this.currentViewerPane != null) { - this.currentViewerPane.showFocus(false); + if (currentViewerPane != viewerPane) { + if (currentViewerPane != null) { + currentViewerPane.showFocus(false); } - this.currentViewerPane = viewerPane; + currentViewerPane = viewerPane; } - this.setCurrentViewer(this.currentViewerPane.getViewer()); + setCurrentViewer(currentViewerPane.getViewer()); } /** - * This makes sure that one content viewer, either for the current page or the outline view, if - * it has focus, is the current one. + * This makes sure that one content viewer, either for the current page or the + * outline view, if it has focus, is the current one. + * * * @generated */ public void setCurrentViewer(final Viewer viewer) { // If it is changing... // - if (this.currentViewer != viewer) { - if (this.selectionChangedListener == null) { + if (currentViewer != viewer) { + if (selectionChangedListener == null) { // Create the listener on demand. // - this.selectionChangedListener = new ISelectionChangedListener() { - // This just notifies those things that are affected by the section. - // - @Override - public void selectionChanged(final SelectionChangedEvent selectionChangedEvent) { - Seff2javaastEditor.this.setSelection(selectionChangedEvent.getSelection()); - } - }; + selectionChangedListener = selectionChangedEvent -> Seff2javaastEditor.this + .setSelection(selectionChangedEvent.getSelection()); } // Stop listening to the old one. // - if (this.currentViewer != null) { - this.currentViewer.removeSelectionChangedListener(this.selectionChangedListener); + if (currentViewer != null) { + currentViewer.removeSelectionChangedListener(selectionChangedListener); } // Start listening to the new one. // if (viewer != null) { - viewer.addSelectionChangedListener(this.selectionChangedListener); + viewer.addSelectionChangedListener(selectionChangedListener); } // Remember it. // - this.currentViewer = viewer; + currentViewer = viewer; // Set the editors selection based on the current viewer's selection. // - this.setSelection( - this.currentViewer == null ? StructuredSelection.EMPTY : this.currentViewer.getSelection()); + setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection()); } } /** - * This returns the viewer as required by the {@link IViewerProvider} interface. + * This returns the viewer as required by the {@link IViewerProvider} interface. + * * * @generated */ @Override public Viewer getViewer() { - return this.currentViewer; + return currentViewer; } /** - * This creates a context menu for the viewer and adds a listener as well registering the menu - * for extension. + * This creates a context menu for the viewer and adds a listener as well + * registering the menu for extension. * * @generated */ @@ -960,44 +936,46 @@ protected void createContextMenuFor(final StructuredViewer viewer) { contextMenu.addMenuListener(this); final Menu menu = contextMenu.createContextMenu(viewer.getControl()); viewer.getControl().setMenu(menu); - this.getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer)); + getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer)); final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; - final Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), + final Transfer[] transfers = { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() }; viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer)); - viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(this.editingDomain, viewer)); + viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); } /** - * This is the method called to load a resource into the editing domain's resource set based on - * the editor's input. + * This is the method called to load a resource into the editing domain's + * resource set based on the editor's input. * * @generated */ public void createModel() { - final URI resourceURI = EditUIUtil.getURI(this.getEditorInput()); + final URI resourceURI = EditUIUtil.getURI(getEditorInput()); Exception exception = null; Resource resource = null; try { // Load the resource through the editing domain. // - resource = this.editingDomain.getResourceSet().getResource(resourceURI, true); + resource = editingDomain.getResourceSet().getResource(resourceURI, true); } catch (final Exception e) { exception = e; - resource = this.editingDomain.getResourceSet().getResource(resourceURI, false); + resource = editingDomain.getResourceSet().getResource(resourceURI, false); } - final Diagnostic diagnostic = this.analyzeResourceProblems(resource, exception); + final Diagnostic diagnostic = analyzeResourceProblems(resource, exception); if (diagnostic.getSeverity() != Diagnostic.OK) { - this.resourceToDiagnosticMap.put(resource, this.analyzeResourceProblems(resource, exception)); + resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); } - this.editingDomain.getResourceSet().eAdapters().add(this.problemIndicationAdapter); + editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); } /** - * Returns a diagnostic describing the errors and warnings listed in the resource and the - * specified exception (if any). + * Returns a diagnostic describing the errors and warnings listed in the + * resource and the specified exception (if any). * * @generated */ @@ -1008,17 +986,17 @@ public Diagnostic analyzeResourceProblems(final Resource resource, final Excepti new Object[] { exception == null ? (Object) resource : exception }); basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true)); return basicDiagnostic; - } else if (exception != null) { + } + if (exception != null) { return new BasicDiagnostic(Diagnostic.ERROR, "org.somox.seff2javaast.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); - } else { - return Diagnostic.OK_INSTANCE; } + return Diagnostic.OK_INSTANCE; } /** - * This is the method used by the framework to install your own controls. + * This is the method used by the framework to install your own controls. * * @generated */ @@ -1026,20 +1004,19 @@ public Diagnostic analyzeResourceProblems(final Resource resource, final Excepti public void createPages() { // Creates the model from the editor input // - this.createModel(); + createModel(); // Only creates the other pages if there is something that can be edited // - if (!this.getEditingDomain().getResourceSet().getResources().isEmpty()) { + if (!getEditingDomain().getResourceSet().getResources().isEmpty()) { // Create a page for the selection tree view. // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { final Tree tree = new Tree(composite, SWT.MULTI); - final TreeViewer newTreeViewer = new TreeViewer(tree); - return newTreeViewer; + return new TreeViewer(tree); } @Override @@ -1048,33 +1025,32 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); + viewerPane.createControl(getContainer()); - this.selectionViewer = (TreeViewer) viewerPane.getViewer(); - this.selectionViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory)); + selectionViewer = (TreeViewer) viewerPane.getViewer(); + selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - this.selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); - this.selectionViewer.setInput(this.editingDomain.getResourceSet()); - this.selectionViewer.setSelection( - new StructuredSelection(this.editingDomain.getResourceSet().getResources().get(0)), true); - viewerPane.setTitle(this.editingDomain.getResourceSet()); + selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + selectionViewer.setInput(editingDomain.getResourceSet()); + selectionViewer.setSelection( + new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); + viewerPane.setTitle(editingDomain.getResourceSet()); - new AdapterFactoryTreeEditor(this.selectionViewer.getTree(), this.adapterFactory); + new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory); - this.createContextMenuFor(this.selectionViewer); + createContextMenuFor(selectionViewer); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_SelectionPage_label")); + setPageText(pageIndex, getString("_UI_SelectionPage_label")); } // Create a page for the parent tree view. // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { final Tree tree = new Tree(composite, SWT.MULTI); - final TreeViewer newTreeViewer = new TreeViewer(tree); - return newTreeViewer; + return new TreeViewer(tree); } @Override @@ -1083,22 +1059,22 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); + viewerPane.createControl(getContainer()); - this.parentViewer = (TreeViewer) viewerPane.getViewer(); - this.parentViewer.setAutoExpandLevel(30); - this.parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(this.adapterFactory)); - this.parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); + parentViewer = (TreeViewer) viewerPane.getViewer(); + parentViewer.setAutoExpandLevel(30); + parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory)); + parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - this.createContextMenuFor(this.parentViewer); + createContextMenuFor(parentViewer); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_ParentPage_label")); + setPageText(pageIndex, getString("_UI_ParentPage_label")); } // This is the page for the list viewer // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { return new ListViewer(composite); @@ -1110,20 +1086,20 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); - this.listViewer = (ListViewer) viewerPane.getViewer(); - this.listViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory)); - this.listViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); + viewerPane.createControl(getContainer()); + listViewer = (ListViewer) viewerPane.getViewer(); + listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - this.createContextMenuFor(this.listViewer); + createContextMenuFor(listViewer); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_ListPage_label")); + setPageText(pageIndex, getString("_UI_ListPage_label")); } // This is the page for the tree viewer // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { return new TreeViewer(composite); @@ -1135,22 +1111,22 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); - this.treeViewer = (TreeViewer) viewerPane.getViewer(); - this.treeViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory)); - this.treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); + viewerPane.createControl(getContainer()); + treeViewer = (TreeViewer) viewerPane.getViewer(); + treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - new AdapterFactoryTreeEditor(this.treeViewer.getTree(), this.adapterFactory); + new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory); - this.createContextMenuFor(this.treeViewer); + createContextMenuFor(treeViewer); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_TreePage_label")); + setPageText(pageIndex, getString("_UI_TreePage_label")); } // This is the page for the table viewer. // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { return new TableViewer(composite); @@ -1162,10 +1138,10 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); - this.tableViewer = (TableViewer) viewerPane.getViewer(); + viewerPane.createControl(getContainer()); + tableViewer = (TableViewer) viewerPane.getViewer(); - final Table table = this.tableViewer.getTable(); + final Table table = tableViewer.getTable(); final TableLayout layout = new TableLayout(); table.setLayout(layout); table.setHeaderVisible(true); @@ -1181,19 +1157,19 @@ public void requestActivation() { selfColumn.setText(getString("_UI_SelfColumn_label")); selfColumn.setResizable(true); - this.tableViewer.setColumnProperties(new String[] { "a", "b" }); - this.tableViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory)); - this.tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); + tableViewer.setColumnProperties(new String[] { "a", "b" }); + tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - this.createContextMenuFor(this.tableViewer); + createContextMenuFor(tableViewer); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_TablePage_label")); + setPageText(pageIndex, getString("_UI_TablePage_label")); } // This is the page for the table tree viewer. // { - final ViewerPane viewerPane = new ViewerPane(this.getSite().getPage(), Seff2javaastEditor.this) { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), Seff2javaastEditor.this) { @Override public Viewer createViewer(final Composite composite) { return new TreeViewer(composite); @@ -1205,11 +1181,11 @@ public void requestActivation() { Seff2javaastEditor.this.setCurrentViewerPane(this); } }; - viewerPane.createControl(this.getContainer()); + viewerPane.createControl(getContainer()); - this.treeViewerWithColumns = (TreeViewer) viewerPane.getViewer(); + treeViewerWithColumns = (TreeViewer) viewerPane.getViewer(); - final Tree tree = this.treeViewerWithColumns.getTree(); + final Tree tree = treeViewerWithColumns.getTree(); tree.setLayoutData(new FillLayout()); tree.setHeaderVisible(true); tree.setLinesVisible(true); @@ -1224,83 +1200,74 @@ public void requestActivation() { selfColumn.setResizable(true); selfColumn.setWidth(200); - this.treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); - this.treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory)); - this.treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory)); + treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); + treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - this.createContextMenuFor(this.treeViewerWithColumns); + createContextMenuFor(treeViewerWithColumns); final int pageIndex = this.addPage(viewerPane.getControl()); - this.setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); + setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); } - this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.setActivePage(0); - } - }); + getSite().getShell().getDisplay().asyncExec(() -> Seff2javaastEditor.this.setActivePage(0)); } // Ensures that this editor will only display the page's tab // area if there are more than one page // - this.getContainer().addControlListener(new ControlAdapter() { + getContainer().addControlListener(new ControlAdapter() { boolean guard = false; @Override public void controlResized(final ControlEvent event) { - if (!this.guard) { - this.guard = true; + if (!guard) { + guard = true; Seff2javaastEditor.this.hideTabs(); - this.guard = false; + guard = false; } } }); - this.getSite().getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - Seff2javaastEditor.this.updateProblemIndication(); - } - }); + getSite().getShell().getDisplay().asyncExec(Seff2javaastEditor.this::updateProblemIndication); } /** - * If there is just one page in the multi-page editor part, this hides the single tab at the - * bottom. + * If there is just one page in the multi-page editor part, this hides the + * single tab at the bottom. * * @generated */ protected void hideTabs() { - if (this.getPageCount() <= 1) { - this.setPageText(0, ""); - if (this.getContainer() instanceof CTabFolder) { - ((CTabFolder) this.getContainer()).setTabHeight(1); - final Point point = this.getContainer().getSize(); - this.getContainer().setSize(point.x, point.y + 6); + if (getPageCount() <= 1) { + setPageText(0, ""); + if (getContainer() instanceof CTabFolder) { + ((CTabFolder) getContainer()).setTabHeight(1); + final Point point = getContainer().getSize(); + getContainer().setSize(point.x, point.y + 6); } } } /** - * If there is more than one page in the multi-page editor part, this shows the tabs at the - * bottom. + * If there is more than one page in the multi-page editor part, this shows the + * tabs at the bottom. * * @generated */ protected void showTabs() { - if (this.getPageCount() > 1) { - this.setPageText(0, getString("_UI_SelectionPage_label")); - if (this.getContainer() instanceof CTabFolder) { - ((CTabFolder) this.getContainer()).setTabHeight(SWT.DEFAULT); - final Point point = this.getContainer().getSize(); - this.getContainer().setSize(point.x, point.y - 6); + if (getPageCount() > 1) { + setPageText(0, getString("_UI_SelectionPage_label")); + if (getContainer() instanceof CTabFolder) { + ((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT); + final Point point = getContainer().getSize(); + getContainer().setSize(point.x, point.y - 6); } } } /** - * This is used to track the active viewer. + * This is used to track the active viewer. * * @generated */ @@ -1308,14 +1275,14 @@ protected void showTabs() { protected void pageChange(final int pageIndex) { super.pageChange(pageIndex); - if (this.contentOutlinePage != null) { - this.handleContentOutlineSelection(this.contentOutlinePage.getSelection()); + if (contentOutlinePage != null) { + handleContentOutlineSelection(contentOutlinePage.getSelection()); } } /** - * This is how the framework determines which interfaces we implement. - * + * This is how the framework determines which interfaces we implement. * * @generated */ @@ -1323,53 +1290,49 @@ protected void pageChange(final int pageIndex) { @Override public Object getAdapter(final Class key) { if (key.equals(IContentOutlinePage.class)) { - return this.showOutlineView() ? this.getContentOutlinePage() : null; - } else if (key.equals(IPropertySheetPage.class)) { - return this.getPropertySheetPage(); - } else if (key.equals(IGotoMarker.class)) { + return showOutlineView() ? getContentOutlinePage() : null; + } + if (key.equals(IPropertySheetPage.class)) { + return getPropertySheetPage(); + } + if (key.equals(IGotoMarker.class)) { return this; - } else { - return super.getAdapter(key); } + return super.getAdapter(key); } /** - * This accesses a cached version of the content outliner. + * This accesses a cached version of the content outliner. * * @generated */ public IContentOutlinePage getContentOutlinePage() { - if (this.contentOutlinePage == null) { + if (contentOutlinePage == null) { // The content outline is just a tree. // class MyContentOutlinePage extends ContentOutlinePage { @Override public void createControl(final Composite parent) { super.createControl(parent); - Seff2javaastEditor.this.contentOutlineViewer = this.getTreeViewer(); - Seff2javaastEditor.this.contentOutlineViewer.addSelectionChangedListener(this); + contentOutlineViewer = getTreeViewer(); + contentOutlineViewer.addSelectionChangedListener(this); // Set up the tree viewer. // - Seff2javaastEditor.this.contentOutlineViewer.setContentProvider( - new AdapterFactoryContentProvider(Seff2javaastEditor.this.adapterFactory)); - Seff2javaastEditor.this.contentOutlineViewer - .setLabelProvider(new AdapterFactoryLabelProvider(Seff2javaastEditor.this.adapterFactory)); - Seff2javaastEditor.this.contentOutlineViewer - .setInput(Seff2javaastEditor.this.editingDomain.getResourceSet()); + contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + contentOutlineViewer.setInput(editingDomain.getResourceSet()); // Make sure our popups work. // - Seff2javaastEditor.this.createContextMenuFor(Seff2javaastEditor.this.contentOutlineViewer); + createContextMenuFor(contentOutlineViewer); - if (!Seff2javaastEditor.this.editingDomain.getResourceSet().getResources().isEmpty()) { + if (!editingDomain.getResourceSet().getResources().isEmpty()) { // Select the root object in the view. // - Seff2javaastEditor.this.contentOutlineViewer.setSelection( - new StructuredSelection( - Seff2javaastEditor.this.editingDomain.getResourceSet().getResources().get(0)), - true); + contentOutlineViewer.setSelection( + new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); } } @@ -1377,41 +1340,35 @@ public void createControl(final Composite parent) { public void makeContributions(final IMenuManager menuManager, final IToolBarManager toolBarManager, final IStatusLineManager statusLineManager) { super.makeContributions(menuManager, toolBarManager, statusLineManager); - Seff2javaastEditor.this.contentOutlineStatusLineManager = statusLineManager; + contentOutlineStatusLineManager = statusLineManager; } @Override public void setActionBars(final IActionBars actionBars) { super.setActionBars(actionBars); - Seff2javaastEditor.this.getActionBarContributor().shareGlobalActions(this, actionBars); + getActionBarContributor().shareGlobalActions(this, actionBars); } } - this.contentOutlinePage = new MyContentOutlinePage(); + contentOutlinePage = new MyContentOutlinePage(); // Listen to selection so that we can handle it is a special way. // - this.contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() { - // This ensures that we handle selections correctly. - // - @Override - public void selectionChanged(final SelectionChangedEvent event) { - Seff2javaastEditor.this.handleContentOutlineSelection(event.getSelection()); - } - }); + contentOutlinePage.addSelectionChangedListener( + event -> Seff2javaastEditor.this.handleContentOutlineSelection(event.getSelection())); } - return this.contentOutlinePage; + return contentOutlinePage; } /** - * This accesses a cached version of the property sheet. + * This accesses a cached version of the property sheet. + * * * @generated */ public IPropertySheetPage getPropertySheetPage() { - final PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(this.editingDomain) { + final PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain) { @Override public void setSelectionToViewer(final List selection) { Seff2javaastEditor.this.setSelectionToViewer(selection); @@ -1424,20 +1381,20 @@ public void setActionBars(final IActionBars actionBars) { Seff2javaastEditor.this.getActionBarContributor().shareGlobalActions(this, actionBars); } }; - propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(this.adapterFactory)); - this.propertySheetPages.add(propertySheetPage); + propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory)); + propertySheetPages.add(propertySheetPage); return propertySheetPage; } /** - * This deals with how we want selection in the outliner to affect the other views. + * This deals with how we want selection in the outliner to affect the other + * views. * * @generated */ public void handleContentOutlineSelection(final ISelection selection) { - if (this.currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { + if ((currentViewerPane != null) && !selection.isEmpty() && (selection instanceof IStructuredSelection)) { final Iterator selectedElements = ((IStructuredSelection) selection).iterator(); if (selectedElements.hasNext()) { // Get the first selected element. @@ -1447,8 +1404,8 @@ public void handleContentOutlineSelection(final ISelection selection) { // If it's the selection viewer, then we want it to select the same selection as // this selection. // - if (this.currentViewerPane.getViewer() == this.selectionViewer) { - final ArrayList selectionList = new ArrayList(); + if (currentViewerPane.getViewer() == selectionViewer) { + final ArrayList selectionList = new ArrayList<>(); selectionList.add(selectedElement); while (selectedElements.hasNext()) { selectionList.add(selectedElements.next()); @@ -1456,33 +1413,31 @@ public void handleContentOutlineSelection(final ISelection selection) { // Set the selection to the widget. // - this.selectionViewer.setSelection(new StructuredSelection(selectionList)); - } else { - // Set the input to the widget. - // - if (this.currentViewerPane.getViewer().getInput() != selectedElement) { - this.currentViewerPane.getViewer().setInput(selectedElement); - this.currentViewerPane.setTitle(selectedElement); - } + selectionViewer.setSelection(new StructuredSelection(selectionList)); + } else // Set the input to the widget. + // + if (currentViewerPane.getViewer().getInput() != selectedElement) { + currentViewerPane.getViewer().setInput(selectedElement); + currentViewerPane.setTitle(selectedElement); } } } } /** - * This is for implementing {@link IEditorPart} and simply tests the command stack. + * This is for implementing {@link IEditorPart} and simply tests the command + * stack. * * @generated */ @Override public boolean isDirty() { - return ((BasicCommandStack) this.editingDomain.getCommandStack()).isSaveNeeded(); + return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded(); } /** - * This is for implementing {@link IEditorPart} and simply saves the model file. + * This is for implementing {@link IEditorPart} and simply saves the model file. + * * * @generated */ @@ -1490,11 +1445,12 @@ public boolean isDirty() { public void doSave(final IProgressMonitor progressMonitor) { // Save only resources that have actually changed. // - final Map saveOptions = new HashMap(); + final Map saveOptions = new HashMap<>(); saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER); saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED); - // Do the work within an operation because this is a long running activity that modifies the + // Do the work within an operation because this is a long running activity that + // modifies the // workbench. // final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { @@ -1505,17 +1461,17 @@ public void execute(final IProgressMonitor monitor) { // Save the resources to the file system. // boolean first = true; - for (final Resource resource : Seff2javaastEditor.this.editingDomain.getResourceSet().getResources()) { + for (final Resource resource : editingDomain.getResourceSet().getResources()) { if ((first || !resource.getContents().isEmpty() || Seff2javaastEditor.this.isPersisted(resource)) - && !Seff2javaastEditor.this.editingDomain.isReadOnly(resource)) { + && !editingDomain.isReadOnly(resource)) { try { final long timeStamp = resource.getTimeStamp(); resource.save(saveOptions); if (resource.getTimeStamp() != timeStamp) { - Seff2javaastEditor.this.savedResources.add(resource); + savedResources.add(resource); } } catch (final Exception exception) { - Seff2javaastEditor.this.resourceToDiagnosticMap.put(resource, + resourceToDiagnosticMap.put(resource, Seff2javaastEditor.this.analyzeResourceProblems(resource, exception)); } first = false; @@ -1524,36 +1480,37 @@ public void execute(final IProgressMonitor monitor) { } }; - this.updateProblemIndication = false; + updateProblemIndication = false; try { // This runs the options, and shows progress. // - new ProgressMonitorDialog(this.getSite().getShell()).run(true, false, operation); + new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation); // Refresh the necessary state. // - ((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone(); - this.firePropertyChange(IEditorPart.PROP_DIRTY); + ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); + firePropertyChange(IEditorPart.PROP_DIRTY); } catch (final Exception exception) { // Something went wrong that shouldn't. // Seff2java_astEditorPlugin.INSTANCE.log(exception); } - this.updateProblemIndication = true; - this.updateProblemIndication(); + updateProblemIndication = true; + updateProblemIndication(); } /** - * This returns whether something has been persisted to the URI of the specified resource. The - * implementation uses the URI converter from the editor's resource set to try to open an input - * stream. + * This returns whether something has been persisted to the URI of the specified + * resource. The implementation uses the URI converter from the editor's + * resource set to try to open an input stream. * * @generated */ protected boolean isPersisted(final Resource resource) { boolean result = false; try { - final InputStream stream = this.editingDomain.getResourceSet().getURIConverter() + final InputStream stream = editingDomain.getResourceSet().getURIConverter() .createInputStream(resource.getURI()); if (stream != null) { result = true; @@ -1566,8 +1523,8 @@ protected boolean isPersisted(final Resource resource) { } /** - * This always returns true because it is not currently supported. + * This always returns true because it is not currently supported. * * @generated */ @@ -1577,13 +1534,14 @@ public boolean isSaveAsAllowed() { } /** - * This also changes the editor's input. + * This also changes the editor's input. * * @generated */ @Override public void doSaveAs() { - final SaveAsDialog saveAsDialog = new SaveAsDialog(this.getSite().getShell()); + final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); saveAsDialog.open(); final IPath path = saveAsDialog.getResult(); if (path != null) { @@ -1601,12 +1559,13 @@ public void doSaveAs() { * @generated */ protected void doSaveAs(final URI uri, final IEditorInput editorInput) { - (this.editingDomain.getResourceSet().getResources().get(0)).setURI(uri); - this.setInputWithNotify(editorInput); - this.setPartName(editorInput.getName()); - final IProgressMonitor progressMonitor = this.getActionBars().getStatusLineManager() != null - ? this.getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor(); - this.doSave(progressMonitor); + (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); + setInputWithNotify(editorInput); + setPartName(editorInput.getName()); + final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null + ? getActionBars().getStatusLineManager().getProgressMonitor() + : new NullProgressMonitor(); + doSave(progressMonitor); } /** @@ -1616,9 +1575,9 @@ protected void doSaveAs(final URI uri, final IEditorInput editorInput) { */ @Override public void gotoMarker(final IMarker marker) { - final List targetObjects = this.markerHelper.getTargetObjects(this.editingDomain, marker); + final List targetObjects = markerHelper.getTargetObjects(editingDomain, marker); if (!targetObjects.isEmpty()) { - this.setSelectionToViewer(targetObjects); + setSelectionToViewer(targetObjects); } } @@ -1629,12 +1588,12 @@ public void gotoMarker(final IMarker marker) { */ @Override public void init(final IEditorSite site, final IEditorInput editorInput) { - this.setSite(site); - this.setInputWithNotify(editorInput); - this.setPartName(editorInput.getName()); + setSite(site); + setInputWithNotify(editorInput); + setPartName(editorInput.getName()); site.setSelectionProvider(this); - site.getPage().addPartListener(this.partListener); - ResourcesPlugin.getWorkspace().addResourceChangeListener(this.resourceChangeListener, + site.getPage().addPartListener(partListener); + ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); } @@ -1645,61 +1604,62 @@ public void init(final IEditorSite site, final IEditorInput editorInput) { */ @Override public void setFocus() { - if (this.currentViewerPane != null) { - this.currentViewerPane.setFocus(); + if (currentViewerPane != null) { + currentViewerPane.setFocus(); } else { - this.getControl(this.getActivePage()).setFocus(); + getControl(getActivePage()).setFocus(); } } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. - * + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * * @generated */ @Override public void addSelectionChangedListener(final ISelectionChangedListener listener) { - this.selectionChangedListeners.add(listener); + selectionChangedListeners.add(listener); } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. - * + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * * @generated */ @Override public void removeSelectionChangedListener(final ISelectionChangedListener listener) { - this.selectionChangedListeners.remove(listener); + selectionChangedListeners.remove(listener); } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's - * overall selection. + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to + * return this editor's overall selection. * * @generated */ @Override public ISelection getSelection() { - return this.editorSelection; + return editorSelection; } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's - * overall selection. Calling this result will notify the listeners. - * + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set + * this editor's overall selection. Calling this result will notify the + * listeners. * * @generated */ @Override public void setSelection(final ISelection selection) { - this.editorSelection = selection; + editorSelection = selection; - for (final ISelectionChangedListener listener : this.selectionChangedListeners) { + for (final ISelectionChangedListener listener : selectionChangedListeners) { listener.selectionChanged(new SelectionChangedEvent(this, selection)); } - this.setStatusLineManager(selection); + setStatusLineManager(selection); } /** @@ -1708,9 +1668,9 @@ public void setSelection(final ISelection selection) { * @generated */ public void setStatusLineManager(final ISelection selection) { - final IStatusLineManager statusLineManager = this.currentViewer != null - && this.currentViewer == this.contentOutlineViewer ? this.contentOutlineStatusLineManager - : this.getActionBars().getStatusLineManager(); + final IStatusLineManager statusLineManager = (currentViewer != null) && (currentViewer == contentOutlineViewer) + ? contentOutlineStatusLineManager + : getActionBars().getStatusLineManager(); if (statusLineManager != null) { if (selection instanceof IStructuredSelection) { @@ -1721,7 +1681,7 @@ public void setStatusLineManager(final ISelection selection) { break; } case 1: { - final String text = new AdapterFactoryItemDelegator(this.adapterFactory) + final String text = new AdapterFactoryItemDelegator(adapterFactory) .getText(collection.iterator().next()); statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); break; @@ -1739,8 +1699,8 @@ public void setStatusLineManager(final ISelection selection) { } /** - * This looks up a string in the plugin's plugin.properties file. + * This looks up a string in the plugin's plugin.properties file. * * @generated */ @@ -1749,8 +1709,8 @@ private static String getString(final String key) { } /** - * This looks up a string in plugin.properties, making a substitution. - * + * This looks up a string in plugin.properties, making a substitution. * * @generated */ @@ -1759,14 +1719,15 @@ private static String getString(final String key, final Object s1) { } /** - * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus - * with contributions from the Edit menu. + * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill + * the context menus with contributions from the Edit menu. * * @generated */ @Override public void menuAboutToShow(final IMenuManager menuManager) { - ((IMenuListener) this.getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); + ((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); } /** @@ -1775,7 +1736,7 @@ public void menuAboutToShow(final IMenuManager menuManager) { * @generated */ public EditingDomainActionBarContributor getActionBarContributor() { - return (EditingDomainActionBarContributor) this.getEditorSite().getActionBarContributor(); + return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor(); } /** @@ -1784,7 +1745,7 @@ public EditingDomainActionBarContributor getActionBarContributor() { * @generated */ public IActionBars getActionBars() { - return this.getActionBarContributor().getActionBars(); + return getActionBarContributor().getActionBars(); } /** @@ -1793,7 +1754,7 @@ public IActionBars getActionBars() { * @generated */ public AdapterFactory getAdapterFactory() { - return this.adapterFactory; + return adapterFactory; } /** @@ -1803,32 +1764,32 @@ public AdapterFactory getAdapterFactory() { */ @Override public void dispose() { - this.updateProblemIndication = false; + updateProblemIndication = false; - ResourcesPlugin.getWorkspace().removeResourceChangeListener(this.resourceChangeListener); + ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); - this.getSite().getPage().removePartListener(this.partListener); + getSite().getPage().removePartListener(partListener); - this.adapterFactory.dispose(); + adapterFactory.dispose(); - if (this.getActionBarContributor().getActiveEditor() == this) { - this.getActionBarContributor().setActiveEditor(null); + if (getActionBarContributor().getActiveEditor() == this) { + getActionBarContributor().setActiveEditor(null); } - for (final PropertySheetPage propertySheetPage : this.propertySheetPages) { + for (final PropertySheetPage propertySheetPage : propertySheetPages) { propertySheetPage.dispose(); } - if (this.contentOutlinePage != null) { - this.contentOutlinePage.dispose(); + if (contentOutlinePage != null) { + contentOutlinePage.dispose(); } super.dispose(); } /** - * Returns whether the outline view should be presented to the user. - * + * Returns whether the outline view should be presented to the user. * * @generated */ diff --git a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastModelWizard.java b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastModelWizard.java index 10e3971..31f91b2 100644 --- a/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastModelWizard.java +++ b/bundles/org.somox.seff2javaast.editor/src/org/somox/seff2javaast/presentation/Seff2javaastModelWizard.java @@ -37,7 +37,6 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -59,14 +58,15 @@ import org.somox.seff2javaast.provider.Seff2java_astEditPlugin; /** - * This is a simple wizard for creating a new model file. + * This is a simple wizard for creating a new model file. * * @generated */ public class Seff2javaastModelWizard extends Wizard implements INewWizard { /** - * The supported extensions for created files. + * The supported extensions for created files. * * @generated */ @@ -75,8 +75,8 @@ public class Seff2javaastModelWizard extends Wizard implements INewWizard { .getString("_UI_Seff2javaastEditorFilenameExtensions").split("\\s*,\\s*"))); /** - * A formatted list of supported file extensions, suitable for display. - * + * A formatted list of supported file extensions, suitable for display. * * @generated */ @@ -84,18 +84,20 @@ public class Seff2javaastModelWizard extends Wizard implements INewWizard { .getString("_UI_Seff2javaastEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); /** - * This caches an instance of the model package. + * This caches an instance of the model package. * * @generated */ protected Seff2javaastPackage seff2javaastPackage = Seff2javaastPackage.eINSTANCE; /** - * This caches an instance of the model factory. + * This caches an instance of the model factory. * * @generated */ - protected Seff2javaastFactory seff2javaastFactory = this.seff2javaastPackage.getSeff2javaastFactory(); + protected Seff2javaastFactory seff2javaastFactory = seff2javaastPackage.getSeff2javaastFactory(); /** * This is the file creation page. @@ -105,37 +107,40 @@ public class Seff2javaastModelWizard extends Wizard implements INewWizard { protected Seff2javaastModelWizardNewFileCreationPage newFileCreationPage; /** - * This is the initial object creation page. + * This is the initial object creation page. * * @generated */ protected Seff2javaastModelWizardInitialObjectCreationPage initialObjectCreationPage; /** - * Remember the selection during initialization for populating the default container. + * Remember the selection during initialization for populating the default + * container. * * @generated */ protected IStructuredSelection selection; /** - * Remember the workbench during initialization. + * Remember the workbench during initialization. * * @generated */ protected IWorkbench workbench; /** - * Caches the names of the types that can be created as the root object. - * + * Caches the names of the types that can be created as the root object. * * @generated */ protected List initialObjectNames; /** - * This just records the information. + * This just records the information. * * @generated */ @@ -143,31 +148,28 @@ public class Seff2javaastModelWizard extends Wizard implements INewWizard { public void init(final IWorkbench workbench, final IStructuredSelection selection) { this.workbench = workbench; this.selection = selection; - this.setWindowTitle(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); - this.setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE + setWindowTitle(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); + setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE .getImageDescriptor(Seff2java_astEditorPlugin.INSTANCE.getImage("full/wizban/NewSeff2javaast"))); } /** - * Returns the names of the types that can be created as the root object. + * Returns the names of the types that can be created as the root object. * * @generated */ protected Collection getInitialObjectNames() { - if (this.initialObjectNames == null) { - this.initialObjectNames = new ArrayList(); - for (final EClassifier eClassifier : this.seff2javaastPackage.getEClassifiers()) { - if (eClassifier instanceof EClass) { - final EClass eClass = (EClass) eClassifier; - if (!eClass.isAbstract()) { - this.initialObjectNames.add(eClass.getName()); - } + if (initialObjectNames == null) { + initialObjectNames = new ArrayList<>(); + for (final EClassifier eClassifier : seff2javaastPackage.getEClassifiers()) { + if ((eClassifier instanceof final EClass eClass) && !eClass.isAbstract()) { + initialObjectNames.add(eClass.getName()); } } - Collections.sort(this.initialObjectNames, CommonPlugin.INSTANCE.getComparator()); + Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator()); } - return this.initialObjectNames; + return initialObjectNames; } /** @@ -176,14 +178,14 @@ protected Collection getInitialObjectNames() { * @generated */ protected EObject createInitialModel() { - final EClass eClass = (EClass) this.seff2javaastPackage - .getEClassifier(this.initialObjectCreationPage.getInitialObjectName()); - final EObject rootObject = this.seff2javaastFactory.create(eClass); - return rootObject; + final EClass eClass = (EClass) seff2javaastPackage + .getEClassifier(initialObjectCreationPage.getInitialObjectName()); + return seff2javaastFactory.create(eClass); } /** - * Do the work after everything is specified. + * Do the work after everything is specified. * * @generated */ @@ -192,7 +194,7 @@ public boolean performFinish() { try { // Remember the file. // - final IFile modelFile = this.getModelFile(); + final IFile modelFile = getModelFile(); // Do the work within an operation. // @@ -221,9 +223,8 @@ protected void execute(final IProgressMonitor progressMonitor) { // Save the contents of the resource to the file system. // - final Map options = new HashMap(); - options.put(XMLResource.OPTION_ENCODING, - Seff2javaastModelWizard.this.initialObjectCreationPage.getEncoding()); + final Map options = new HashMap<>(); + options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding()); resource.save(options); } catch (final Exception exception) { Seff2java_astEditorPlugin.INSTANCE.log(exception); @@ -233,28 +234,24 @@ protected void execute(final IProgressMonitor progressMonitor) { } }; - this.getContainer().run(false, false, operation); + getContainer().run(false, false, operation); // Select the new file resource in the current view. // - final IWorkbenchWindow workbenchWindow = this.workbench.getActiveWorkbenchWindow(); + final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); final IWorkbenchPage page = workbenchWindow.getActivePage(); final IWorkbenchPart activePart = page.getActivePart(); if (activePart instanceof ISetSelectionTarget) { final ISelection targetSelection = new StructuredSelection(modelFile); - this.getShell().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - ((ISetSelectionTarget) activePart).selectReveal(targetSelection); - } - }); + getShell().getDisplay() + .asyncExec(() -> ((ISetSelectionTarget) activePart).selectReveal(targetSelection)); } // Open an editor on the new file. // try { - page.openEditor(new FileEditorInput(modelFile), this.workbench.getEditorRegistry() - .getDefaultEditor(modelFile.getFullPath().toString()).getId()); + page.openEditor(new FileEditorInput(modelFile), + workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId()); } catch (final PartInitException exception) { MessageDialog.openError(workbenchWindow.getShell(), Seff2java_astEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), @@ -270,7 +267,8 @@ public void run() { } /** - * This is the one page of the wizard. + * This is the one page of the wizard. * * @generated */ @@ -285,19 +283,19 @@ public Seff2javaastModelWizardNewFileCreationPage(final String pageId, final ISt } /** - * The framework calls this to see if the file is correct. + * The framework calls this to see if the file is correct. * * @generated */ @Override protected boolean validatePage() { if (super.validatePage()) { - final String extension = new Path(this.getFileName()).getFileExtension(); - if (extension == null || !FILE_EXTENSIONS.contains(extension)) { + final String extension = new Path(getFileName()).getFileExtension(); + if ((extension == null) || !FILE_EXTENSIONS.contains(extension)) { final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; - this.setErrorMessage(Seff2java_astEditorPlugin.INSTANCE.getString(key, + setErrorMessage(Seff2java_astEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS })); return false; } @@ -312,14 +310,13 @@ protected boolean validatePage() { * @generated */ public IFile getModelFile() { - return ResourcesPlugin.getWorkspace().getRoot() - .getFile(this.getContainerFullPath().append(this.getFileName())); + return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName())); } } /** - * This is the page where the type of object to create is selected. + * This is the page where the type of object to create is selected. * * @generated */ @@ -382,22 +379,22 @@ public void createControl(final Composite parent) { containerLabel.setLayoutData(data); } - this.initialObjectField = new Combo(composite, SWT.BORDER); + initialObjectField = new Combo(composite, SWT.BORDER); { final GridData data = new GridData(); data.horizontalAlignment = GridData.FILL; data.grabExcessHorizontalSpace = true; - this.initialObjectField.setLayoutData(data); + initialObjectField.setLayoutData(data); } - for (final String objectName : Seff2javaastModelWizard.this.getInitialObjectNames()) { - this.initialObjectField.add(this.getLabel(objectName)); + for (final String objectName : getInitialObjectNames()) { + initialObjectField.add(getLabel(objectName)); } - if (this.initialObjectField.getItemCount() == 1) { - this.initialObjectField.select(0); + if (initialObjectField.getItemCount() == 1) { + initialObjectField.select(0); } - this.initialObjectField.addModifyListener(this.validator); + initialObjectField.addModifyListener(validator); final Label encodingLabel = new Label(composite, SWT.LEFT); { @@ -407,23 +404,23 @@ public void createControl(final Composite parent) { data.horizontalAlignment = GridData.FILL; encodingLabel.setLayoutData(data); } - this.encodingField = new Combo(composite, SWT.BORDER); + encodingField = new Combo(composite, SWT.BORDER); { final GridData data = new GridData(); data.horizontalAlignment = GridData.FILL; data.grabExcessHorizontalSpace = true; - this.encodingField.setLayoutData(data); + encodingField.setLayoutData(data); } - for (final String encoding : this.getEncodings()) { - this.encodingField.add(encoding); + for (final String encoding : getEncodings()) { + encodingField.add(encoding); } - this.encodingField.select(0); - this.encodingField.addModifyListener(this.validator); + encodingField.select(0); + encodingField.addModifyListener(validator); - this.setPageComplete(this.validatePage()); - this.setControl(composite); + setPageComplete(validatePage()); + setControl(composite); } /** @@ -431,13 +428,7 @@ public void createControl(final Composite parent) { * * @generated */ - protected ModifyListener validator = new ModifyListener() { - @Override - public void modifyText(final ModifyEvent e) { - Seff2javaastModelWizardInitialObjectCreationPage.this - .setPageComplete(Seff2javaastModelWizardInitialObjectCreationPage.this.validatePage()); - } - }; + protected ModifyListener validator = e -> setPageComplete(validatePage()); /** * @@ -445,7 +436,7 @@ public void modifyText(final ModifyEvent e) { * @generated */ protected boolean validatePage() { - return this.getInitialObjectName() != null && this.getEncodings().contains(this.encodingField.getText()); + return (getInitialObjectName() != null) && getEncodings().contains(encodingField.getText()); } /** @@ -457,12 +448,12 @@ protected boolean validatePage() { public void setVisible(final boolean visible) { super.setVisible(visible); if (visible) { - if (this.initialObjectField.getItemCount() == 1) { - this.initialObjectField.clearSelection(); - this.encodingField.setFocus(); + if (initialObjectField.getItemCount() == 1) { + initialObjectField.clearSelection(); + encodingField.setFocus(); } else { - this.encodingField.clearSelection(); - this.initialObjectField.setFocus(); + encodingField.clearSelection(); + initialObjectField.setFocus(); } } } @@ -473,10 +464,10 @@ public void setVisible(final boolean visible) { * @generated */ public String getInitialObjectName() { - final String label = this.initialObjectField.getText(); + final String label = initialObjectField.getText(); - for (final String name : Seff2javaastModelWizard.this.getInitialObjectNames()) { - if (this.getLabel(name).equals(label)) { + for (final String name : getInitialObjectNames()) { + if (getLabel(name).equals(label)) { return name; } } @@ -489,12 +480,12 @@ public String getInitialObjectName() { * @generated */ public String getEncoding() { - return this.encodingField.getText(); + return encodingField.getText(); } /** - * Returns the label for the specified type name. + * Returns the label for the specified type name. * * @generated */ @@ -513,21 +504,21 @@ protected String getLabel(final String typeName) { * @generated */ protected Collection getEncodings() { - if (this.encodings == null) { - this.encodings = new ArrayList(); + if (encodings == null) { + encodings = new ArrayList<>(); for (final StringTokenizer stringTokenizer = new StringTokenizer( Seff2java_astEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer .hasMoreTokens();) { - this.encodings.add(stringTokenizer.nextToken()); + encodings.add(stringTokenizer.nextToken()); } } - return this.encodings; + return encodings; } } /** - * The framework calls this to create the contents of the wizard. + * The framework calls this to create the contents of the wizard. * * @generated */ @@ -535,36 +526,33 @@ protected Collection getEncodings() { public void addPages() { // Create a page, set the title, and the initial model file name. // - this.newFileCreationPage = new Seff2javaastModelWizardNewFileCreationPage("Whatever", this.selection); - this.newFileCreationPage - .setTitle(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Seff2javaastModelWizard_label")); - this.newFileCreationPage.setDescription( + newFileCreationPage = new Seff2javaastModelWizardNewFileCreationPage("Whatever", selection); + newFileCreationPage.setTitle(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Seff2javaastModelWizard_label")); + newFileCreationPage.setDescription( Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Seff2javaastModelWizard_description")); - this.newFileCreationPage + newFileCreationPage .setFileName(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Seff2javaastEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); - this.addPage(this.newFileCreationPage); + addPage(newFileCreationPage); - // Try and get the resource selection to determine a current directory for the file dialog. + // Try and get the resource selection to determine a current directory for the + // file dialog. // - if (this.selection != null && !this.selection.isEmpty()) { + if ((selection != null) && !selection.isEmpty()) { // Get the resource... // - final Object selectedElement = this.selection.iterator().next(); - if (selectedElement instanceof IResource) { - // Get the resource parent, if its a file. - // - IResource selectedResource = (IResource) selectedElement; + final Object selectedElement = selection.iterator().next(); + if (selectedElement instanceof IResource selectedResource) { if (selectedResource.getType() == IResource.FILE) { selectedResource = selectedResource.getParent(); } // This gives us a directory... // - if (selectedResource instanceof IFolder || selectedResource instanceof IProject) { + if ((selectedResource instanceof IFolder) || (selectedResource instanceof IProject)) { // Set this for the container. // - this.newFileCreationPage.setContainerFullPath(selectedResource.getFullPath()); + newFileCreationPage.setContainerFullPath(selectedResource.getFullPath()); // Make up a unique new name here. // @@ -575,16 +563,16 @@ public void addPages() { for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) { modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; } - this.newFileCreationPage.setFileName(modelFilename); + newFileCreationPage.setFileName(modelFilename); } } } - this.initialObjectCreationPage = new Seff2javaastModelWizardInitialObjectCreationPage("Whatever2"); - this.initialObjectCreationPage + initialObjectCreationPage = new Seff2javaastModelWizardInitialObjectCreationPage("Whatever2"); + initialObjectCreationPage .setTitle(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Seff2javaastModelWizard_label")); - this.initialObjectCreationPage + initialObjectCreationPage .setDescription(Seff2java_astEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); - this.addPage(this.initialObjectCreationPage); + addPage(initialObjectCreationPage); } /** @@ -593,7 +581,7 @@ public void addPages() { * @generated */ public IFile getModelFile() { - return this.newFileCreationPage.getModelFile(); + return newFileCreationPage.getModelFile(); } } diff --git a/bundles/org.somox.seff2javaast/META-INF/MANIFEST.MF b/bundles/org.somox.seff2javaast/META-INF/MANIFEST.MF index 9c10def..20baa79 100644 --- a/bundles/org.somox.seff2javaast/META-INF/MANIFEST.MF +++ b/bundles/org.somox.seff2javaast/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.runtime, de.uka.ipd.sdq.probfunction;visibility:=reexport, de.uka.ipd.sdq.stoex;visibility:=reexport, de.uka.ipd.sdq.units;visibility:=reexport, - org.emftext.language.java;visibility:=reexport + tools.mdsd.jamopp.model.java Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.somox.seff2javaast diff --git a/bundles/org.somox.seff2javaast/model/seff2java_ast.ecore b/bundles/org.somox.seff2javaast/model/seff2java_ast.ecore index 97cf895..72472c8 100644 --- a/bundles/org.somox.seff2javaast/model/seff2java_ast.ecore +++ b/bundles/org.somox.seff2javaast/model/seff2java_ast.ecore @@ -3,7 +3,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="seff2javaast" nsURI="http://www.somox.org/seff2method/1.0" nsPrefix="org.somox"> + lowerBound="1" eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//statements/StatementListContainer" /> diff --git a/bundles/org.somox.seff2javaast/model/seff2java_ast.genmodel b/bundles/org.somox.seff2javaast/model/seff2java_ast.genmodel index 6a3ad45..4ca9e0a 100644 --- a/bundles/org.somox.seff2javaast/model/seff2java_ast.genmodel +++ b/bundles/org.somox.seff2javaast/model/seff2java_ast.genmodel @@ -1,10 +1,13 @@ - + seff2java_ast.ecore diff --git a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/SEFF2MethodMapping.java b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/SEFF2MethodMapping.java index f8a7384..6229a92 100644 --- a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/SEFF2MethodMapping.java +++ b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/SEFF2MethodMapping.java @@ -3,9 +3,10 @@ package org.somox.seff2javaast; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.seff.ServiceEffectSpecification; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; + /** * A representation of the model object ' SEFF2 * Method Mapping'. diff --git a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/SEFF2MethodMappingImpl.java b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/SEFF2MethodMappingImpl.java index a4a69cc..c489cc6 100644 --- a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/SEFF2MethodMappingImpl.java +++ b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/SEFF2MethodMappingImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.seff.ServiceEffectSpecification; import org.somox.seff2javaast.SEFF2MethodMapping; import org.somox.seff2javaast.Seff2javaastPackage; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; + /** * An implementation of the model object ' SEFF2 * Method Mapping'. diff --git a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/Seff2javaastPackageImpl.java b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/Seff2javaastPackageImpl.java index 076990d..39bb121 100644 --- a/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/Seff2javaastPackageImpl.java +++ b/bundles/org.somox.seff2javaast/src/org/somox/seff2javaast/impl/Seff2javaastPackageImpl.java @@ -6,24 +6,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.emftext.language.java.annotations.AnnotationsPackage; -import org.emftext.language.java.arrays.ArraysPackage; -import org.emftext.language.java.classifiers.ClassifiersPackage; -import org.emftext.language.java.commons.CommonsPackage; -import org.emftext.language.java.containers.ContainersPackage; -import org.emftext.language.java.expressions.ExpressionsPackage; -import org.emftext.language.java.generics.GenericsPackage; -import org.emftext.language.java.imports.ImportsPackage; -import org.emftext.language.java.instantiations.InstantiationsPackage; -import org.emftext.language.java.literals.LiteralsPackage; -import org.emftext.language.java.members.MembersPackage; -import org.emftext.language.java.modifiers.ModifiersPackage; -import org.emftext.language.java.operators.OperatorsPackage; -import org.emftext.language.java.parameters.ParametersPackage; -import org.emftext.language.java.references.ReferencesPackage; -import org.emftext.language.java.statements.StatementsPackage; -import org.emftext.language.java.types.TypesPackage; -import org.emftext.language.java.variables.VariablesPackage; import org.palladiosimulator.pcm.PcmPackage; import org.palladiosimulator.pcm.seff.SeffPackage; import org.somox.seff2javaast.SEFF2JavaAST; @@ -31,6 +13,25 @@ import org.somox.seff2javaast.Seff2javaastFactory; import org.somox.seff2javaast.Seff2javaastPackage; +import tools.mdsd.jamopp.model.java.annotations.AnnotationsPackage; +import tools.mdsd.jamopp.model.java.arrays.ArraysPackage; +import tools.mdsd.jamopp.model.java.classifiers.ClassifiersPackage; +import tools.mdsd.jamopp.model.java.commons.CommonsPackage; +import tools.mdsd.jamopp.model.java.containers.ContainersPackage; +import tools.mdsd.jamopp.model.java.expressions.ExpressionsPackage; +import tools.mdsd.jamopp.model.java.generics.GenericsPackage; +import tools.mdsd.jamopp.model.java.imports.ImportsPackage; +import tools.mdsd.jamopp.model.java.instantiations.InstantiationsPackage; +import tools.mdsd.jamopp.model.java.literals.LiteralsPackage; +import tools.mdsd.jamopp.model.java.members.MembersPackage; +import tools.mdsd.jamopp.model.java.modifiers.ModifiersPackage; +import tools.mdsd.jamopp.model.java.operators.OperatorsPackage; +import tools.mdsd.jamopp.model.java.parameters.ParametersPackage; +import tools.mdsd.jamopp.model.java.references.ReferencesPackage; +import tools.mdsd.jamopp.model.java.statements.StatementsPackage; +import tools.mdsd.jamopp.model.java.types.TypesPackage; +import tools.mdsd.jamopp.model.java.variables.VariablesPackage; + /** * An implementation of the model Package. diff --git a/bundles/org.somox.sourcecodedecorator.edit/META-INF/MANIFEST.MF b/bundles/org.somox.sourcecodedecorator.edit/META-INF/MANIFEST.MF index a9139f5..b93b6ca 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/META-INF/MANIFEST.MF +++ b/bundles/org.somox.sourcecodedecorator.edit/META-INF/MANIFEST.MF @@ -16,8 +16,6 @@ Require-Bundle: org.eclipse.core.runtime, org.palladiosimulator.pcm.edit, de.uka.ipd.sdq.identifier, de.uka.ipd.sdq.identifier.edit, - org.emftext.language.java, - org.emftext.language.java.edit, org.palladiosimulator.pcm, de.uka.ipd.sdq.probfunction, de.uka.ipd.sdq.stoex, diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractActionClassMethodLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractActionClassMethodLinkItemProvider.java index 31fc210..6e44b2d 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractActionClassMethodLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractActionClassMethodLinkItemProvider.java @@ -19,138 +19,131 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink} object. - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink} object. + * + * * @generated */ public class AbstractActionClassMethodLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public AbstractActionClassMethodLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public AbstractActionClassMethodLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addClassMethodPropertyDescriptor(object); - addAbstractActionPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addClassMethodPropertyDescriptor(object); + addAbstractActionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Class Method feature. - * - * @generated - */ - protected void addClassMethodPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_AbstractActionClassMethodLink_classMethod_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_AbstractActionClassMethodLink_classMethod_feature", "_UI_AbstractActionClassMethodLink_type"), - SourcecodedecoratorPackage.Literals.ABSTRACT_ACTION_CLASS_METHOD_LINK__CLASS_METHOD, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Class Method feature. + * + * @generated + */ + protected void addClassMethodPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_AbstractActionClassMethodLink_classMethod_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AbstractActionClassMethodLink_classMethod_feature", + "_UI_AbstractActionClassMethodLink_type"), + SourcecodedecoratorPackage.Literals.ABSTRACT_ACTION_CLASS_METHOD_LINK__CLASS_METHOD, true, false, true, + null, null, null)); + } /** - * This adds a property descriptor for the Abstract Action feature. - * - * @generated - */ - protected void addAbstractActionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_AbstractActionClassMethodLink_abstractAction_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_AbstractActionClassMethodLink_abstractAction_feature", "_UI_AbstractActionClassMethodLink_type"), - SourcecodedecoratorPackage.Literals.ABSTRACT_ACTION_CLASS_METHOD_LINK__ABSTRACT_ACTION, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Abstract Action feature. + * + * @generated + */ + protected void addAbstractActionPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_AbstractActionClassMethodLink_abstractAction_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_AbstractActionClassMethodLink_abstractAction_feature", + "_UI_AbstractActionClassMethodLink_type"), + SourcecodedecoratorPackage.Literals.ABSTRACT_ACTION_CLASS_METHOD_LINK__ABSTRACT_ACTION, true, + false, true, null, null, null)); + } /** - * This returns AbstractActionClassMethodLink.gif. - * - * @generated - */ + * This returns AbstractActionClassMethodLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractActionClassMethodLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractActionClassMethodLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_AbstractActionClassMethodLink_type"); - } + public String getText(final Object object) { + return getString("_UI_AbstractActionClassMethodLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractMethodLevelSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractMethodLevelSourceCodeLinkItemProvider.java index 30d6758..02cd789 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractMethodLevelSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/AbstractMethodLevelSourceCodeLinkItemProvider.java @@ -13,92 +13,89 @@ /** * This is the item provider adapter for a - * {@link org.somox.sourcecodedecorator.AbstractMethodLevelSourceCodeLink} object. + * {@link org.somox.sourcecodedecorator.AbstractMethodLevelSourceCodeLink} + * object. * * @generated */ public class AbstractMethodLevelSourceCodeLinkItemProvider extends FileLevelSourceCodeLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public AbstractMethodLevelSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public AbstractMethodLevelSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addFunctionPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addFunctionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Function feature. - * - * @generated - */ - protected void addFunctionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_AbstractMethodLevelSourceCodeLink_function_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_AbstractMethodLevelSourceCodeLink_function_feature", "_UI_AbstractMethodLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.ABSTRACT_METHOD_LEVEL_SOURCE_CODE_LINK__FUNCTION, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Function feature. + * + * @generated + */ + protected void addFunctionPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_AbstractMethodLevelSourceCodeLink_function_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_AbstractMethodLevelSourceCodeLink_function_feature", + "_UI_AbstractMethodLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.ABSTRACT_METHOD_LEVEL_SOURCE_CODE_LINK__FUNCTION, true, + false, true, null, null, null)); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_AbstractMethodLevelSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_AbstractMethodLevelSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ComponentImplementingClassesLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ComponentImplementingClassesLinkItemProvider.java index 0c7c36d..7498b31 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ComponentImplementingClassesLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ComponentImplementingClassesLinkItemProvider.java @@ -23,8 +23,8 @@ /** * This is the item provider adapter for a - * {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink} object. + * {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink} + * object. * * @generated */ @@ -32,253 +32,221 @@ public class ComponentImplementingClassesLinkItemProvider extends ItemProviderAd implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public ComponentImplementingClassesLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public ComponentImplementingClassesLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addIsCompositeComponentPropertyDescriptor(object); - addComponentPropertyDescriptor(object); - addImplementingClassesPropertyDescriptor(object); - addSubComponentsPropertyDescriptor(object); - addProvidedInterfacesPropertyDescriptor(object); - addRequiredInterfacesPropertyDescriptor(object); - addIsInitialComponentPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addIsCompositeComponentPropertyDescriptor(object); + addComponentPropertyDescriptor(object); + addImplementingClassesPropertyDescriptor(object); + addSubComponentsPropertyDescriptor(object); + addProvidedInterfacesPropertyDescriptor(object); + addRequiredInterfacesPropertyDescriptor(object); + addIsInitialComponentPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Is Composite Component feature. - * - * @generated - */ - protected void addIsCompositeComponentPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_isCompositeComponent_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_isCompositeComponent_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_COMPOSITE_COMPONENT, - false, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } + * This adds a property descriptor for the Is Composite Component feature. + * + * @generated + */ + protected void addIsCompositeComponentPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ComponentImplementingClassesLink_isCompositeComponent_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_isCompositeComponent_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_COMPOSITE_COMPONENT, false, + false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } /** - * This adds a property descriptor for the Component feature. - * - * @generated - */ - protected void addComponentPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_component_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_component_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__COMPONENT, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Component feature. + * + * @generated + */ + protected void addComponentPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ComponentImplementingClassesLink_component_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_component_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__COMPONENT, true, false, + true, null, null, null)); + } /** - * This adds a property descriptor for the Implementing Classes feature. - * - * - * @generated - */ - protected void addImplementingClassesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_implementingClasses_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_implementingClasses_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IMPLEMENTING_CLASSES, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Implementing Classes feature. + * + * @generated + */ + protected void addImplementingClassesPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ComponentImplementingClassesLink_implementingClasses_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_implementingClasses_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IMPLEMENTING_CLASSES, true, + false, true, null, null, null)); + } /** - * This adds a property descriptor for the Sub Components feature. - * - * @generated - */ - protected void addSubComponentsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_subComponents_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_subComponents_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__SUB_COMPONENTS, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Sub Components feature. + * + * @generated + */ + protected void addSubComponentsPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ComponentImplementingClassesLink_subComponents_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_subComponents_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__SUB_COMPONENTS, true, + false, true, null, null, null)); + } /** - * This adds a property descriptor for the Provided Interfaces feature. - * - * - * @generated - */ - protected void addProvidedInterfacesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_providedInterfaces_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_providedInterfaces_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__PROVIDED_INTERFACES, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Provided Interfaces feature. + * + * @generated + */ + protected void addProvidedInterfacesPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ComponentImplementingClassesLink_providedInterfaces_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_providedInterfaces_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__PROVIDED_INTERFACES, true, + false, true, null, null, null)); + } /** - * This adds a property descriptor for the Required Interfaces feature. - * - * - * @generated - */ - protected void addRequiredInterfacesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_requiredInterfaces_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_requiredInterfaces_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__REQUIRED_INTERFACES, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Required Interfaces feature. + * + * @generated + */ + protected void addRequiredInterfacesPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ComponentImplementingClassesLink_requiredInterfaces_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_requiredInterfaces_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__REQUIRED_INTERFACES, true, + false, true, null, null, null)); + } /** - * This adds a property descriptor for the Is Initial Component feature. - * - * - * @generated - */ - protected void addIsInitialComponentPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ComponentImplementingClassesLink_isInitialComponent_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ComponentImplementingClassesLink_isInitialComponent_feature", "_UI_ComponentImplementingClassesLink_type"), - SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_INITIAL_COMPONENT, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } + * This adds a property descriptor for the Is Initial Component feature. + * + * @generated + */ + protected void addIsInitialComponentPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ComponentImplementingClassesLink_isInitialComponent_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ComponentImplementingClassesLink_isInitialComponent_feature", + "_UI_ComponentImplementingClassesLink_type"), + SourcecodedecoratorPackage.Literals.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_INITIAL_COMPONENT, true, + false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } /** - * This returns ComponentImplementingClassesLink.gif. + * This returns ComponentImplementingClassesLink.gif. + * * * @generated */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ComponentImplementingClassesLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ComponentImplementingClassesLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - ComponentImplementingClassesLink componentImplementingClassesLink = (ComponentImplementingClassesLink)object; - return getString("_UI_ComponentImplementingClassesLink_type") + " " + componentImplementingClassesLink.isIsCompositeComponent(); - } + public String getText(final Object object) { + final ComponentImplementingClassesLink componentImplementingClassesLink = (ComponentImplementingClassesLink) object; + return getString("_UI_ComponentImplementingClassesLink_type") + " " + + componentImplementingClassesLink.isIsCompositeComponent(); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(ComponentImplementingClassesLink.class)) { - case SourcecodedecoratorPackage.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_COMPOSITE_COMPONENT: - case SourcecodedecoratorPackage.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_INITIAL_COMPONENT: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(ComponentImplementingClassesLink.class)) { + case SourcecodedecoratorPackage.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_COMPOSITE_COMPONENT: + case SourcecodedecoratorPackage.COMPONENT_IMPLEMENTING_CLASSES_LINK__IS_INITIAL_COMPONENT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ControlFlowLevelSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ControlFlowLevelSourceCodeLinkItemProvider.java index 54d0b27..a6f6713 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ControlFlowLevelSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/ControlFlowLevelSourceCodeLinkItemProvider.java @@ -12,126 +12,118 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink} object. - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink} object. + * + * * @generated */ public class ControlFlowLevelSourceCodeLinkItemProvider extends MethodLevelSourceCodeLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public ControlFlowLevelSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public ControlFlowLevelSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addAbstractActionPropertyDescriptor(object); - addStatementPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addAbstractActionPropertyDescriptor(object); + addStatementPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Abstract Action feature. - * - * @generated - */ - protected void addAbstractActionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ControlFlowLevelSourceCodeLink_abstractAction_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ControlFlowLevelSourceCodeLink_abstractAction_feature", "_UI_ControlFlowLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK__ABSTRACT_ACTION, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Abstract Action feature. + * + * @generated + */ + protected void addAbstractActionPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ControlFlowLevelSourceCodeLink_abstractAction_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ControlFlowLevelSourceCodeLink_abstractAction_feature", + "_UI_ControlFlowLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK__ABSTRACT_ACTION, true, + false, true, null, null, null)); + } /** - * This adds a property descriptor for the Statement feature. - * - * @generated - */ - protected void addStatementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ControlFlowLevelSourceCodeLink_statement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ControlFlowLevelSourceCodeLink_statement_feature", "_UI_ControlFlowLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK__STATEMENT, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Statement feature. + * + * @generated + */ + protected void addStatementPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ControlFlowLevelSourceCodeLink_statement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ControlFlowLevelSourceCodeLink_statement_feature", + "_UI_ControlFlowLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK__STATEMENT, true, false, true, + null, null, null)); + } /** - * This returns ControlFlowLevelSourceCodeLink.gif. + * This returns ControlFlowLevelSourceCodeLink.gif. * * @generated */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlFlowLevelSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlFlowLevelSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_ControlFlowLevelSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_ControlFlowLevelSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/DataTypeSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/DataTypeSourceCodeLinkItemProvider.java index 3718d1a..f63d1ca 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/DataTypeSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/DataTypeSourceCodeLinkItemProvider.java @@ -12,148 +12,135 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink} object. - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink} object. + * * @generated */ public class DataTypeSourceCodeLinkItemProvider extends FileLevelSourceCodeLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public DataTypeSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public DataTypeSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addJaMoPPTypePropertyDescriptor(object); - addPcmDataTypePropertyDescriptor(object); - addInnerDatatypeSourceCodeLinkPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addJaMoPPTypePropertyDescriptor(object); + addPcmDataTypePropertyDescriptor(object); + addInnerDatatypeSourceCodeLinkPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Ja Mo PP Type feature. - * - * @generated - */ - protected void addJaMoPPTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DataTypeSourceCodeLink_jaMoPPType_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DataTypeSourceCodeLink_jaMoPPType_feature", "_UI_DataTypeSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__JA_MO_PP_TYPE, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Ja Mo PP Type feature. + * + * @generated + */ + protected void addJaMoPPTypePropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_DataTypeSourceCodeLink_jaMoPPType_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DataTypeSourceCodeLink_jaMoPPType_feature", + "_UI_DataTypeSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__JA_MO_PP_TYPE, true, false, + true, null, null, null)); + } /** - * This adds a property descriptor for the Pcm Data Type feature. - * - * @generated - */ - protected void addPcmDataTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DataTypeSourceCodeLink_pcmDataType_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DataTypeSourceCodeLink_pcmDataType_feature", "_UI_DataTypeSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__PCM_DATA_TYPE, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Pcm Data Type feature. + * + * @generated + */ + protected void addPcmDataTypePropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_DataTypeSourceCodeLink_pcmDataType_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_DataTypeSourceCodeLink_pcmDataType_feature", "_UI_DataTypeSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__PCM_DATA_TYPE, true, false, + true, null, null, null)); + } /** - * This adds a property descriptor for the Inner Datatype Source Code Link feature. + * This adds a property descriptor for the Inner Datatype Source Code Link + * feature. * * @generated */ - protected void addInnerDatatypeSourceCodeLinkPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DataTypeSourceCodeLink_innerDatatypeSourceCodeLink_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DataTypeSourceCodeLink_innerDatatypeSourceCodeLink_feature", "_UI_DataTypeSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__INNER_DATATYPE_SOURCE_CODE_LINK, - true, - false, - true, - null, - null, - null)); - } + protected void addInnerDatatypeSourceCodeLinkPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_DataTypeSourceCodeLink_innerDatatypeSourceCodeLink_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_DataTypeSourceCodeLink_innerDatatypeSourceCodeLink_feature", + "_UI_DataTypeSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.DATA_TYPE_SOURCE_CODE_LINK__INNER_DATATYPE_SOURCE_CODE_LINK, true, + false, true, null, null, null)); + } /** - * This returns DataTypeSourceCodeLink.gif. - * - * @generated - */ + * This returns DataTypeSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/DataTypeSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/DataTypeSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_DataTypeSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_DataTypeSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FEditPlugin.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FEditPlugin.java index fae1759..858bfda 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FEditPlugin.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FEditPlugin.java @@ -4,94 +4,86 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.emftext.language.java.annotations.provider.JavaEditPlugin; import org.palladiosimulator.pcm.core.provider.PalladioComponentModelEditPlugin; import de.uka.ipd.sdq.identifier.provider.IdentifierEditPlugin; import de.uka.ipd.sdq.probfunction.provider.ProbabilityFunctionEditPlugin; import de.uka.ipd.sdq.stoex.provider.StoexEditPlugin; import de.uka.ipd.sdq.units.provider.UnitsEditPlugin; +import tools.mdsd.jamopp.model.java.annotations.provider.JavaEditPlugin; /** - * This is the central singleton for the F edit plugin. + * This is the central singleton for the F edit plugin. + * * * @generated */ public final class FEditPlugin extends EMFPlugin { /** - * Keep track of the singleton. - * - * @generated - */ + * Keep track of the singleton. + * + * @generated + */ public static final FEditPlugin INSTANCE = new FEditPlugin(); /** - * Keep track of the singleton. - * - * @generated - */ + * Keep track of the singleton. + * + * @generated + */ private static Implementation plugin; /** - * Create the instance. - * - * @generated - */ + * Create the instance. + * + * @generated + */ public FEditPlugin() { - super - (new ResourceLocator [] { - IdentifierEditPlugin.INSTANCE, - JavaEditPlugin.INSTANCE, - PalladioComponentModelEditPlugin.INSTANCE, - ProbabilityFunctionEditPlugin.INSTANCE, - StoexEditPlugin.INSTANCE, - UnitsEditPlugin.INSTANCE, - }); - } + super(new ResourceLocator[] { IdentifierEditPlugin.INSTANCE, JavaEditPlugin.INSTANCE, + PalladioComponentModelEditPlugin.INSTANCE, ProbabilityFunctionEditPlugin.INSTANCE, + StoexEditPlugin.INSTANCE, UnitsEditPlugin.INSTANCE, }); + } /** - * Returns the singleton instance of the Eclipse plugin. - * - * @return the singleton instance. - * @generated - */ + * Returns the singleton instance of the Eclipse plugin. + * + * + * @return the singleton instance. + * @generated + */ @Override public ResourceLocator getPluginResourceLocator() { - return plugin; - } + return plugin; + } /** - * Returns the singleton instance of the Eclipse plugin. - * - * @return the singleton instance. - * @generated - */ + * Returns the singleton instance of the Eclipse plugin. + * + * + * @return the singleton instance. + * @generated + */ public static Implementation getPlugin() { - return plugin; - } + return plugin; + } /** - * The actual implementation of the Eclipse Plugin. - * - * @generated - */ + * The actual implementation of the Eclipse Plugin. + * + * @generated + */ public static class Implementation extends EclipsePlugin { /** - * Creates an instance. - * - * @generated - */ + * Creates an instance. + * + * @generated + */ public Implementation() { - super(); - - // Remember the static instance. - // - plugin = this; - } + // Remember the static instance. + // + plugin = this; + } } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FileLevelSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FileLevelSourceCodeLinkItemProvider.java index 55fb3b8..a8aaede 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FileLevelSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/FileLevelSourceCodeLinkItemProvider.java @@ -19,137 +19,129 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink} object. + * * @generated */ public class FileLevelSourceCodeLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public FileLevelSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public FileLevelSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addRepositoryComponentPropertyDescriptor(object); - addFilePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addRepositoryComponentPropertyDescriptor(object); + addFilePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Repository Component feature. - * - * - * @generated - */ - protected void addRepositoryComponentPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_FileLevelSourceCodeLink_repositoryComponent_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_FileLevelSourceCodeLink_repositoryComponent_feature", "_UI_FileLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.FILE_LEVEL_SOURCE_CODE_LINK__REPOSITORY_COMPONENT, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Repository Component feature. + * + * @generated + */ + protected void addRepositoryComponentPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_FileLevelSourceCodeLink_repositoryComponent_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_FileLevelSourceCodeLink_repositoryComponent_feature", "_UI_FileLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.FILE_LEVEL_SOURCE_CODE_LINK__REPOSITORY_COMPONENT, true, false, + true, null, null, null)); + } /** - * This adds a property descriptor for the File feature. - * - * @generated - */ - protected void addFilePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_FileLevelSourceCodeLink_file_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_FileLevelSourceCodeLink_file_feature", "_UI_FileLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.FILE_LEVEL_SOURCE_CODE_LINK__FILE, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the File feature. + * + * + * @generated + */ + protected void addFilePropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_FileLevelSourceCodeLink_file_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_FileLevelSourceCodeLink_file_feature", + "_UI_FileLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.FILE_LEVEL_SOURCE_CODE_LINK__FILE, true, false, true, null, + null, null)); + } /** - * This returns FileLevelSourceCodeLink.gif. - * - * @generated - */ + * This returns FileLevelSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/FileLevelSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/FileLevelSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_FileLevelSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_FileLevelSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InnerDatatypeSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InnerDatatypeSourceCodeLinkItemProvider.java index a40869a..c757ce7 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InnerDatatypeSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InnerDatatypeSourceCodeLinkItemProvider.java @@ -19,137 +19,130 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink} object. + * + * * @generated */ public class InnerDatatypeSourceCodeLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public InnerDatatypeSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public InnerDatatypeSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addFieldPropertyDescriptor(object); - addInnerDeclarationPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addFieldPropertyDescriptor(object); + addInnerDeclarationPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Field feature. - * - * @generated - */ - protected void addFieldPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_InnerDatatypeSourceCodeLink_field_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_InnerDatatypeSourceCodeLink_field_feature", "_UI_InnerDatatypeSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.INNER_DATATYPE_SOURCE_CODE_LINK__FIELD, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Field feature. + * + * @generated + */ + protected void addFieldPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_InnerDatatypeSourceCodeLink_field_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_InnerDatatypeSourceCodeLink_field_feature", + "_UI_InnerDatatypeSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.INNER_DATATYPE_SOURCE_CODE_LINK__FIELD, true, false, true, + null, null, null)); + } /** - * This adds a property descriptor for the Inner Declaration feature. - * - * - * @generated - */ - protected void addInnerDeclarationPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_InnerDatatypeSourceCodeLink_innerDeclaration_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_InnerDatatypeSourceCodeLink_innerDeclaration_feature", "_UI_InnerDatatypeSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.INNER_DATATYPE_SOURCE_CODE_LINK__INNER_DECLARATION, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Inner Declaration feature. + * + * @generated + */ + protected void addInnerDeclarationPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_InnerDatatypeSourceCodeLink_innerDeclaration_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_InnerDatatypeSourceCodeLink_innerDeclaration_feature", + "_UI_InnerDatatypeSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.INNER_DATATYPE_SOURCE_CODE_LINK__INNER_DECLARATION, true, + false, true, null, null, null)); + } /** - * This returns InnerDatatypeSourceCodeLink.gif. - * - * @generated - */ + * This returns InnerDatatypeSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/InnerDatatypeSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/InnerDatatypeSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_InnerDatatypeSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_InnerDatatypeSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InterfaceSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InterfaceSourceCodeLinkItemProvider.java index 9bc9db1..2464e77 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InterfaceSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/InterfaceSourceCodeLinkItemProvider.java @@ -19,137 +19,129 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink} object. + * * @generated */ public class InterfaceSourceCodeLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public InterfaceSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public InterfaceSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addInterfacePropertyDescriptor(object); - addGastClassPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addInterfacePropertyDescriptor(object); + addGastClassPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Interface feature. - * - * @generated - */ - protected void addInterfacePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_InterfaceSourceCodeLink_interface_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_InterfaceSourceCodeLink_interface_feature", "_UI_InterfaceSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.INTERFACE_SOURCE_CODE_LINK__INTERFACE, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Interface feature. + * + * @generated + */ + protected void addInterfacePropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_InterfaceSourceCodeLink_interface_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_InterfaceSourceCodeLink_interface_feature", + "_UI_InterfaceSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.INTERFACE_SOURCE_CODE_LINK__INTERFACE, true, false, true, + null, null, null)); + } /** - * This adds a property descriptor for the Gast Class feature. - * - * @generated - */ - protected void addGastClassPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_InterfaceSourceCodeLink_gastClass_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_InterfaceSourceCodeLink_gastClass_feature", "_UI_InterfaceSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.INTERFACE_SOURCE_CODE_LINK__GAST_CLASS, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Gast Class feature. + * + * @generated + */ + protected void addGastClassPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_InterfaceSourceCodeLink_gastClass_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_InterfaceSourceCodeLink_gastClass_feature", + "_UI_InterfaceSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.INTERFACE_SOURCE_CODE_LINK__GAST_CLASS, true, false, true, + null, null, null)); + } /** - * This returns InterfaceSourceCodeLink.gif. - * - * @generated - */ + * This returns InterfaceSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/InterfaceSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/InterfaceSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_InterfaceSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_InterfaceSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelResourceDemandingInternalBehaviorLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelResourceDemandingInternalBehaviorLinkItemProvider.java index 5d20455..47f6bcd 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelResourceDemandingInternalBehaviorLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelResourceDemandingInternalBehaviorLinkItemProvider.java @@ -12,103 +12,104 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink} object. - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink} + * object. + * * @generated */ public class MethodLevelResourceDemandingInternalBehaviorLinkItemProvider extends AbstractMethodLevelSourceCodeLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public MethodLevelResourceDemandingInternalBehaviorLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public MethodLevelResourceDemandingInternalBehaviorLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addResourceDemandingInternalBehaviourPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addResourceDemandingInternalBehaviourPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Resource Demanding Internal Behaviour feature. + * This adds a property descriptor for the Resource Demanding Internal Behaviour + * feature. * * @generated */ - protected void addResourceDemandingInternalBehaviourPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_MethodLevelResourceDemandingInternalBehaviorLink_resourceDemandingInternalBehaviour_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_MethodLevelResourceDemandingInternalBehaviorLink_resourceDemandingInternalBehaviour_feature", "_UI_MethodLevelResourceDemandingInternalBehaviorLink_type"), - SourcecodedecoratorPackage.Literals.METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK__RESOURCE_DEMANDING_INTERNAL_BEHAVIOUR, - true, - false, - true, - null, - null, - null)); - } + protected void addResourceDemandingInternalBehaviourPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString( + "_UI_MethodLevelResourceDemandingInternalBehaviorLink_resourceDemandingInternalBehaviour_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_MethodLevelResourceDemandingInternalBehaviorLink_resourceDemandingInternalBehaviour_feature", + "_UI_MethodLevelResourceDemandingInternalBehaviorLink_type"), + SourcecodedecoratorPackage.Literals.METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK__RESOURCE_DEMANDING_INTERNAL_BEHAVIOUR, + true, false, true, null, null, null)); + } /** - * This returns MethodLevelResourceDemandingInternalBehaviorLink.gif. - * - * - * @generated - */ + * This returns MethodLevelResourceDemandingInternalBehaviorLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/MethodLevelResourceDemandingInternalBehaviorLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, + getResourceLocator().getImage("full/obj16/MethodLevelResourceDemandingInternalBehaviorLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_MethodLevelResourceDemandingInternalBehaviorLink_type"); - } + public String getText(final Object object) { + return getString("_UI_MethodLevelResourceDemandingInternalBehaviorLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelSourceCodeLinkItemProvider.java index 3db5270..960929e 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/MethodLevelSourceCodeLinkItemProvider.java @@ -12,102 +12,100 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink} object. + * * @generated */ public class MethodLevelSourceCodeLinkItemProvider extends AbstractMethodLevelSourceCodeLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public MethodLevelSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public MethodLevelSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addOperationPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addOperationPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Operation feature. - * - * @generated - */ - protected void addOperationPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_MethodLevelSourceCodeLink_operation_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_MethodLevelSourceCodeLink_operation_feature", "_UI_MethodLevelSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.METHOD_LEVEL_SOURCE_CODE_LINK__OPERATION, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Operation feature. + * + * @generated + */ + protected void addOperationPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_MethodLevelSourceCodeLink_operation_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_MethodLevelSourceCodeLink_operation_feature", + "_UI_MethodLevelSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.METHOD_LEVEL_SOURCE_CODE_LINK__OPERATION, true, false, true, null, + null, null)); + } /** - * This returns MethodLevelSourceCodeLink.gif. - * - * @generated - */ + * This returns MethodLevelSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/MethodLevelSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/MethodLevelSourceCodeLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_MethodLevelSourceCodeLink_type"); - } + public String getText(final Object object) { + return getString("_UI_MethodLevelSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/PCMSystemImplementatingClassesLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/PCMSystemImplementatingClassesLinkItemProvider.java index 168ffc0..90622aa 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/PCMSystemImplementatingClassesLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/PCMSystemImplementatingClassesLinkItemProvider.java @@ -14,104 +14,102 @@ /** * This is the item provider adapter for a - * {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink} object. + * {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink} + * object. * * @generated */ public class PCMSystemImplementatingClassesLinkItemProvider extends ComponentImplementingClassesLinkItemProvider { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public PCMSystemImplementatingClassesLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public PCMSystemImplementatingClassesLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addSystemModelPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addSystemModelPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the System Model feature. - * - * @generated - */ - protected void addSystemModelPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_PCMSystemImplementatingClassesLink_systemModel_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_PCMSystemImplementatingClassesLink_systemModel_feature", "_UI_PCMSystemImplementatingClassesLink_type"), - SourcecodedecoratorPackage.Literals.PCM_SYSTEM_IMPLEMENTATING_CLASSES_LINK__SYSTEM_MODEL, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the System Model feature. + * + * @generated + */ + protected void addSystemModelPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_PCMSystemImplementatingClassesLink_systemModel_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_PCMSystemImplementatingClassesLink_systemModel_feature", + "_UI_PCMSystemImplementatingClassesLink_type"), + SourcecodedecoratorPackage.Literals.PCM_SYSTEM_IMPLEMENTATING_CLASSES_LINK__SYSTEM_MODEL, true, + false, true, null, null, null)); + } /** - * This returns PCMSystemImplementatingClassesLink.gif. - * - * @generated - */ + * This returns PCMSystemImplementatingClassesLink.gif. + * + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/PCMSystemImplementatingClassesLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/PCMSystemImplementatingClassesLink")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - PCMSystemImplementatingClassesLink pcmSystemImplementatingClassesLink = (PCMSystemImplementatingClassesLink)object; - return getString("_UI_PCMSystemImplementatingClassesLink_type") + " " + pcmSystemImplementatingClassesLink.isIsCompositeComponent(); - } + public String getText(final Object object) { + final PCMSystemImplementatingClassesLink pcmSystemImplementatingClassesLink = (PCMSystemImplementatingClassesLink) object; + return getString("_UI_PCMSystemImplementatingClassesLink_type") + " " + + pcmSystemImplementatingClassesLink.isIsCompositeComponent(); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SEFF2MethodMappingItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SEFF2MethodMappingItemProvider.java index ff632ef..55845e5 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SEFF2MethodMappingItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SEFF2MethodMappingItemProvider.java @@ -2,15 +2,12 @@ */ package org.somox.sourcecodedecorator.provider; - import java.util.Collection; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -19,151 +16,131 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; - import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.SEFF2MethodMapping} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.SEFF2MethodMapping} object. + * * @generated */ -public class SEFF2MethodMappingItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class SEFF2MethodMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public SEFF2MethodMappingItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public SEFF2MethodMappingItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addSeffPropertyDescriptor(object); - addStatementListContainerPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addSeffPropertyDescriptor(object); + addStatementListContainerPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Seff feature. - * + * This adds a property descriptor for the Seff feature. * - * @generated - */ - protected void addSeffPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_SEFF2MethodMapping_seff_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_seff_feature", "_UI_SEFF2MethodMapping_type"), - SourcecodedecoratorPackage.Literals.SEFF2_METHOD_MAPPING__SEFF, - true, - false, - true, - null, - null, - null)); - } + * + * @generated + */ + protected void addSeffPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SEFF2MethodMapping_seff_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_seff_feature", + "_UI_SEFF2MethodMapping_type"), + SourcecodedecoratorPackage.Literals.SEFF2_METHOD_MAPPING__SEFF, true, false, true, null, null, null)); + } /** - * This adds a property descriptor for the Statement List Container feature. - * - * - * @generated - */ - protected void addStatementListContainerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_SEFF2MethodMapping_statementListContainer_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_SEFF2MethodMapping_statementListContainer_feature", "_UI_SEFF2MethodMapping_type"), - SourcecodedecoratorPackage.Literals.SEFF2_METHOD_MAPPING__STATEMENT_LIST_CONTAINER, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Statement List Container feature. + * + * + * @generated + */ + protected void addStatementListContainerPropertyDescriptor(final Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_SEFF2MethodMapping_statementListContainer_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_SEFF2MethodMapping_statementListContainer_feature", "_UI_SEFF2MethodMapping_type"), + SourcecodedecoratorPackage.Literals.SEFF2_METHOD_MAPPING__STATEMENT_LIST_CONTAINER, true, false, + true, null, null, null)); + } /** - * This returns SEFF2MethodMapping.gif. - * - * - * @generated - */ + * This returns SEFF2MethodMapping.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/SEFF2MethodMapping")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/SEFF2MethodMapping")); + } /** - * This returns the label text for the adapted class. - * + * This returns the label text for the adapted class. * - * @generated - */ + * + * @generated + */ @Override - public String getText(Object object) { - return getString("_UI_SEFF2MethodMapping_type"); - } - + public String getText(final Object object) { + return getString("_UI_SEFF2MethodMapping_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. * - * @generated - */ + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SeffElementSourceCodeLinkItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SeffElementSourceCodeLinkItemProvider.java index e72cc7c..6794e09 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SeffElementSourceCodeLinkItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SeffElementSourceCodeLinkItemProvider.java @@ -2,15 +2,12 @@ */ package org.somox.sourcecodedecorator.provider; - import java.util.Collection; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -19,151 +16,132 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; - import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink} object. - * - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink} object. + * * @generated */ -public class SeffElementSourceCodeLinkItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class SeffElementSourceCodeLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public SeffElementSourceCodeLinkItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public SeffElementSourceCodeLinkItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - addSeffElementPropertyDescriptor(object); - addStatementPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } + addSeffElementPropertyDescriptor(object); + addStatementPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } /** - * This adds a property descriptor for the Seff Element feature. - * - * - * @generated - */ - protected void addSeffElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_SeffElementSourceCodeLink_seffElement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_SeffElementSourceCodeLink_seffElement_feature", "_UI_SeffElementSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.SEFF_ELEMENT_SOURCE_CODE_LINK__SEFF_ELEMENT, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Seff Element feature. + * + * @generated + */ + protected void addSeffElementPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SeffElementSourceCodeLink_seffElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_SeffElementSourceCodeLink_seffElement_feature", + "_UI_SeffElementSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.SEFF_ELEMENT_SOURCE_CODE_LINK__SEFF_ELEMENT, true, false, true, + null, null, null)); + } /** - * This adds a property descriptor for the Statement feature. - * - * - * @generated - */ - protected void addStatementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_SeffElementSourceCodeLink_statement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_SeffElementSourceCodeLink_statement_feature", "_UI_SeffElementSourceCodeLink_type"), - SourcecodedecoratorPackage.Literals.SEFF_ELEMENT_SOURCE_CODE_LINK__STATEMENT, - true, - false, - true, - null, - null, - null)); - } + * This adds a property descriptor for the Statement feature. + * + * @generated + */ + protected void addStatementPropertyDescriptor(final Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SeffElementSourceCodeLink_statement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_SeffElementSourceCodeLink_statement_feature", + "_UI_SeffElementSourceCodeLink_type"), + SourcecodedecoratorPackage.Literals.SEFF_ELEMENT_SOURCE_CODE_LINK__STATEMENT, true, false, true, null, + null, null)); + } /** - * This returns SeffElementSourceCodeLink.gif. - * - * - * @generated - */ + * This returns SeffElementSourceCodeLink.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/SeffElementSourceCodeLink")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/SeffElementSourceCodeLink")); + } /** - * This returns the label text for the adapted class. - * + * This returns the label text for the adapted class. * - * @generated - */ + * + * @generated + */ @Override - public String getText(Object object) { - return getString("_UI_SeffElementSourceCodeLink_type"); - } - + public String getText(final Object object) { + return getString("_UI_SeffElementSourceCodeLink_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. * - * @generated - */ + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } /** - * Return the resource locator for this item provider's resources. - * - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourceCodeDecoratorRepositoryItemProvider.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourceCodeDecoratorRepositoryItemProvider.java index 7d64e8b..37fe41c 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourceCodeDecoratorRepositoryItemProvider.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourceCodeDecoratorRepositoryItemProvider.java @@ -22,252 +22,252 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; /** - * This is the item provider adapter for a {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository} object. - * + * This is the item provider adapter for a + * {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository} object. + * + * * @generated */ public class SourceCodeDecoratorRepositoryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - * - * @generated - */ - public SourceCodeDecoratorRepositoryItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public SourceCodeDecoratorRepositoryItemProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * This returns the property descriptors for the adapted class. - * - * @generated - */ + * This returns the property descriptors for the adapted class. + * + * @generated + */ @Override - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); + public List getPropertyDescriptors(final Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); - } - return itemPropertyDescriptors; - } + } + return itemPropertyDescriptors; + } /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate - * feature for an {@link org.eclipse.emf.edit.command.AddCommand}, + * This specifies how to implement {@link #getChildren} and is used to deduce an + * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * * * @generated */ @Override - public Collection getChildrenFeatures(Object object) { - if (childrenFeatures == null) { - super.getChildrenFeatures(object); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS); - childrenFeatures.add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS); - } - return childrenFeatures; - } + public Collection getChildrenFeatures(final Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK); + childrenFeatures + .add(SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS); + childrenFeatures.add( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS); + } + return childrenFeatures; + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. + protected EStructuralFeature getChildFeature(final Object object, final Object child) { + // Check the type of the specified child object and return the proper feature to + // use for + // adding (see {@link AddCommand}) it as a child. - return super.getChildFeature(object, child); - } + return super.getChildFeature(object, child); + } /** - * This returns SourceCodeDecoratorRepository.gif. - * - * @generated - */ + * This returns SourceCodeDecoratorRepository.gif. + * + * @generated + */ @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceCodeDecoratorRepository")); - } + public Object getImage(final Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceCodeDecoratorRepository")); + } /** - * This returns the label text for the adapted class. + * This returns the label text for the adapted class. + * * * @generated */ @Override - public String getText(Object object) { - return getString("_UI_SourceCodeDecoratorRepository_type"); - } + public String getText(final Object object) { + return getString("_UI_SourceCodeDecoratorRepository_type"); + } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * @generated - */ + * This handles model notifications by calling {@link #updateChildren} to update + * any cached children and by creating a viewer notification, which it passes to + * {@link #fireNotifyChanged}. + * + * @generated + */ @Override - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(SourceCodeDecoratorRepository.class)) { - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS: - case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; - } - super.notifyChanged(notification); - } + public void notifyChanged(final Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(SourceCodeDecoratorRepository.class)) { + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS: + case SourcecodedecoratorPackage.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * @generated - */ + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing + * the children that can be created under this object. + * + * + * @generated + */ @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createFileLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createMethodLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createDataTypeSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createMethodLevelResourceDemandingInternalBehaviorLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createMethodLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createInterfaceSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK, - SourcecodedecoratorFactory.eINSTANCE.createComponentImplementingClassesLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK, - SourcecodedecoratorFactory.eINSTANCE.createPCMSystemImplementatingClassesLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK, - SourcecodedecoratorFactory.eINSTANCE.createDataTypeSourceCodeLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK, - SourcecodedecoratorFactory.eINSTANCE.createAbstractActionClassMethodLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK, - SourcecodedecoratorFactory.eINSTANCE.createMethodLevelResourceDemandingInternalBehaviorLink())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS, - SourcecodedecoratorFactory.eINSTANCE.createSEFF2MethodMapping())); - - newChildDescriptors.add - (createChildParameter - (SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS, - SourcecodedecoratorFactory.eINSTANCE.createSeffElementSourceCodeLink())); - } + protected void collectNewChildDescriptors(final Collection newChildDescriptors, final Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createFileLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createMethodLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createDataTypeSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createMethodLevelResourceDemandingInternalBehaviorLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createMethodLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createControlFlowLevelSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__INTERFACE_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createInterfaceSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK, + SourcecodedecoratorFactory.eINSTANCE.createComponentImplementingClassesLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__COMPONENT_IMPLEMENTING_CLASSES_LINK, + SourcecodedecoratorFactory.eINSTANCE.createPCMSystemImplementatingClassesLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK, + SourcecodedecoratorFactory.eINSTANCE.createDataTypeSourceCodeLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__ABSTRACT_ACTION_CLASS_METHOD_LINK, + SourcecodedecoratorFactory.eINSTANCE.createAbstractActionClassMethodLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK, + SourcecodedecoratorFactory.eINSTANCE.createMethodLevelResourceDemandingInternalBehaviorLink())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF2_METHOD_MAPPINGS, + SourcecodedecoratorFactory.eINSTANCE.createSEFF2MethodMapping())); + + newChildDescriptors.add(createChildParameter( + SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__SEFF_ELEMENTS_SOURCE_CODE_LINKS, + SourcecodedecoratorFactory.eINSTANCE.createSeffElementSourceCodeLink())); + } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. + * This returns the label text for + * {@link org.eclipse.emf.edit.command.CreateChildCommand}. * * @generated */ @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK || - childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK || - childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK || - childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK || - childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } + public String getCreateChildText(final Object owner, final Object feature, final Object child, + final Collection selection) { + final Object childFeature = feature; + final Object childObject = child; + + final boolean qualify = (childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__FILE_LEVEL_SOURCE_CODE_LINK) + || (childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_SOURCE_CODE_LINK) + || (childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__CONTROL_FLOW_LEVEL_SOURCE_CODE_LINK) + || (childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__DATA_TYPE_SOURCE_CODE_LINK) + || (childFeature == SourcecodedecoratorPackage.Literals.SOURCE_CODE_DECORATOR_REPOSITORY__METHOD_LEVEL_RESOURCE_DEMANDING_INTERNAL_BEHAVIOR_LINK); + + if (qualify) { + return getString("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); + } + return super.getCreateChildText(owner, feature, child, selection); + } /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ + * Return the resource locator for this item provider's resources. + * + * @generated + */ @Override public ResourceLocator getResourceLocator() { - return FEditPlugin.INSTANCE; - } + return FEditPlugin.INSTANCE; + } } diff --git a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourcecodedecoratorItemProviderAdapterFactory.java b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourcecodedecoratorItemProviderAdapterFactory.java index 3257562..7ffa326 100755 --- a/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourcecodedecoratorItemProviderAdapterFactory.java +++ b/bundles/org.somox.sourcecodedecorator.edit/src/org/somox/sourcecodedecorator/provider/SourcecodedecoratorItemProviderAdapterFactory.java @@ -22,468 +22,524 @@ import org.somox.sourcecodedecorator.util.SourcecodedecoratorAdapterFactory; /** - * This is the factory that is used to provide the interfaces needed to support Viewers. - * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. - * The adapters also support Eclipse property sheets. - * Note that most of the adapters are shared among multiple instances. - * + * * @generated */ public class SourcecodedecoratorItemProviderAdapterFactory extends SourcecodedecoratorAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this adapter factory. + * This keeps track of the root adapter factory that delegates to this adapter + * factory. * * @generated */ protected ComposedAdapterFactory parentAdapterFactory; /** - * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. + * This is used to implement + * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. * * @generated */ protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** - * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. - * - * @generated - */ - protected Collection supportedTypes = new ArrayList(); + * This keeps track of all the supported types checked by + * {@link #isFactoryForType isFactoryForType}. + * + * @generated + */ + protected Collection supportedTypes = new ArrayList<>(); /** - * This constructs an instance. - * - * @generated - */ + * This constructs an instance. + * + * @generated + */ public SourcecodedecoratorItemProviderAdapterFactory() { - supportedTypes.add(IEditingDomainItemProvider.class); - supportedTypes.add(IStructuredItemContentProvider.class); - supportedTypes.add(ITreeItemContentProvider.class); - supportedTypes.add(IItemLabelProvider.class); - supportedTypes.add(IItemPropertySource.class); - } + supportedTypes.add(IEditingDomainItemProvider.class); + supportedTypes.add(IStructuredItemContentProvider.class); + supportedTypes.add(ITreeItemContentProvider.class); + supportedTypes.add(IItemLabelProvider.class); + supportedTypes.add(IItemPropertySource.class); + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink} instances. - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink} instances. + * + * @generated + */ protected FileLevelSourceCodeLinkItemProvider fileLevelSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.FileLevelSourceCodeLink}. + * + * @generated + */ @Override public Adapter createFileLevelSourceCodeLinkAdapter() { - if (fileLevelSourceCodeLinkItemProvider == null) { - fileLevelSourceCodeLinkItemProvider = new FileLevelSourceCodeLinkItemProvider(this); - } + if (fileLevelSourceCodeLinkItemProvider == null) { + fileLevelSourceCodeLinkItemProvider = new FileLevelSourceCodeLinkItemProvider(this); + } - return fileLevelSourceCodeLinkItemProvider; - } + return fileLevelSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink} instances. + * {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink} instances. + * * * @generated */ protected MethodLevelSourceCodeLinkItemProvider methodLevelSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.MethodLevelSourceCodeLink}. + * + * @generated + */ @Override public Adapter createMethodLevelSourceCodeLinkAdapter() { - if (methodLevelSourceCodeLinkItemProvider == null) { - methodLevelSourceCodeLinkItemProvider = new MethodLevelSourceCodeLinkItemProvider(this); - } + if (methodLevelSourceCodeLinkItemProvider == null) { + methodLevelSourceCodeLinkItemProvider = new MethodLevelSourceCodeLinkItemProvider(this); + } - return methodLevelSourceCodeLinkItemProvider; - } + return methodLevelSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink} instances. + * {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink} + * instances. * * @generated */ protected ControlFlowLevelSourceCodeLinkItemProvider controlFlowLevelSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink}. + * + * @generated + */ @Override public Adapter createControlFlowLevelSourceCodeLinkAdapter() { - if (controlFlowLevelSourceCodeLinkItemProvider == null) { - controlFlowLevelSourceCodeLinkItemProvider = new ControlFlowLevelSourceCodeLinkItemProvider(this); - } + if (controlFlowLevelSourceCodeLinkItemProvider == null) { + controlFlowLevelSourceCodeLinkItemProvider = new ControlFlowLevelSourceCodeLinkItemProvider(this); + } - return controlFlowLevelSourceCodeLinkItemProvider; - } + return controlFlowLevelSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository} instances. + * {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository} + * instances. * * @generated */ protected SourceCodeDecoratorRepositoryItemProvider sourceCodeDecoratorRepositoryItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.SourceCodeDecoratorRepository}. + * + * @generated + */ @Override public Adapter createSourceCodeDecoratorRepositoryAdapter() { - if (sourceCodeDecoratorRepositoryItemProvider == null) { - sourceCodeDecoratorRepositoryItemProvider = new SourceCodeDecoratorRepositoryItemProvider(this); - } + if (sourceCodeDecoratorRepositoryItemProvider == null) { + sourceCodeDecoratorRepositoryItemProvider = new SourceCodeDecoratorRepositoryItemProvider(this); + } - return sourceCodeDecoratorRepositoryItemProvider; - } + return sourceCodeDecoratorRepositoryItemProvider; + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink} instances. - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink} instances. + * + * @generated + */ protected InterfaceSourceCodeLinkItemProvider interfaceSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.InterfaceSourceCodeLink}. + * + * @generated + */ @Override public Adapter createInterfaceSourceCodeLinkAdapter() { - if (interfaceSourceCodeLinkItemProvider == null) { - interfaceSourceCodeLinkItemProvider = new InterfaceSourceCodeLinkItemProvider(this); - } + if (interfaceSourceCodeLinkItemProvider == null) { + interfaceSourceCodeLinkItemProvider = new InterfaceSourceCodeLinkItemProvider(this); + } - return interfaceSourceCodeLinkItemProvider; - } + return interfaceSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink} instances. + * {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink} + * instances. * * @generated */ protected ComponentImplementingClassesLinkItemProvider componentImplementingClassesLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.ComponentImplementingClassesLink}. + * + * @generated + */ @Override public Adapter createComponentImplementingClassesLinkAdapter() { - if (componentImplementingClassesLinkItemProvider == null) { - componentImplementingClassesLinkItemProvider = new ComponentImplementingClassesLinkItemProvider(this); - } + if (componentImplementingClassesLinkItemProvider == null) { + componentImplementingClassesLinkItemProvider = new ComponentImplementingClassesLinkItemProvider(this); + } - return componentImplementingClassesLinkItemProvider; - } + return componentImplementingClassesLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink} instances. + * {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink} + * instances. * * @generated */ protected PCMSystemImplementatingClassesLinkItemProvider pcmSystemImplementatingClassesLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.PCMSystemImplementatingClassesLink}. + * + * + * @generated + */ @Override public Adapter createPCMSystemImplementatingClassesLinkAdapter() { - if (pcmSystemImplementatingClassesLinkItemProvider == null) { - pcmSystemImplementatingClassesLinkItemProvider = new PCMSystemImplementatingClassesLinkItemProvider(this); - } + if (pcmSystemImplementatingClassesLinkItemProvider == null) { + pcmSystemImplementatingClassesLinkItemProvider = new PCMSystemImplementatingClassesLinkItemProvider(this); + } - return pcmSystemImplementatingClassesLinkItemProvider; - } + return pcmSystemImplementatingClassesLinkItemProvider; + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink} instances. - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink} instances. + * + * @generated + */ protected DataTypeSourceCodeLinkItemProvider dataTypeSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink}. - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.DataTypeSourceCodeLink}. + * + * @generated + */ @Override public Adapter createDataTypeSourceCodeLinkAdapter() { - if (dataTypeSourceCodeLinkItemProvider == null) { - dataTypeSourceCodeLinkItemProvider = new DataTypeSourceCodeLinkItemProvider(this); - } + if (dataTypeSourceCodeLinkItemProvider == null) { + dataTypeSourceCodeLinkItemProvider = new DataTypeSourceCodeLinkItemProvider(this); + } - return dataTypeSourceCodeLinkItemProvider; - } + return dataTypeSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink} instances. + * {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink} instances. + * * * @generated */ protected InnerDatatypeSourceCodeLinkItemProvider innerDatatypeSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink}. + * + * @generated + */ @Override public Adapter createInnerDatatypeSourceCodeLinkAdapter() { - if (innerDatatypeSourceCodeLinkItemProvider == null) { - innerDatatypeSourceCodeLinkItemProvider = new InnerDatatypeSourceCodeLinkItemProvider(this); - } + if (innerDatatypeSourceCodeLinkItemProvider == null) { + innerDatatypeSourceCodeLinkItemProvider = new InnerDatatypeSourceCodeLinkItemProvider(this); + } - return innerDatatypeSourceCodeLinkItemProvider; - } + return innerDatatypeSourceCodeLinkItemProvider; + } /** * This keeps track of the one adapter used for all - * {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink} instances. + * {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink} + * instances. * * @generated */ protected AbstractActionClassMethodLinkItemProvider abstractActionClassMethodLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.AbstractActionClassMethodLink}. + * + * @generated + */ @Override public Adapter createAbstractActionClassMethodLinkAdapter() { - if (abstractActionClassMethodLinkItemProvider == null) { - abstractActionClassMethodLinkItemProvider = new AbstractActionClassMethodLinkItemProvider(this); - } + if (abstractActionClassMethodLinkItemProvider == null) { + abstractActionClassMethodLinkItemProvider = new AbstractActionClassMethodLinkItemProvider(this); + } - return abstractActionClassMethodLinkItemProvider; - } + return abstractActionClassMethodLinkItemProvider; + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink} instances. - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink} + * instances. + * + * @generated + */ protected MethodLevelResourceDemandingInternalBehaviorLinkItemProvider methodLevelResourceDemandingInternalBehaviorLinkItemProvider; /** * This creates an adapter for a - * {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink}. + * {@link org.somox.sourcecodedecorator.MethodLevelResourceDemandingInternalBehaviorLink}. + * * * @generated */ @Override public Adapter createMethodLevelResourceDemandingInternalBehaviorLinkAdapter() { - if (methodLevelResourceDemandingInternalBehaviorLinkItemProvider == null) { - methodLevelResourceDemandingInternalBehaviorLinkItemProvider = new MethodLevelResourceDemandingInternalBehaviorLinkItemProvider(this); - } + if (methodLevelResourceDemandingInternalBehaviorLinkItemProvider == null) { + methodLevelResourceDemandingInternalBehaviorLinkItemProvider = new MethodLevelResourceDemandingInternalBehaviorLinkItemProvider( + this); + } - return methodLevelResourceDemandingInternalBehaviorLinkItemProvider; - } + return methodLevelResourceDemandingInternalBehaviorLinkItemProvider; + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.SEFF2MethodMapping} instances. - * - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.SEFF2MethodMapping} instances. + * + * @generated + */ protected SEFF2MethodMappingItemProvider seff2MethodMappingItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.SEFF2MethodMapping}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.SEFF2MethodMapping}. + * + * @generated + */ @Override public Adapter createSEFF2MethodMappingAdapter() { - if (seff2MethodMappingItemProvider == null) { - seff2MethodMappingItemProvider = new SEFF2MethodMappingItemProvider(this); - } + if (seff2MethodMappingItemProvider == null) { + seff2MethodMappingItemProvider = new SEFF2MethodMappingItemProvider(this); + } - return seff2MethodMappingItemProvider; - } + return seff2MethodMappingItemProvider; + } /** - * This keeps track of the one adapter used for all {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink} instances. - * - * - * @generated - */ + * This keeps track of the one adapter used for all + * {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink} instances. + * + * + * @generated + */ protected SeffElementSourceCodeLinkItemProvider seffElementSourceCodeLinkItemProvider; /** - * This creates an adapter for a {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink}. - * - * - * @generated - */ + * This creates an adapter for a + * {@link org.somox.sourcecodedecorator.SeffElementSourceCodeLink}. + * + * @generated + */ @Override public Adapter createSeffElementSourceCodeLinkAdapter() { - if (seffElementSourceCodeLinkItemProvider == null) { - seffElementSourceCodeLinkItemProvider = new SeffElementSourceCodeLinkItemProvider(this); - } + if (seffElementSourceCodeLinkItemProvider == null) { + seffElementSourceCodeLinkItemProvider = new SeffElementSourceCodeLinkItemProvider(this); + } - return seffElementSourceCodeLinkItemProvider; - } + return seffElementSourceCodeLinkItemProvider; + } /** - * This returns the root adapter factory that contains this factory. - * - * - * @generated - */ + * This returns the root adapter factory that contains this factory. + * + * @generated + */ @Override public ComposeableAdapterFactory getRootAdapterFactory() { - return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); - } + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); + } /** - * This sets the composed adapter factory that contains this factory. - * - * - * @generated - */ + * This sets the composed adapter factory that contains this factory. + * + * @generated + */ @Override - public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { - this.parentAdapterFactory = parentAdapterFactory; - } + public void setParentAdapterFactory(final ComposedAdapterFactory parentAdapterFactory) { + this.parentAdapterFactory = parentAdapterFactory; + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public boolean isFactoryForType(Object type) { - return supportedTypes.contains(type) || super.isFactoryForType(type); - } + public boolean isFactoryForType(final Object type) { + return supportedTypes.contains(type) || super.isFactoryForType(type); + } /** - * This implementation substitutes the factory itself as the key for the adapter. + * This implementation substitutes the factory itself as the key for the + * adapter. * * @generated */ @Override - public Adapter adapt(Notifier notifier, Object type) { - return super.adapt(notifier, this); - } + public Adapter adapt(final Notifier notifier, final Object type) { + return super.adapt(notifier, this); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) { - Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) { - return adapter; - } - } - - return null; - } - - /** - * This adds a listener. - * - * @generated - */ + public Object adapt(final Object object, final Object type) { + if (isFactoryForType(type)) { + final Object adapter = super.adapt(object, type); + if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) { + return adapter; + } + } + + return null; + } + + /** + * This adds a listener. + * + * @generated + */ @Override - public void addListener(INotifyChangedListener notifyChangedListener) { - changeNotifier.addListener(notifyChangedListener); - } + public void addListener(final INotifyChangedListener notifyChangedListener) { + changeNotifier.addListener(notifyChangedListener); + } /** - * This removes a listener. - * - * @generated - */ + * This removes a listener. + * + * @generated + */ @Override - public void removeListener(INotifyChangedListener notifyChangedListener) { - changeNotifier.removeListener(notifyChangedListener); - } + public void removeListener(final INotifyChangedListener notifyChangedListener) { + changeNotifier.removeListener(notifyChangedListener); + } /** - * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. + * This delegates to {@link #changeNotifier} and to + * {@link #parentAdapterFactory}. * * @generated */ @Override - public void fireNotifyChanged(Notification notification) { - changeNotifier.fireNotifyChanged(notification); + public void fireNotifyChanged(final Notification notification) { + changeNotifier.fireNotifyChanged(notification); - if (parentAdapterFactory != null) { - parentAdapterFactory.fireNotifyChanged(notification); - } - } + if (parentAdapterFactory != null) { + parentAdapterFactory.fireNotifyChanged(notification); + } + } /** - * This disposes all of the item providers created by this factory. - * - * @generated - */ + * This disposes all of the item providers created by this factory. + * + * @generated + */ @Override public void dispose() { - if (fileLevelSourceCodeLinkItemProvider != null) fileLevelSourceCodeLinkItemProvider.dispose(); - if (methodLevelSourceCodeLinkItemProvider != null) methodLevelSourceCodeLinkItemProvider.dispose(); - if (controlFlowLevelSourceCodeLinkItemProvider != null) controlFlowLevelSourceCodeLinkItemProvider.dispose(); - if (sourceCodeDecoratorRepositoryItemProvider != null) sourceCodeDecoratorRepositoryItemProvider.dispose(); - if (interfaceSourceCodeLinkItemProvider != null) interfaceSourceCodeLinkItemProvider.dispose(); - if (componentImplementingClassesLinkItemProvider != null) componentImplementingClassesLinkItemProvider.dispose(); - if (pcmSystemImplementatingClassesLinkItemProvider != null) pcmSystemImplementatingClassesLinkItemProvider.dispose(); - if (dataTypeSourceCodeLinkItemProvider != null) dataTypeSourceCodeLinkItemProvider.dispose(); - if (innerDatatypeSourceCodeLinkItemProvider != null) innerDatatypeSourceCodeLinkItemProvider.dispose(); - if (abstractActionClassMethodLinkItemProvider != null) abstractActionClassMethodLinkItemProvider.dispose(); - if (methodLevelResourceDemandingInternalBehaviorLinkItemProvider != null) methodLevelResourceDemandingInternalBehaviorLinkItemProvider.dispose(); - if (seff2MethodMappingItemProvider != null) seff2MethodMappingItemProvider.dispose(); - if (seffElementSourceCodeLinkItemProvider != null) seffElementSourceCodeLinkItemProvider.dispose(); - } + if (fileLevelSourceCodeLinkItemProvider != null) { + fileLevelSourceCodeLinkItemProvider.dispose(); + } + if (methodLevelSourceCodeLinkItemProvider != null) { + methodLevelSourceCodeLinkItemProvider.dispose(); + } + if (controlFlowLevelSourceCodeLinkItemProvider != null) { + controlFlowLevelSourceCodeLinkItemProvider.dispose(); + } + if (sourceCodeDecoratorRepositoryItemProvider != null) { + sourceCodeDecoratorRepositoryItemProvider.dispose(); + } + if (interfaceSourceCodeLinkItemProvider != null) { + interfaceSourceCodeLinkItemProvider.dispose(); + } + if (componentImplementingClassesLinkItemProvider != null) { + componentImplementingClassesLinkItemProvider.dispose(); + } + if (pcmSystemImplementatingClassesLinkItemProvider != null) { + pcmSystemImplementatingClassesLinkItemProvider.dispose(); + } + if (dataTypeSourceCodeLinkItemProvider != null) { + dataTypeSourceCodeLinkItemProvider.dispose(); + } + if (innerDatatypeSourceCodeLinkItemProvider != null) { + innerDatatypeSourceCodeLinkItemProvider.dispose(); + } + if (abstractActionClassMethodLinkItemProvider != null) { + abstractActionClassMethodLinkItemProvider.dispose(); + } + if (methodLevelResourceDemandingInternalBehaviorLinkItemProvider != null) { + methodLevelResourceDemandingInternalBehaviorLinkItemProvider.dispose(); + } + if (seff2MethodMappingItemProvider != null) { + seff2MethodMappingItemProvider.dispose(); + } + if (seffElementSourceCodeLinkItemProvider != null) { + seffElementSourceCodeLinkItemProvider.dispose(); + } + } } diff --git a/bundles/org.somox.sourcecodedecorator.editor/META-INF/MANIFEST.MF b/bundles/org.somox.sourcecodedecorator.editor/META-INF/MANIFEST.MF index 2bfa3f9..77db468 100755 --- a/bundles/org.somox.sourcecodedecorator.editor/META-INF/MANIFEST.MF +++ b/bundles/org.somox.sourcecodedecorator.editor/META-INF/MANIFEST.MF @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit.ui, org.eclipse.ui.ide, de.uka.ipd.sdq.identifier.edit, - org.emftext.language.java.edit, org.palladiosimulator.pcm.edit, de.uka.ipd.sdq.probfunction.edit, de.uka.ipd.sdq.stoex.edit, - de.uka.ipd.sdq.units.edit + de.uka.ipd.sdq.units.edit, + tools.mdsd.jamopp.model.java.editor Bundle-ActivationPolicy: lazy diff --git a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/FEditorPlugin.java b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/FEditorPlugin.java index a984b3e..bd38ffe 100755 --- a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/FEditorPlugin.java +++ b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/FEditorPlugin.java @@ -5,94 +5,86 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.ui.EclipseUIPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.emftext.language.java.annotations.provider.JavaEditPlugin; import org.palladiosimulator.pcm.core.provider.PalladioComponentModelEditPlugin; import de.uka.ipd.sdq.identifier.provider.IdentifierEditPlugin; import de.uka.ipd.sdq.probfunction.provider.ProbabilityFunctionEditPlugin; import de.uka.ipd.sdq.stoex.provider.StoexEditPlugin; import de.uka.ipd.sdq.units.provider.UnitsEditPlugin; +import tools.mdsd.jamopp.model.java.annotations.provider.JavaEditPlugin; /** - * This is the central singleton for the F editor plugin. + * This is the central singleton for the F editor plugin. * * @generated */ public final class FEditorPlugin extends EMFPlugin { /** - * Keep track of the singleton. - * - * @generated - */ + * Keep track of the singleton. + * + * @generated + */ public static final FEditorPlugin INSTANCE = new FEditorPlugin(); /** - * Keep track of the singleton. - * - * @generated - */ + * Keep track of the singleton. + * + * @generated + */ private static Implementation plugin; /** - * Create the instance. - * - * @generated - */ + * Create the instance. + * + * @generated + */ public FEditorPlugin() { - super - (new ResourceLocator [] { - IdentifierEditPlugin.INSTANCE, - JavaEditPlugin.INSTANCE, - PalladioComponentModelEditPlugin.INSTANCE, - ProbabilityFunctionEditPlugin.INSTANCE, - StoexEditPlugin.INSTANCE, - UnitsEditPlugin.INSTANCE, - }); - } + super(new ResourceLocator[] { IdentifierEditPlugin.INSTANCE, JavaEditPlugin.INSTANCE, + PalladioComponentModelEditPlugin.INSTANCE, ProbabilityFunctionEditPlugin.INSTANCE, + StoexEditPlugin.INSTANCE, UnitsEditPlugin.INSTANCE, }); + } /** - * Returns the singleton instance of the Eclipse plugin. - * - * @return the singleton instance. - * @generated - */ + * Returns the singleton instance of the Eclipse plugin. + * + * + * @return the singleton instance. + * @generated + */ @Override public ResourceLocator getPluginResourceLocator() { - return plugin; - } + return plugin; + } /** - * Returns the singleton instance of the Eclipse plugin. - * - * @return the singleton instance. - * @generated - */ + * Returns the singleton instance of the Eclipse plugin. + * + * + * @return the singleton instance. + * @generated + */ public static Implementation getPlugin() { - return plugin; - } + return plugin; + } /** - * The actual implementation of the Eclipse Plugin. - * - * @generated - */ + * The actual implementation of the Eclipse Plugin. + * + * @generated + */ public static class Implementation extends EclipseUIPlugin { /** - * Creates an instance. - * - * @generated - */ + * Creates an instance. + * + * @generated + */ public Implementation() { - super(); - - // Remember the static instance. - // - plugin = this; - } + // Remember the static instance. + // + plugin = this; + } } } diff --git a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorActionBarContributor.java b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorActionBarContributor.java index 86abc34..69c9a72 100755 --- a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorActionBarContributor.java +++ b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorActionBarContributor.java @@ -19,7 +19,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IContributionManager; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; @@ -36,374 +35,386 @@ /** * This is the action bar contributor for the Sourcecodedecorator model editor. - * + * + * * @generated */ public class SourcecodedecoratorActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener { /** - * This keeps track of the active editor. - * - * @generated - */ + * This keeps track of the active editor. + * + * @generated + */ protected IEditorPart activeEditorPart; /** - * This keeps track of the current selection provider. + * This keeps track of the current selection provider. + * * * @generated */ protected ISelectionProvider selectionProvider; /** - * This action opens the Properties view. - * - * @generated - */ - protected IAction showPropertiesViewAction = new Action(FEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { - @Override - public void run() { - try { - getPage().showView("org.eclipse.ui.views.PropertySheet"); - } - catch (PartInitException exception) { - FEditorPlugin.INSTANCE.log(exception); - } - } - }; - - /** - * This action refreshes the viewer of the current editor if the editor - * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. - * - * @generated - */ - protected IAction refreshViewerAction = new Action(FEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { - @Override - public boolean isEnabled() { - return activeEditorPart instanceof IViewerProvider; - } - - @Override - public void run() { - if (activeEditorPart instanceof IViewerProvider) { - Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer(); - if (viewer != null) { - viewer.refresh(); - } - } - } - }; + * + * @generated + */ + protected IAction showPropertiesViewAction = new Action( + FEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { + @Override + public void run() { + try { + getPage().showView("org.eclipse.ui.views.PropertySheet"); + } catch (final PartInitException exception) { + FEditorPlugin.INSTANCE.log(exception); + } + } + }; /** - * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding - * to each descriptor generated for the current selection by the item provider. * * @generated */ + protected IAction refreshViewerAction = new Action( + FEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { + @Override + public boolean isEnabled() { + return activeEditorPart instanceof IViewerProvider; + } + + @Override + public void run() { + if (activeEditorPart instanceof IViewerProvider) { + final Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer(); + if (viewer != null) { + viewer.refresh(); + } + } + } + }; + + /** + * This will contain one + * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to + * each descriptor generated for the current selection by the item provider. + * + * + * @generated + */ protected Collection createChildActions; /** - * This is the menu manager into which menu contribution items should be added for CreateChild actions. - * - * @generated - */ + * This is the menu manager into which menu contribution items should be added + * for CreateChild actions. + * + * @generated + */ protected IMenuManager createChildMenuManager; /** - * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor - * generated for the current selection by the item provider. - * - * @generated - */ + * This will contain one + * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to + * each descriptor generated for the current selection by the item provider. + * + * + * @generated + */ protected Collection createSiblingActions; /** - * This is the menu manager into which menu contribution items should be added for CreateSibling actions. - * - * @generated - */ + * This is the menu manager into which menu contribution items should be added + * for CreateSibling actions. + * + * @generated + */ protected IMenuManager createSiblingMenuManager; /** - * This creates an instance of the contributor. - * - * @generated - */ + * This creates an instance of the contributor. + * + * @generated + */ public SourcecodedecoratorActionBarContributor() { - super(ADDITIONS_LAST_STYLE); - loadResourceAction = new LoadResourceAction(); - validateAction = new ValidateAction(); - controlAction = new ControlAction(); - } + super(ADDITIONS_LAST_STYLE); + loadResourceAction = new LoadResourceAction(); + validateAction = new ValidateAction(); + controlAction = new ControlAction(); + } /** - * This adds Separators for editor additions to the tool bar. - * - * @generated - */ + * This adds Separators for editor additions to the tool bar. + * + * @generated + */ @Override - public void contributeToToolBar(IToolBarManager toolBarManager) { - super.contributeToToolBar(toolBarManager); - toolBarManager.add(new Separator("sourcecodedecorator-settings")); - toolBarManager.add(new Separator("sourcecodedecorator-additions")); - } + public void contributeToToolBar(final IToolBarManager toolBarManager) { + super.contributeToToolBar(toolBarManager); + toolBarManager.add(new Separator("sourcecodedecorator-settings")); + toolBarManager.add(new Separator("sourcecodedecorator-additions")); + } /** - * This adds to the menu bar a menu and some separators for editor additions, - * as well as the sub-menus for object creation items. - * - * @generated - */ + * This adds to the menu bar a menu and some separators for editor additions, as + * well as the sub-menus for object creation items. + * + * @generated + */ @Override - public void contributeToMenu(IMenuManager menuManager) { - super.contributeToMenu(menuManager); - - IMenuManager submenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditor_menu"), "org.somox.sourcecodedecoratorMenuID"); - menuManager.insertAfter("additions", submenuManager); - submenuManager.add(new Separator("settings")); - submenuManager.add(new Separator("actions")); - submenuManager.add(new Separator("additions")); - submenuManager.add(new Separator("additions-end")); - - // Prepare for CreateChild item addition or removal. - // - createChildMenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - submenuManager.insertBefore("additions", createChildMenuManager); - - // Prepare for CreateSibling item addition or removal. - // - createSiblingMenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); - submenuManager.insertBefore("additions", createSiblingMenuManager); - - // Force an update because Eclipse hides empty menus now. - // - submenuManager.addMenuListener - (new IMenuListener() { - @Override - public void menuAboutToShow(IMenuManager menuManager) { - menuManager.updateAll(true); - } - }); - - addGlobalActions(submenuManager); - } + public void contributeToMenu(final IMenuManager menuManager) { + super.contributeToMenu(menuManager); + + final IMenuManager submenuManager = new MenuManager( + FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditor_menu"), + "org.somox.sourcecodedecoratorMenuID"); + menuManager.insertAfter("additions", submenuManager); + submenuManager.add(new Separator("settings")); + submenuManager.add(new Separator("actions")); + submenuManager.add(new Separator("additions")); + submenuManager.add(new Separator("additions-end")); + + // Prepare for CreateChild item addition or removal. + // + createChildMenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); + submenuManager.insertBefore("additions", createChildMenuManager); + + // Prepare for CreateSibling item addition or removal. + // + createSiblingMenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); + submenuManager.insertBefore("additions", createSiblingMenuManager); + + // Force an update because Eclipse hides empty menus now. + // + submenuManager.addMenuListener(menuManager1 -> menuManager1.updateAll(true)); + + addGlobalActions(submenuManager); + } /** - * When the active editor changes, this remembers the change and registers with it as a selection provider. - * - * @generated - */ + * When the active editor changes, this remembers the change and registers with + * it as a selection provider. + * + * @generated + */ @Override - public void setActiveEditor(IEditorPart part) { - super.setActiveEditor(part); - activeEditorPart = part; - - // Switch to the new selection provider. - // - if (selectionProvider != null) { - selectionProvider.removeSelectionChangedListener(this); - } - if (part == null) { - selectionProvider = null; - } - else { - selectionProvider = part.getSite().getSelectionProvider(); - selectionProvider.addSelectionChangedListener(this); - - // Fake a selection changed event to update the menus. - // - if (selectionProvider.getSelection() != null) { - selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection())); - } - } - } + public void setActiveEditor(final IEditorPart part) { + super.setActiveEditor(part); + activeEditorPart = part; + + // Switch to the new selection provider. + // + if (selectionProvider != null) { + selectionProvider.removeSelectionChangedListener(this); + } + if (part == null) { + selectionProvider = null; + } else { + selectionProvider = part.getSite().getSelectionProvider(); + selectionProvider.addSelectionChangedListener(this); + + // Fake a selection changed event to update the menus. + // + if (selectionProvider.getSelection() != null) { + selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection())); + } + } + } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling - * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and - * siblings that can be added to the selected object and updating the menus accordingly. + * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, + * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying + * for the children and siblings that can be added to the selected object and + * updating the menus accordingly. * * @generated */ @Override - public void selectionChanged(SelectionChangedEvent event) { - // Remove any menu items for old selection. - // - if (createChildMenuManager != null) { - depopulateManager(createChildMenuManager, createChildActions); - } - if (createSiblingMenuManager != null) { - depopulateManager(createSiblingMenuManager, createSiblingActions); - } - - // Query the new selection for appropriate new child/sibling descriptors - // - Collection newChildDescriptors = null; - Collection newSiblingDescriptors = null; - - ISelection selection = event.getSelection(); - if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) { - Object object = ((IStructuredSelection)selection).getFirstElement(); - - EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain(); - - newChildDescriptors = domain.getNewChildDescriptors(object, null); - newSiblingDescriptors = domain.getNewChildDescriptors(null, object); - } - - // Generate actions for selection; populate and redraw the menus. - // - createChildActions = generateCreateChildActions(newChildDescriptors, selection); - createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection); - - if (createChildMenuManager != null) { - populateManager(createChildMenuManager, createChildActions, null); - createChildMenuManager.update(true); - } - if (createSiblingMenuManager != null) { - populateManager(createSiblingMenuManager, createSiblingActions, null); - createSiblingMenuManager.update(true); - } - } + public void selectionChanged(final SelectionChangedEvent event) { + // Remove any menu items for old selection. + // + if (createChildMenuManager != null) { + depopulateManager(createChildMenuManager, createChildActions); + } + if (createSiblingMenuManager != null) { + depopulateManager(createSiblingMenuManager, createSiblingActions); + } + + // Query the new selection for appropriate new child/sibling descriptors + // + Collection newChildDescriptors = null; + Collection newSiblingDescriptors = null; + + final ISelection selection = event.getSelection(); + if ((selection instanceof IStructuredSelection) && (((IStructuredSelection) selection).size() == 1)) { + final Object object = ((IStructuredSelection) selection).getFirstElement(); + + final EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain(); + + newChildDescriptors = domain.getNewChildDescriptors(object, null); + newSiblingDescriptors = domain.getNewChildDescriptors(null, object); + } + + // Generate actions for selection; populate and redraw the menus. + // + createChildActions = generateCreateChildActions(newChildDescriptors, selection); + createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection); + + if (createChildMenuManager != null) { + populateManager(createChildMenuManager, createChildActions, null); + createChildMenuManager.update(true); + } + if (createSiblingMenuManager != null) { + populateManager(createSiblingMenuManager, createSiblingActions, null); + createSiblingMenuManager.update(true); + } + } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in descriptors, - * and returns the collection of these actions. - * - * @generated - */ - protected Collection generateCreateChildActions(Collection descriptors, ISelection selection) { - Collection actions = new ArrayList(); - if (descriptors != null) { - for (Object descriptor : descriptors) { - actions.add(new CreateChildAction(activeEditorPart, selection, descriptor)); - } - } - return actions; - } + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for + * each object in descriptors, and returns the collection of these + * actions. + * + * @generated + */ + protected Collection generateCreateChildActions(final Collection descriptors, + final ISelection selection) { + final Collection actions = new ArrayList<>(); + if (descriptors != null) { + for (final Object descriptor : descriptors) { + actions.add(new CreateChildAction(activeEditorPart, selection, descriptor)); + } + } + return actions; + } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in descriptors, - * and returns the collection of these actions. - * - * @generated - */ - protected Collection generateCreateSiblingActions(Collection descriptors, ISelection selection) { - Collection actions = new ArrayList(); - if (descriptors != null) { - for (Object descriptor : descriptors) { - actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor)); - } - } - return actions; - } + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} + * for each object in descriptors, and returns the collection of + * these actions. + * + * @generated + */ + protected Collection generateCreateSiblingActions(final Collection descriptors, + final ISelection selection) { + final Collection actions = new ArrayList<>(); + if (descriptors != null) { + for (final Object descriptor : descriptors) { + actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor)); + } + } + return actions; + } /** - * This populates the specified manager with {@link org.eclipse.jface.action.ActionContributionItem}s - * based on the {@link org.eclipse.jface.action.IAction}s contained in the actions collection, - * by inserting them before the specified contribution item contributionID. - * If contributionID is null, they are simply added. - * - * @generated - */ - protected void populateManager(IContributionManager manager, Collection actions, String contributionID) { - if (actions != null) { - for (IAction action : actions) { - if (contributionID != null) { - manager.insertBefore(contributionID, action); - } - else { - manager.add(action); - } - } - } - } + * This populates the specified manager with + * {@link org.eclipse.jface.action.ActionContributionItem}s based on the + * {@link org.eclipse.jface.action.IAction}s contained in the + * actions collection, by inserting them before the specified + * contribution item contributionID. If contributionID + * is null, they are simply added. + * + * @generated + */ + protected void populateManager(final IContributionManager manager, final Collection actions, + final String contributionID) { + if (actions != null) { + for (final IAction action : actions) { + if (contributionID != null) { + manager.insertBefore(contributionID, action); + } else { + manager.add(action); + } + } + } + } /** - * This removes from the specified manager all {@link org.eclipse.jface.action.ActionContributionItem}s - * based on the {@link org.eclipse.jface.action.IAction}s contained in the actions collection. - * - * @generated - */ - protected void depopulateManager(IContributionManager manager, Collection actions) { - if (actions != null) { - IContributionItem[] items = manager.getItems(); - for (int i = 0; i < items.length; i++) { - // Look into SubContributionItems - // - IContributionItem contributionItem = items[i]; - while (contributionItem instanceof SubContributionItem) { - contributionItem = ((SubContributionItem)contributionItem).getInnerItem(); - } - - // Delete the ActionContributionItems with matching action. - // - if (contributionItem instanceof ActionContributionItem) { - IAction action = ((ActionContributionItem)contributionItem).getAction(); - if (actions.contains(action)) { - manager.remove(contributionItem); - } - } - } - } - } + * This removes from the specified manager all + * {@link org.eclipse.jface.action.ActionContributionItem}s based on the + * {@link org.eclipse.jface.action.IAction}s contained in the + * actions collection. + * + * @generated + */ + protected void depopulateManager(final IContributionManager manager, final Collection actions) { + if (actions != null) { + final IContributionItem[] items = manager.getItems(); + for (final IContributionItem item : items) { + // Look into SubContributionItems + // + IContributionItem contributionItem = item; + while (contributionItem instanceof SubContributionItem) { + contributionItem = ((SubContributionItem) contributionItem).getInnerItem(); + } + + // Delete the ActionContributionItems with matching action. + // + if (contributionItem instanceof ActionContributionItem) { + final IAction action = ((ActionContributionItem) contributionItem).getAction(); + if (actions.contains(action)) { + manager.remove(contributionItem); + } + } + } + } + } /** - * This populates the pop-up menu before it appears. + * This populates the pop-up menu before it appears. + * * * @generated */ @Override - public void menuAboutToShow(IMenuManager menuManager) { - super.menuAboutToShow(menuManager); - MenuManager submenuManager = null; + public void menuAboutToShow(final IMenuManager menuManager) { + super.menuAboutToShow(menuManager); + MenuManager submenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - submenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); - populateManager(submenuManager, createChildActions, null); - menuManager.insertBefore("edit", submenuManager); + populateManager(submenuManager, createChildActions, null); + menuManager.insertBefore("edit", submenuManager); - submenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); - populateManager(submenuManager, createSiblingActions, null); - menuManager.insertBefore("edit", submenuManager); - } + submenuManager = new MenuManager(FEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); + populateManager(submenuManager, createSiblingActions, null); + menuManager.insertBefore("edit", submenuManager); + } /** - * This inserts global actions before the "additions-end" separator. - * - * - * @generated - */ + * This inserts global actions before the "additions-end" separator. + * + * @generated + */ @Override - protected void addGlobalActions(IMenuManager menuManager) { - menuManager.insertAfter("additions-end", new Separator("ui-actions")); - menuManager.insertAfter("ui-actions", showPropertiesViewAction); + protected void addGlobalActions(final IMenuManager menuManager) { + menuManager.insertAfter("additions-end", new Separator("ui-actions")); + menuManager.insertAfter("ui-actions", showPropertiesViewAction); - refreshViewerAction.setEnabled(refreshViewerAction.isEnabled()); - menuManager.insertAfter("ui-actions", refreshViewerAction); + refreshViewerAction.setEnabled(refreshViewerAction.isEnabled()); + menuManager.insertAfter("ui-actions", refreshViewerAction); - super.addGlobalActions(menuManager); - } + super.addGlobalActions(menuManager); + } /** - * This ensures that a delete action will clean up all references to deleted objects. + * This ensures that a delete action will clean up all references to deleted + * objects. * * @generated */ @Override protected boolean removeAllReferencesOnDelete() { - return true; - } + return true; + } } diff --git a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorEditor.java b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorEditor.java index c1008ab..ef0babf 100755 --- a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorEditor.java +++ b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorEditor.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.EventObject; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -29,7 +28,6 @@ import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; -import org.eclipse.emf.common.command.CommandStackListener; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.ui.MarkerHelper; @@ -117,26 +115,6 @@ import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.PropertySheet; import org.eclipse.ui.views.properties.PropertySheetPage; -import org.emftext.commons.layout.provider.LayoutItemProviderAdapterFactory; -import org.emftext.language.java.annotations.provider.AnnotationsItemProviderAdapterFactory; -import org.emftext.language.java.arrays.provider.ArraysItemProviderAdapterFactory; -import org.emftext.language.java.classifiers.provider.ClassifiersItemProviderAdapterFactory; -import org.emftext.language.java.commons.provider.CommonsItemProviderAdapterFactory; -import org.emftext.language.java.containers.provider.ContainersItemProviderAdapterFactory; -import org.emftext.language.java.expressions.provider.ExpressionsItemProviderAdapterFactory; -import org.emftext.language.java.generics.provider.GenericsItemProviderAdapterFactory; -import org.emftext.language.java.imports.provider.ImportsItemProviderAdapterFactory; -import org.emftext.language.java.instantiations.provider.InstantiationsItemProviderAdapterFactory; -import org.emftext.language.java.literals.provider.LiteralsItemProviderAdapterFactory; -import org.emftext.language.java.members.provider.MembersItemProviderAdapterFactory; -import org.emftext.language.java.modifiers.provider.ModifiersItemProviderAdapterFactory; -import org.emftext.language.java.modules.provider.ModulesItemProviderAdapterFactory; -import org.emftext.language.java.operators.provider.OperatorsItemProviderAdapterFactory; -import org.emftext.language.java.parameters.provider.ParametersItemProviderAdapterFactory; -import org.emftext.language.java.references.provider.ReferencesItemProviderAdapterFactory; -import org.emftext.language.java.statements.provider.StatementsItemProviderAdapterFactory; -import org.emftext.language.java.types.provider.TypesItemProviderAdapterFactory; -import org.emftext.language.java.variables.provider.VariablesItemProviderAdapterFactory; import org.palladiosimulator.pcm.allocation.provider.AllocationItemProviderAdapterFactory; import org.palladiosimulator.pcm.core.composition.provider.CompositionItemProviderAdapterFactory; import org.palladiosimulator.pcm.core.entity.provider.EntityItemProviderAdapterFactory; @@ -163,1687 +141,1669 @@ import de.uka.ipd.sdq.probfunction.provider.ProbfunctionItemProviderAdapterFactory; import de.uka.ipd.sdq.stoex.provider.StoexItemProviderAdapterFactory; import de.uka.ipd.sdq.units.provider.UnitsItemProviderAdapterFactory; +import tools.mdsd.jamopp.commons.layout.provider.LayoutItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.annotations.provider.AnnotationsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.arrays.provider.ArraysItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.classifiers.provider.ClassifiersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.commons.provider.CommonsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.containers.provider.ContainersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.expressions.provider.ExpressionsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.generics.provider.GenericsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.imports.provider.ImportsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.instantiations.provider.InstantiationsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.literals.provider.LiteralsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.members.provider.MembersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.modifiers.provider.ModifiersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.modules.provider.ModulesItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.operators.provider.OperatorsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.parameters.provider.ParametersItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.references.provider.ReferencesItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.statements.provider.StatementsItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.types.provider.TypesItemProviderAdapterFactory; +import tools.mdsd.jamopp.model.java.variables.provider.VariablesItemProviderAdapterFactory; /** - * This is an example of a Sourcecodedecorator model editor. - * + * This is an example of a Sourcecodedecorator model editor. + * * @generated */ public class SourcecodedecoratorEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { /** - * This keeps track of the editing domain that is used to track all changes to the model. + * This keeps track of the editing domain that is used to track all changes to + * the model. * * @generated */ protected AdapterFactoryEditingDomain editingDomain; /** - * This is the one adapter factory used for providing views of the model. - * - * @generated - */ + * This is the one adapter factory used for providing views of the model. + * + * @generated + */ protected ComposedAdapterFactory adapterFactory; /** - * This is the content outline page. - * - * @generated - */ + * This is the content outline page. + * + * @generated + */ protected IContentOutlinePage contentOutlinePage; /** - * This is a kludge... - * - * @generated - */ + * This is a kludge... + * + * @generated + */ protected IStatusLineManager contentOutlineStatusLineManager; /** - * This is the content outline page's viewer. - * - * @generated - */ + * This is the content outline page's viewer. + * + * @generated + */ protected TreeViewer contentOutlineViewer; /** - * This is the property sheet page. - * - * @generated - */ - protected List propertySheetPages = new ArrayList(); + * This is the property sheet page. + * + * @generated + */ + protected List propertySheetPages = new ArrayList<>(); /** - * This is the viewer that shadows the selection in the content outline. - * The parent relation must be correctly defined for this to work. - * - * @generated - */ + * This is the viewer that shadows the selection in the content outline. The + * parent relation must be correctly defined for this to work. + * + * @generated + */ protected TreeViewer selectionViewer; /** - * This inverts the roll of parent and child in the content provider and show parents as a tree. - * - * @generated - */ + * This inverts the roll of parent and child in the content provider and show + * parents as a tree. + * + * @generated + */ protected TreeViewer parentViewer; /** - * This shows how a tree view works. - * - * @generated - */ + * This shows how a tree view works. + * + * @generated + */ protected TreeViewer treeViewer; /** - * This shows how a list view works. - * A list viewer doesn't support icons. - * - * @generated - */ + * This shows how a list view works. A list viewer doesn't support icons. + * + * @generated + */ protected ListViewer listViewer; /** - * This shows how a table view works. A table can be used as a list with icons. + * This shows how a table view works. A table can be used as a list with icons. + * * * @generated */ protected TableViewer tableViewer; /** - * This shows how a tree view with columns works. - * - * @generated - */ + * This shows how a tree view with columns works. + * + * @generated + */ protected TreeViewer treeViewerWithColumns; /** - * This keeps track of the active viewer pane, in the book. - * - * @generated - */ + * This keeps track of the active viewer pane, in the book. + * + * @generated + */ protected ViewerPane currentViewerPane; /** - * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer. - * - * @generated - */ + * This keeps track of the active content viewer, which may be either one of the + * viewers in the pages or the content outline viewer. + * + * + * @generated + */ protected Viewer currentViewer; /** - * This listens to which ever viewer is active. - * - * @generated - */ + * This listens to which ever viewer is active. + * + * @generated + */ protected ISelectionChangedListener selectionChangedListener; /** - * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor. - * - * @generated - */ - protected Collection selectionChangedListeners = new ArrayList(); + * This keeps track of all the + * {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are + * listening to this editor. + * + * @generated + */ + protected Collection selectionChangedListeners = new ArrayList<>(); /** - * This keeps track of the selection of the editor as a whole. - * - * @generated - */ + * This keeps track of the selection of the editor as a whole. + * + * @generated + */ protected ISelection editorSelection = StructuredSelection.EMPTY; /** - * The MarkerHelper is responsible for creating workspace resource markers presented - * in Eclipse's Problems View. - * - * @generated - */ + * The MarkerHelper is responsible for creating workspace resource markers + * presented in Eclipse's Problems View. + * + * @generated + */ protected MarkerHelper markerHelper = new EditUIMarkerHelper(); /** - * This listens for when the outline becomes active + * This listens for when the outline becomes active * * @generated */ protected IPartListener partListener = new IPartListener() { - @Override - public void partActivated(IWorkbenchPart p) { - if (p instanceof ContentOutline) { - if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) { - getActionBarContributor().setActiveEditor(SourcecodedecoratorEditor.this); - - setCurrentViewer(contentOutlineViewer); - } - } - else if (p instanceof PropertySheet) { - if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) { - getActionBarContributor().setActiveEditor(SourcecodedecoratorEditor.this); - handleActivate(); - } - } - else if (p == SourcecodedecoratorEditor.this) { - handleActivate(); - } - } - @Override - public void partBroughtToTop(IWorkbenchPart p) { - // Ignore. - } - @Override - public void partClosed(IWorkbenchPart p) { - // Ignore. - } - @Override - public void partDeactivated(IWorkbenchPart p) { - // Ignore. - } - @Override - public void partOpened(IWorkbenchPart p) { - // Ignore. - } - }; - - /** - * Resources that have been removed since last activation. - * - * @generated - */ - protected Collection removedResources = new ArrayList(); + @Override + public void partActivated(final IWorkbenchPart p) { + if (p instanceof ContentOutline) { + if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) { + getActionBarContributor().setActiveEditor(SourcecodedecoratorEditor.this); + + setCurrentViewer(contentOutlineViewer); + } + } else if (p instanceof PropertySheet) { + if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) { + getActionBarContributor().setActiveEditor(SourcecodedecoratorEditor.this); + handleActivate(); + } + } else if (p == SourcecodedecoratorEditor.this) { + handleActivate(); + } + } + + @Override + public void partBroughtToTop(final IWorkbenchPart p) { + // Ignore. + } + + @Override + public void partClosed(final IWorkbenchPart p) { + // Ignore. + } + + @Override + public void partDeactivated(final IWorkbenchPart p) { + // Ignore. + } + + @Override + public void partOpened(final IWorkbenchPart p) { + // Ignore. + } + }; /** - * Resources that have been changed since last activation. - * - * @generated - */ - protected Collection changedResources = new ArrayList(); + * Resources that have been removed since last activation. + * + * @generated + */ + protected Collection removedResources = new ArrayList<>(); /** - * Resources that have been saved. - * - * @generated - */ - protected Collection savedResources = new ArrayList(); + * Resources that have been changed since last activation. + * + * @generated + */ + protected Collection changedResources = new ArrayList<>(); /** - * Map to store the diagnostic associated with a resource. - * - * @generated - */ - protected Map resourceToDiagnosticMap = new LinkedHashMap(); + * Resources that have been saved. + * + * @generated + */ + protected Collection savedResources = new ArrayList<>(); /** - * Controls whether the problem indication should be updated. - * - * @generated - */ - protected boolean updateProblemIndication = true; + * Map to store the diagnostic associated with a resource. + * + * @generated + */ + protected Map resourceToDiagnosticMap = new LinkedHashMap<>(); /** - * Adapter used to update the problem indication when resources are demanded loaded. * * @generated */ + protected boolean updateProblemIndication = true; + + /** + * Adapter used to update the problem indication when resources are demanded + * loaded. + * + * @generated + */ protected EContentAdapter problemIndicationAdapter = new EContentAdapter() { - protected boolean dispatching; - - @Override - public void notifyChanged(Notification notification) { - if (notification.getNotifier() instanceof Resource) { - switch (notification.getFeatureID(Resource.class)) { - case Resource.RESOURCE__IS_LOADED: - case Resource.RESOURCE__ERRORS: - case Resource.RESOURCE__WARNINGS: { - Resource resource = (Resource)notification.getNotifier(); - Diagnostic diagnostic = analyzeResourceProblems(resource, null); - if (diagnostic.getSeverity() != Diagnostic.OK) { - resourceToDiagnosticMap.put(resource, diagnostic); - } - else { - resourceToDiagnosticMap.remove(resource); - } - dispatchUpdateProblemIndication(); - break; - } - } - } - else { - super.notifyChanged(notification); - } - } - - protected void dispatchUpdateProblemIndication() { - if (updateProblemIndication && !dispatching) { - dispatching = true; - getSite().getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - dispatching = false; - updateProblemIndication(); - } - }); - } - } - - @Override - protected void setTarget(Resource target) { - basicSetTarget(target); - } - - @Override - protected void unsetTarget(Resource target) { - basicUnsetTarget(target); - resourceToDiagnosticMap.remove(target); - dispatchUpdateProblemIndication(); - } - }; - - /** - * This listens for workspace changes. - * - * @generated - */ - protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() { - @Override - public void resourceChanged(IResourceChangeEvent event) { - IResourceDelta delta = event.getDelta(); - try { - class ResourceDeltaVisitor implements IResourceDeltaVisitor { - protected ResourceSet resourceSet = editingDomain.getResourceSet(); - protected Collection changedResources = new ArrayList(); - protected Collection removedResources = new ArrayList(); - - @Override - public boolean visit(IResourceDelta delta) { - if (delta.getResource().getType() == IResource.FILE) { - if (delta.getKind() == IResourceDelta.REMOVED || - delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) { - Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false); - if (resource != null) { - if (delta.getKind() == IResourceDelta.REMOVED) { - removedResources.add(resource); - } - else if (!savedResources.remove(resource)) { - changedResources.add(resource); - } - } - } - return false; - } - - return true; - } - - public Collection getChangedResources() { - return changedResources; - } - - public Collection getRemovedResources() { - return removedResources; - } - } - - final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(); - delta.accept(visitor); - - if (!visitor.getRemovedResources().isEmpty()) { - getSite().getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - removedResources.addAll(visitor.getRemovedResources()); - if (!isDirty()) { - getSite().getPage().closeEditor(SourcecodedecoratorEditor.this, false); - } - } - }); - } - - if (!visitor.getChangedResources().isEmpty()) { - getSite().getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - changedResources.addAll(visitor.getChangedResources()); - if (getSite().getPage().getActiveEditor() == SourcecodedecoratorEditor.this) { - handleActivate(); - } - } - }); - } - } - catch (CoreException exception) { - FEditorPlugin.INSTANCE.log(exception); - } - } - }; - - /** - * Handles activation of the editor or it's associated views. - * - * @generated - */ + protected boolean dispatching; + + @Override + public void notifyChanged(final Notification notification) { + if (notification.getNotifier() instanceof Resource) { + switch (notification.getFeatureID(Resource.class)) { + case Resource.RESOURCE__IS_LOADED: + case Resource.RESOURCE__ERRORS: + case Resource.RESOURCE__WARNINGS: { + final Resource resource = (Resource) notification.getNotifier(); + final Diagnostic diagnostic = analyzeResourceProblems(resource, null); + if (diagnostic.getSeverity() != Diagnostic.OK) { + resourceToDiagnosticMap.put(resource, diagnostic); + } else { + resourceToDiagnosticMap.remove(resource); + } + dispatchUpdateProblemIndication(); + break; + } + } + } else { + super.notifyChanged(notification); + } + } + + protected void dispatchUpdateProblemIndication() { + if (updateProblemIndication && !dispatching) { + dispatching = true; + getSite().getShell().getDisplay().asyncExec(() -> { + dispatching = false; + updateProblemIndication(); + }); + } + } + + @Override + protected void setTarget(final Resource target) { + basicSetTarget(target); + } + + @Override + protected void unsetTarget(final Resource target) { + basicUnsetTarget(target); + resourceToDiagnosticMap.remove(target); + dispatchUpdateProblemIndication(); + } + }; + + /** + * This listens for workspace changes. + * + * @generated + */ + protected IResourceChangeListener resourceChangeListener = event -> { + final IResourceDelta delta = event.getDelta(); + try { + class ResourceDeltaVisitor implements IResourceDeltaVisitor { + protected ResourceSet resourceSet = editingDomain.getResourceSet(); + protected Collection changedResources = new ArrayList<>(); + protected Collection removedResources = new ArrayList<>(); + + @Override + public boolean visit(final IResourceDelta delta) { + if (delta.getResource().getType() == IResource.FILE) { + if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getKind() == IResourceDelta.CHANGED) + && (delta.getFlags() != IResourceDelta.MARKERS))) { + final Resource resource = resourceSet.getResource( + URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false); + if (resource != null) { + if (delta.getKind() == IResourceDelta.REMOVED) { + removedResources.add(resource); + } else if (!savedResources.remove(resource)) { + changedResources.add(resource); + } + } + } + return false; + } + + return true; + } + + public Collection getChangedResources() { + return changedResources; + } + + public Collection getRemovedResources() { + return removedResources; + } + } + + final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(); + delta.accept(visitor); + + if (!visitor.getRemovedResources().isEmpty()) { + getSite().getShell().getDisplay().asyncExec(() -> { + removedResources.addAll(visitor.getRemovedResources()); + if (!isDirty()) { + getSite().getPage().closeEditor(this, false); + } + }); + } + + if (!visitor.getChangedResources().isEmpty()) { + getSite().getShell().getDisplay().asyncExec(() -> { + changedResources.addAll(visitor.getChangedResources()); + if (getSite().getPage().getActiveEditor() == this) { + handleActivate(); + } + }); + } + } catch (final CoreException exception) { + FEditorPlugin.INSTANCE.log(exception); + } + }; + + /** + * Handles activation of the editor or it's associated views. + * + * @generated + */ protected void handleActivate() { - // Recompute the read only state. - // - if (editingDomain.getResourceToReadOnlyMap() != null) { - editingDomain.getResourceToReadOnlyMap().clear(); - - // Refresh any actions that may become enabled or disabled. - // - setSelection(getSelection()); - } - - if (!removedResources.isEmpty()) { - if (handleDirtyConflict()) { - getSite().getPage().closeEditor(SourcecodedecoratorEditor.this, false); - } - else { - removedResources.clear(); - changedResources.clear(); - savedResources.clear(); - } - } - else if (!changedResources.isEmpty()) { - changedResources.removeAll(savedResources); - handleChangedResources(); - changedResources.clear(); - savedResources.clear(); - } - } - - /** - * Handles what to do with changed resources on activation. - * - * @generated - */ + // Recompute the read only state. + // + if (editingDomain.getResourceToReadOnlyMap() != null) { + editingDomain.getResourceToReadOnlyMap().clear(); + + // Refresh any actions that may become enabled or disabled. + // + setSelection(getSelection()); + } + + if (!removedResources.isEmpty()) { + if (handleDirtyConflict()) { + getSite().getPage().closeEditor(SourcecodedecoratorEditor.this, false); + } else { + removedResources.clear(); + changedResources.clear(); + savedResources.clear(); + } + } else if (!changedResources.isEmpty()) { + changedResources.removeAll(savedResources); + handleChangedResources(); + changedResources.clear(); + savedResources.clear(); + } + } + + /** + * Handles what to do with changed resources on activation. + * + * @generated + */ protected void handleChangedResources() { - if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { - ResourceSet resourceSet = editingDomain.getResourceSet(); - if (isDirty()) { - changedResources.addAll(resourceSet.getResources()); - } - editingDomain.getCommandStack().flush(); - - updateProblemIndication = false; - for (Resource resource : changedResources) { - if (resource.isLoaded()) { - resource.unload(); - try { - resource.load(resourceSet.getLoadOptions()); - } - catch (IOException exception) { - if (!resourceToDiagnosticMap.containsKey(resource)) { - resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); - } - } - } - } - - if (AdapterFactoryEditingDomain.isStale(editorSelection)) { - setSelection(StructuredSelection.EMPTY); - } - - updateProblemIndication = true; - updateProblemIndication(); - } - } - - /** - * Updates the problems indication with the information described in the specified diagnostic. - * - * @generated - */ + if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { + final ResourceSet resourceSet = editingDomain.getResourceSet(); + if (isDirty()) { + changedResources.addAll(resourceSet.getResources()); + } + editingDomain.getCommandStack().flush(); + + updateProblemIndication = false; + for (final Resource resource : changedResources) { + if (resource.isLoaded()) { + resource.unload(); + try { + resource.load(resourceSet.getLoadOptions()); + } catch (final IOException exception) { + if (!resourceToDiagnosticMap.containsKey(resource)) { + resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); + } + } + } + } + + if (AdapterFactoryEditingDomain.isStale(editorSelection)) { + setSelection(StructuredSelection.EMPTY); + } + + updateProblemIndication = true; + updateProblemIndication(); + } + } + + /** + * Updates the problems indication with the information described in the + * specified diagnostic. + * + * @generated + */ protected void updateProblemIndication() { - if (updateProblemIndication) { - BasicDiagnostic diagnostic = - new BasicDiagnostic - (Diagnostic.OK, - "org.somox.sourcecodedecorator.editor", - 0, - null, - new Object [] { editingDomain.getResourceSet() }); - for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) { - if (childDiagnostic.getSeverity() != Diagnostic.OK) { - diagnostic.add(childDiagnostic); - } - } - - int lastEditorPage = getPageCount() - 1; - if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) { - ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic); - if (diagnostic.getSeverity() != Diagnostic.OK) { - setActivePage(lastEditorPage); - } - } - else if (diagnostic.getSeverity() != Diagnostic.OK) { - ProblemEditorPart problemEditorPart = new ProblemEditorPart(); - problemEditorPart.setDiagnostic(diagnostic); - problemEditorPart.setMarkerHelper(markerHelper); - try { - addPage(++lastEditorPage, problemEditorPart, getEditorInput()); - setPageText(lastEditorPage, problemEditorPart.getPartName()); - setActivePage(lastEditorPage); - showTabs(); - } - catch (PartInitException exception) { - FEditorPlugin.INSTANCE.log(exception); - } - } - - if (markerHelper.hasMarkers(editingDomain.getResourceSet())) { - try { - markerHelper.updateMarkers(diagnostic); - } - catch (CoreException exception) { - FEditorPlugin.INSTANCE.log(exception); - } - } - } - } - - /** - * Shows a dialog that asks if conflicting changes should be discarded. - * - * - * @generated - */ + if (updateProblemIndication) { + final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, + "org.somox.sourcecodedecorator.editor", 0, null, new Object[] { editingDomain.getResourceSet() }); + for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) { + if (childDiagnostic.getSeverity() != Diagnostic.OK) { + diagnostic.add(childDiagnostic); + } + } + + int lastEditorPage = getPageCount() - 1; + if ((lastEditorPage >= 0) && (getEditor(lastEditorPage) instanceof ProblemEditorPart)) { + ((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic); + if (diagnostic.getSeverity() != Diagnostic.OK) { + setActivePage(lastEditorPage); + } + } else if (diagnostic.getSeverity() != Diagnostic.OK) { + final ProblemEditorPart problemEditorPart = new ProblemEditorPart(); + problemEditorPart.setDiagnostic(diagnostic); + problemEditorPart.setMarkerHelper(markerHelper); + try { + lastEditorPage++; + addPage(lastEditorPage, problemEditorPart, getEditorInput()); + setPageText(lastEditorPage, problemEditorPart.getPartName()); + setActivePage(lastEditorPage); + showTabs(); + } catch (final PartInitException exception) { + FEditorPlugin.INSTANCE.log(exception); + } + } + + if (markerHelper.hasMarkers(editingDomain.getResourceSet())) { + try { + markerHelper.updateMarkers(diagnostic); + } catch (final CoreException exception) { + FEditorPlugin.INSTANCE.log(exception); + } + } + } + } + + /** + * Shows a dialog that asks if conflicting changes should be discarded. + * + * @generated + */ protected boolean handleDirtyConflict() { - return - MessageDialog.openQuestion - (getSite().getShell(), - getString("_UI_FileConflict_label"), - getString("_WARN_FileConflict")); - } - - /** - * This creates a model editor. - * - * @generated - */ + return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), + getString("_WARN_FileConflict")); + } + + /** + * This creates a model editor. + * + * @generated + */ public SourcecodedecoratorEditor() { - super(); - initializeEditingDomain(); - } + initializeEditingDomain(); + } /** - * This sets up the editing domain for the model editor. - * - * @generated - */ + * This sets up the editing domain for the model editor. + * + * + * @generated + */ protected void initializeEditingDomain() { - // Create an adapter factory that yields item providers. - // - adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - - adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SourcecodedecoratorItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new AnnotationsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ArraysItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ClassifiersItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new CommonsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ContainersItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new GenericsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ImportsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new InstantiationsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new LiteralsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new MembersItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ModifiersItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new OperatorsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ParametersItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ReferencesItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new StatementsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new TypesItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new VariablesItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ModulesItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new LayoutItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new PcmItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new EntityItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new CompositionItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new UsagemodelItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new RepositoryItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ProtocolItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ParameterItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ReliabilityItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SeffItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SeffPerformanceItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SeffReliabilityItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new QosannotationsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new QosPerformanceItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new QosReliabilityItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SystemItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ResourceenvironmentItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new AllocationItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new SubsystemItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ProbfunctionItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new StoexItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new UnitsItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); - - // Create the command stack that will notify this editor as commands are executed. - // - BasicCommandStack commandStack = new BasicCommandStack(); - - // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus. - // - commandStack.addCommandStackListener - (new CommandStackListener() { - @Override - public void commandStackChanged(final EventObject event) { - getContainer().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - firePropertyChange(IEditorPart.PROP_DIRTY); - - // Try to select the affected objects. - // - Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand(); - if (mostRecentCommand != null) { - setSelectionToViewer(mostRecentCommand.getAffectedObjects()); - } - for (Iterator i = propertySheetPages.iterator(); i.hasNext(); ) { - PropertySheetPage propertySheetPage = i.next(); - if (propertySheetPage.getControl() == null || propertySheetPage.getControl().isDisposed()) { - i.remove(); - } - else { - propertySheetPage.refresh(); - } - } - } - }); - } - }); - - // Create the editing domain with a special command stack. - // - editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap()); - } - - /** - * This is here for the listener to be able to call it. - * - * @generated - */ + // Create an adapter factory that yields item providers. + // + adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + + adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SourcecodedecoratorItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new AnnotationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ArraysItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ClassifiersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CommonsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ContainersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new GenericsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ImportsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new InstantiationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new LiteralsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new MembersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ModifiersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new OperatorsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ParametersItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReferencesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new StatementsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new TypesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new VariablesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ModulesItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new LayoutItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new PcmItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new EntityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CompositionItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new UsagemodelItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new RepositoryItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ProtocolItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ParameterItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffPerformanceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SeffReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosannotationsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosPerformanceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new QosReliabilityItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SystemItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ResourceenvironmentItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new AllocationItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SubsystemItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ProbfunctionItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new StoexItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new UnitsItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + + // Create the command stack that will notify this editor as commands are + // executed. + // + final BasicCommandStack commandStack = new BasicCommandStack(); + + // Add a listener to set the most recent command's affected objects to be the + // selection of the viewer with focus. + // + commandStack.addCommandStackListener(event -> getContainer().getDisplay().asyncExec(() -> { + firePropertyChange(IEditorPart.PROP_DIRTY); + + // Try to select the affected objects. + // + final Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand(); + if (mostRecentCommand != null) { + setSelectionToViewer(mostRecentCommand.getAffectedObjects()); + } + for (final Iterator i = propertySheetPages.iterator(); i.hasNext();) { + final PropertySheetPage propertySheetPage = i.next(); + if ((propertySheetPage.getControl() == null) || propertySheetPage.getControl().isDisposed()) { + i.remove(); + } else { + propertySheetPage.refresh(); + } + } + })); + + // Create the editing domain with a special command stack. + // + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap()); + } + + /** + * This is here for the listener to be able to call it. + * + * + * @generated + */ @Override - protected void firePropertyChange(int action) { - super.firePropertyChange(action); - } + protected void firePropertyChange(final int action) { + super.firePropertyChange(action); + } /** - * This sets the selection into whichever viewer is active. - * - * @generated - */ - public void setSelectionToViewer(Collection collection) { - final Collection theSelection = collection; - // Make sure it's okay. - // - if (theSelection != null && !theSelection.isEmpty()) { - Runnable runnable = - new Runnable() { - @Override - public void run() { - // Try to select the items in the current content viewer of the editor. - // - if (currentViewer != null) { - currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true); - } - } - }; - getSite().getShell().getDisplay().asyncExec(runnable); - } - } - - /** - * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. - * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} - * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. - * - * @generated - */ + * + * @generated + */ + public void setSelectionToViewer(final Collection collection) { + final Collection theSelection = collection; + // Make sure it's okay. + // + if ((theSelection != null) && !theSelection.isEmpty()) { + final Runnable runnable = () -> { + // Try to select the items in the current content viewer of the editor. + // + if (currentViewer != null) { + currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true); + } + }; + getSite().getShell().getDisplay().asyncExec(runnable); + } + } + + /** + * This returns the editing domain as required by the + * {@link IEditingDomainProvider} interface. This is important for implementing + * the static methods of {@link AdapterFactoryEditingDomain} and for supporting + * {@link org.eclipse.emf.edit.ui.action.CommandAction}. + * + * + * @generated + */ @Override public EditingDomain getEditingDomain() { - return editingDomain; - } + return editingDomain; + } /** - * - * @generated - */ + * + * + * @generated + */ public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { /** - * - * @generated - */ - public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } + * + * + * @generated + */ + public ReverseAdapterFactoryContentProvider(final AdapterFactory adapterFactory) { + super(adapterFactory); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public Object [] getElements(Object object) { - Object parent = super.getParent(object); - return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); - } + public Object[] getElements(final Object object) { + final Object parent = super.getParent(object); + return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public Object [] getChildren(Object object) { - Object parent = super.getParent(object); - return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); - } + public Object[] getChildren(final Object object) { + final Object parent = super.getParent(object); + return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public boolean hasChildren(Object object) { - Object parent = super.getParent(object); - return parent != null; - } + public boolean hasChildren(final Object object) { + final Object parent = super.getParent(object); + return parent != null; + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public Object getParent(Object object) { - return null; - } + public Object getParent(final Object object) { + return null; + } } /** - * - * @generated - */ - public void setCurrentViewerPane(ViewerPane viewerPane) { - if (currentViewerPane != viewerPane) { - if (currentViewerPane != null) { - currentViewerPane.showFocus(false); - } - currentViewerPane = viewerPane; - } - setCurrentViewer(currentViewerPane.getViewer()); - } - - /** - * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, - * is the current one. - * - * @generated - */ - public void setCurrentViewer(Viewer viewer) { - // If it is changing... - // - if (currentViewer != viewer) { - if (selectionChangedListener == null) { - // Create the listener on demand. - // - selectionChangedListener = - new ISelectionChangedListener() { - // This just notifies those things that are affected by the section. - // - @Override - public void selectionChanged(SelectionChangedEvent selectionChangedEvent) { - setSelection(selectionChangedEvent.getSelection()); - } - }; - } - - // Stop listening to the old one. - // - if (currentViewer != null) { - currentViewer.removeSelectionChangedListener(selectionChangedListener); - } - - // Start listening to the new one. - // - if (viewer != null) { - viewer.addSelectionChangedListener(selectionChangedListener); - } - - // Remember it. - // - currentViewer = viewer; - - // Set the editors selection based on the current viewer's selection. - // - setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection()); - } - } - - /** - * This returns the viewer as required by the {@link IViewerProvider} interface. + * + * + * @generated + */ + public void setCurrentViewerPane(final ViewerPane viewerPane) { + if (currentViewerPane != viewerPane) { + if (currentViewerPane != null) { + currentViewerPane.showFocus(false); + } + currentViewerPane = viewerPane; + } + setCurrentViewer(currentViewerPane.getViewer()); + } + + /** + * This makes sure that one content viewer, either for the current page or the + * outline view, if it has focus, is the current one. + * + * + * @generated + */ + public void setCurrentViewer(final Viewer viewer) { + // If it is changing... + // + if (currentViewer != viewer) { + if (selectionChangedListener == null) { + // Create the listener on demand. + // + selectionChangedListener = selectionChangedEvent -> setSelection(selectionChangedEvent.getSelection()); + } + + // Stop listening to the old one. + // + if (currentViewer != null) { + currentViewer.removeSelectionChangedListener(selectionChangedListener); + } + + // Start listening to the new one. + // + if (viewer != null) { + viewer.addSelectionChangedListener(selectionChangedListener); + } + + // Remember it. + // + currentViewer = viewer; + + // Set the editors selection based on the current viewer's selection. + // + setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection()); + } + } + + /** + * This returns the viewer as required by the {@link IViewerProvider} interface. + * * * @generated */ @Override public Viewer getViewer() { - return currentViewer; - } - - /** - * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. - * - * @generated - */ - protected void createContextMenuFor(StructuredViewer viewer) { - MenuManager contextMenu = new MenuManager("#PopUp"); - contextMenu.add(new Separator("additions")); - contextMenu.setRemoveAllWhenShown(true); - contextMenu.addMenuListener(this); - Menu menu= contextMenu.createContextMenu(viewer.getControl()); - viewer.getControl().setMenu(menu); - getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer)); - - int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; - Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() }; - viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer)); - viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); - } - - /** - * This is the method called to load a resource into the editing domain's resource set based on the editor's input. - * - * @generated - */ + return currentViewer; + } + + /** + * This creates a context menu for the viewer and adds a listener as well + * registering the menu for extension. + * + * @generated + */ + protected void createContextMenuFor(final StructuredViewer viewer) { + final MenuManager contextMenu = new MenuManager("#PopUp"); + contextMenu.add(new Separator("additions")); + contextMenu.setRemoveAllWhenShown(true); + contextMenu.addMenuListener(this); + final Menu menu = contextMenu.createContextMenu(viewer.getControl()); + viewer.getControl().setMenu(menu); + getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer)); + + final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; + final Transfer[] transfers = { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), + FileTransfer.getInstance() }; + viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer)); + viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); + } + + /** + * This is the method called to load a resource into the editing domain's + * resource set based on the editor's input. + * + * @generated + */ public void createModel() { - URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter()); - Exception exception = null; - Resource resource = null; - try { - // Load the resource through the editing domain. - // - resource = editingDomain.getResourceSet().getResource(resourceURI, true); - } - catch (Exception e) { - exception = e; - resource = editingDomain.getResourceSet().getResource(resourceURI, false); - } - - Diagnostic diagnostic = analyzeResourceProblems(resource, exception); - if (diagnostic.getSeverity() != Diagnostic.OK) { - resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); - } - editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); - } - - /** - * Returns a diagnostic describing the errors and warnings listed in the resource - * and the specified exception (if any). - * - * @generated - */ - public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { - boolean hasErrors = !resource.getErrors().isEmpty(); - if (hasErrors || !resource.getWarnings().isEmpty()) { - BasicDiagnostic basicDiagnostic = - new BasicDiagnostic - (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING, - "org.somox.sourcecodedecorator.editor", - 0, - getString("_UI_CreateModelError_message", resource.getURI()), - new Object [] { exception == null ? (Object)resource : exception }); - basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true)); - return basicDiagnostic; - } - else if (exception != null) { - return - new BasicDiagnostic - (Diagnostic.ERROR, - "org.somox.sourcecodedecorator.editor", - 0, - getString("_UI_CreateModelError_message", resource.getURI()), - new Object[] { exception }); - } - else { - return Diagnostic.OK_INSTANCE; - } - } - - /** - * This is the method used by the framework to install your own controls. - * - * @generated - */ + final URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter()); + Exception exception = null; + Resource resource = null; + try { + // Load the resource through the editing domain. + // + resource = editingDomain.getResourceSet().getResource(resourceURI, true); + } catch (final Exception e) { + exception = e; + resource = editingDomain.getResourceSet().getResource(resourceURI, false); + } + + final Diagnostic diagnostic = analyzeResourceProblems(resource, exception); + if (diagnostic.getSeverity() != Diagnostic.OK) { + resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); + } + editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); + } + + /** + * Returns a diagnostic describing the errors and warnings listed in the + * resource and the specified exception (if any). + * + * @generated + */ + public Diagnostic analyzeResourceProblems(final Resource resource, final Exception exception) { + final boolean hasErrors = !resource.getErrors().isEmpty(); + if (hasErrors || !resource.getWarnings().isEmpty()) { + final BasicDiagnostic basicDiagnostic = new BasicDiagnostic( + hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING, "org.somox.sourcecodedecorator.editor", 0, + getString("_UI_CreateModelError_message", resource.getURI()), + new Object[] { exception == null ? (Object) resource : exception }); + basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true)); + return basicDiagnostic; + } + if (exception != null) { + return new BasicDiagnostic(Diagnostic.ERROR, "org.somox.sourcecodedecorator.editor", 0, + getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); + } + return Diagnostic.OK_INSTANCE; + } + + /** + * This is the method used by the framework to install your own controls. + * + * @generated + */ @Override public void createPages() { - // Creates the model from the editor input - // - createModel(); - - // Only creates the other pages if there is something that can be edited - // - if (!getEditingDomain().getResourceSet().getResources().isEmpty()) { - // Create a page for the selection tree view. - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - Tree tree = new Tree(composite, SWT.MULTI); - TreeViewer newTreeViewer = new TreeViewer(tree); - return newTreeViewer; - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - - selectionViewer = (TreeViewer)viewerPane.getViewer(); - selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - selectionViewer.setUseHashlookup(true); - - selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - selectionViewer.setInput(editingDomain.getResourceSet()); - selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); - viewerPane.setTitle(editingDomain.getResourceSet()); - - new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory); - - createContextMenuFor(selectionViewer); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_SelectionPage_label")); - } - - // Create a page for the parent tree view. - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - Tree tree = new Tree(composite, SWT.MULTI); - TreeViewer newTreeViewer = new TreeViewer(tree); - return newTreeViewer; - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - - parentViewer = (TreeViewer)viewerPane.getViewer(); - parentViewer.setAutoExpandLevel(30); - parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory)); - parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - - createContextMenuFor(parentViewer); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_ParentPage_label")); - } - - // This is the page for the list viewer - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - return new ListViewer(composite); - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - listViewer = (ListViewer)viewerPane.getViewer(); - listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - - createContextMenuFor(listViewer); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_ListPage_label")); - } - - // This is the page for the tree viewer - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - return new TreeViewer(composite); - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - treeViewer = (TreeViewer)viewerPane.getViewer(); - treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - - new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory); - - createContextMenuFor(treeViewer); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_TreePage_label")); - } - - // This is the page for the table viewer. - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - return new TableViewer(composite); - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - tableViewer = (TableViewer)viewerPane.getViewer(); - - Table table = tableViewer.getTable(); - TableLayout layout = new TableLayout(); - table.setLayout(layout); - table.setHeaderVisible(true); - table.setLinesVisible(true); - - TableColumn objectColumn = new TableColumn(table, SWT.NONE); - layout.addColumnData(new ColumnWeightData(3, 100, true)); - objectColumn.setText(getString("_UI_ObjectColumn_label")); - objectColumn.setResizable(true); - - TableColumn selfColumn = new TableColumn(table, SWT.NONE); - layout.addColumnData(new ColumnWeightData(2, 100, true)); - selfColumn.setText(getString("_UI_SelfColumn_label")); - selfColumn.setResizable(true); - - tableViewer.setColumnProperties(new String [] {"a", "b"}); - tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - - createContextMenuFor(tableViewer); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_TablePage_label")); - } - - // This is the page for the table tree viewer. - // - { - ViewerPane viewerPane = - new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { - @Override - public Viewer createViewer(Composite composite) { - return new TreeViewer(composite); - } - @Override - public void requestActivation() { - super.requestActivation(); - setCurrentViewerPane(this); - } - }; - viewerPane.createControl(getContainer()); - - treeViewerWithColumns = (TreeViewer)viewerPane.getViewer(); - - Tree tree = treeViewerWithColumns.getTree(); - tree.setLayoutData(new FillLayout()); - tree.setHeaderVisible(true); - tree.setLinesVisible(true); - - TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE); - objectColumn.setText(getString("_UI_ObjectColumn_label")); - objectColumn.setResizable(true); - objectColumn.setWidth(250); - - TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE); - selfColumn.setText(getString("_UI_SelfColumn_label")); - selfColumn.setResizable(true); - selfColumn.setWidth(200); - - treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); - treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - - createContextMenuFor(treeViewerWithColumns); - int pageIndex = addPage(viewerPane.getControl()); - setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); - } - - getSite().getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - if (!getContainer().isDisposed()) { - setActivePage(0); - } - } - }); - } - - // Ensures that this editor will only display the page's tab - // area if there are more than one page - // - getContainer().addControlListener - (new ControlAdapter() { - boolean guard = false; - @Override - public void controlResized(ControlEvent event) { - if (!guard) { - guard = true; - hideTabs(); - guard = false; - } - } - }); - - getSite().getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - updateProblemIndication(); - } - }); - } - - /** - * If there is just one page in the multi-page editor part, - * this hides the single tab at the bottom. - * - * @generated - */ + // Creates the model from the editor input + // + createModel(); + + // Only creates the other pages if there is something that can be edited + // + if (!getEditingDomain().getResourceSet().getResources().isEmpty()) { + // Create a page for the selection tree view. + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + final Tree tree = new Tree(composite, SWT.MULTI); + return new TreeViewer(tree); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + + selectionViewer = (TreeViewer) viewerPane.getViewer(); + selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + selectionViewer.setUseHashlookup(true); + + selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + selectionViewer.setInput(editingDomain.getResourceSet()); + selectionViewer.setSelection( + new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); + viewerPane.setTitle(editingDomain.getResourceSet()); + + new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory); + + createContextMenuFor(selectionViewer); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_SelectionPage_label")); + } + + // Create a page for the parent tree view. + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + final Tree tree = new Tree(composite, SWT.MULTI); + return new TreeViewer(tree); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + + parentViewer = (TreeViewer) viewerPane.getViewer(); + parentViewer.setAutoExpandLevel(30); + parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory)); + parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + + createContextMenuFor(parentViewer); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_ParentPage_label")); + } + + // This is the page for the list viewer + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + return new ListViewer(composite); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + listViewer = (ListViewer) viewerPane.getViewer(); + listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + + createContextMenuFor(listViewer); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_ListPage_label")); + } + + // This is the page for the tree viewer + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + return new TreeViewer(composite); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + treeViewer = (TreeViewer) viewerPane.getViewer(); + treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + + new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory); + + createContextMenuFor(treeViewer); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_TreePage_label")); + } + + // This is the page for the table viewer. + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + return new TableViewer(composite); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + tableViewer = (TableViewer) viewerPane.getViewer(); + + final Table table = tableViewer.getTable(); + final TableLayout layout = new TableLayout(); + table.setLayout(layout); + table.setHeaderVisible(true); + table.setLinesVisible(true); + + final TableColumn objectColumn = new TableColumn(table, SWT.NONE); + layout.addColumnData(new ColumnWeightData(3, 100, true)); + objectColumn.setText(getString("_UI_ObjectColumn_label")); + objectColumn.setResizable(true); + + final TableColumn selfColumn = new TableColumn(table, SWT.NONE); + layout.addColumnData(new ColumnWeightData(2, 100, true)); + selfColumn.setText(getString("_UI_SelfColumn_label")); + selfColumn.setResizable(true); + + tableViewer.setColumnProperties(new String[] { "a", "b" }); + tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + + createContextMenuFor(tableViewer); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_TablePage_label")); + } + + // This is the page for the table tree viewer. + // + { + final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), SourcecodedecoratorEditor.this) { + @Override + public Viewer createViewer(final Composite composite) { + return new TreeViewer(composite); + } + + @Override + public void requestActivation() { + super.requestActivation(); + setCurrentViewerPane(this); + } + }; + viewerPane.createControl(getContainer()); + + treeViewerWithColumns = (TreeViewer) viewerPane.getViewer(); + + final Tree tree = treeViewerWithColumns.getTree(); + tree.setLayoutData(new FillLayout()); + tree.setHeaderVisible(true); + tree.setLinesVisible(true); + + final TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE); + objectColumn.setText(getString("_UI_ObjectColumn_label")); + objectColumn.setResizable(true); + objectColumn.setWidth(250); + + final TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE); + selfColumn.setText(getString("_UI_SelfColumn_label")); + selfColumn.setResizable(true); + selfColumn.setWidth(200); + + treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); + treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + + createContextMenuFor(treeViewerWithColumns); + final int pageIndex = addPage(viewerPane.getControl()); + setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); + } + + getSite().getShell().getDisplay().asyncExec(() -> { + if (!getContainer().isDisposed()) { + setActivePage(0); + } + }); + } + + // Ensures that this editor will only display the page's tab + // area if there are more than one page + // + getContainer().addControlListener(new ControlAdapter() { + boolean guard = false; + + @Override + public void controlResized(final ControlEvent event) { + if (!guard) { + guard = true; + hideTabs(); + guard = false; + } + } + }); + + getSite().getShell().getDisplay().asyncExec(this::updateProblemIndication); + } + + /** + * If there is just one page in the multi-page editor part, this hides the + * single tab at the bottom. + * + * @generated + */ protected void hideTabs() { - if (getPageCount() <= 1) { - setPageText(0, ""); - if (getContainer() instanceof CTabFolder) { - Point point = getContainer().getSize(); - Rectangle clientArea = getContainer().getClientArea(); - getContainer().setSize(point.x, 2 * point.y - clientArea.height - clientArea.y); - } - } - } - - /** - * If there is more than one page in the multi-page editor part, - * this shows the tabs at the bottom. - * - * @generated - */ + if (getPageCount() <= 1) { + setPageText(0, ""); + if (getContainer() instanceof CTabFolder) { + final Point point = getContainer().getSize(); + final Rectangle clientArea = getContainer().getClientArea(); + getContainer().setSize(point.x, (2 * point.y) - clientArea.height - clientArea.y); + } + } + } + + /** + * If there is more than one page in the multi-page editor part, this shows the + * tabs at the bottom. + * + * @generated + */ protected void showTabs() { - if (getPageCount() > 1) { - setPageText(0, getString("_UI_SelectionPage_label")); - if (getContainer() instanceof CTabFolder) { - Point point = getContainer().getSize(); - Rectangle clientArea = getContainer().getClientArea(); - getContainer().setSize(point.x, clientArea.height + clientArea.y); - } - } - } - - /** - * This is used to track the active viewer. - * - * @generated - */ + if (getPageCount() > 1) { + setPageText(0, getString("_UI_SelectionPage_label")); + if (getContainer() instanceof CTabFolder) { + final Point point = getContainer().getSize(); + final Rectangle clientArea = getContainer().getClientArea(); + getContainer().setSize(point.x, clientArea.height + clientArea.y); + } + } + } + + /** + * This is used to track the active viewer. + * + * @generated + */ @Override - protected void pageChange(int pageIndex) { - super.pageChange(pageIndex); + protected void pageChange(final int pageIndex) { + super.pageChange(pageIndex); - if (contentOutlinePage != null) { - handleContentOutlineSelection(contentOutlinePage.getSelection()); - } - } + if (contentOutlinePage != null) { + handleContentOutlineSelection(contentOutlinePage.getSelection()); + } + } /** - * This is how the framework determines which interfaces we implement. - * - * - * @generated - */ + * This is how the framework determines which interfaces we implement. + * + * @generated + */ @SuppressWarnings("rawtypes") @Override - public T getAdapter(Class key) { - if (key.equals(IContentOutlinePage.class)) { - return showOutlineView() ? key.cast(getContentOutlinePage()) : null; - } - else if (key.equals(IPropertySheetPage.class)) { - return key.cast(getPropertySheetPage()); - } - else if (key.equals(IGotoMarker.class)) { - return key.cast(this); - } - else { - return super.getAdapter(key); - } - } - - /** - * This accesses a cached version of the content outliner. - * - * @generated - */ + public T getAdapter(final Class key) { + if (key.equals(IContentOutlinePage.class)) { + return showOutlineView() ? key.cast(getContentOutlinePage()) : null; + } + if (key.equals(IPropertySheetPage.class)) { + return key.cast(getPropertySheetPage()); + } + if (key.equals(IGotoMarker.class)) { + return key.cast(this); + } + return super.getAdapter(key); + } + + /** + * This accesses a cached version of the content outliner. + * + * @generated + */ public IContentOutlinePage getContentOutlinePage() { - if (contentOutlinePage == null) { - // The content outline is just a tree. - // - class MyContentOutlinePage extends ContentOutlinePage { - @Override - public void createControl(Composite parent) { - super.createControl(parent); - contentOutlineViewer = getTreeViewer(); - contentOutlineViewer.addSelectionChangedListener(this); - - // Set up the tree viewer. - // - contentOutlineViewer.setUseHashlookup(true); - contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); - contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); - contentOutlineViewer.setInput(editingDomain.getResourceSet()); - - // Make sure our popups work. - // - createContextMenuFor(contentOutlineViewer); - - if (!editingDomain.getResourceSet().getResources().isEmpty()) { - // Select the root object in the view. - // - contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); - } - } - - @Override - public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) { - super.makeContributions(menuManager, toolBarManager, statusLineManager); - contentOutlineStatusLineManager = statusLineManager; - } - - @Override - public void setActionBars(IActionBars actionBars) { - super.setActionBars(actionBars); - getActionBarContributor().shareGlobalActions(this, actionBars); - } - } - - contentOutlinePage = new MyContentOutlinePage(); - - // Listen to selection so that we can handle it is a special way. - // - contentOutlinePage.addSelectionChangedListener - (new ISelectionChangedListener() { - // This ensures that we handle selections correctly. - // - @Override - public void selectionChanged(SelectionChangedEvent event) { - handleContentOutlineSelection(event.getSelection()); - } - }); - } - - return contentOutlinePage; - } - - /** - * This accesses a cached version of the property sheet. - * - * @generated - */ + if (contentOutlinePage == null) { + // The content outline is just a tree. + // + class MyContentOutlinePage extends ContentOutlinePage { + @Override + public void createControl(final Composite parent) { + super.createControl(parent); + contentOutlineViewer = getTreeViewer(); + contentOutlineViewer.addSelectionChangedListener(this); + + // Set up the tree viewer. + // + contentOutlineViewer.setUseHashlookup(true); + contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); + contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); + contentOutlineViewer.setInput(editingDomain.getResourceSet()); + + // Make sure our popups work. + // + createContextMenuFor(contentOutlineViewer); + + if (!editingDomain.getResourceSet().getResources().isEmpty()) { + // Select the root object in the view. + // + contentOutlineViewer.setSelection( + new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true); + } + } + + @Override + public void makeContributions(final IMenuManager menuManager, final IToolBarManager toolBarManager, + final IStatusLineManager statusLineManager) { + super.makeContributions(menuManager, toolBarManager, statusLineManager); + contentOutlineStatusLineManager = statusLineManager; + } + + @Override + public void setActionBars(final IActionBars actionBars) { + super.setActionBars(actionBars); + getActionBarContributor().shareGlobalActions(this, actionBars); + } + } + + contentOutlinePage = new MyContentOutlinePage(); + + // Listen to selection so that we can handle it is a special way. + // + contentOutlinePage + .addSelectionChangedListener(event -> handleContentOutlineSelection(event.getSelection())); + } + + return contentOutlinePage; + } + + /** + * This accesses a cached version of the property sheet. + * + * + * @generated + */ public IPropertySheetPage getPropertySheetPage() { - PropertySheetPage propertySheetPage = - new ExtendedPropertySheetPage(editingDomain, ExtendedPropertySheetPage.Decoration.NONE, null, 0, false) { - @Override - public void setSelectionToViewer(List selection) { - SourcecodedecoratorEditor.this.setSelectionToViewer(selection); - SourcecodedecoratorEditor.this.setFocus(); - } - - @Override - public void setActionBars(IActionBars actionBars) { - super.setActionBars(actionBars); - getActionBarContributor().shareGlobalActions(this, actionBars); - } - }; - propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory)); - propertySheetPages.add(propertySheetPage); - - return propertySheetPage; - } - - /** - * This deals with how we want selection in the outliner to affect the other views. + final PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain, + ExtendedPropertySheetPage.Decoration.NONE, null, 0, false) { + @Override + public void setSelectionToViewer(final List selection) { + SourcecodedecoratorEditor.this.setSelectionToViewer(selection); + SourcecodedecoratorEditor.this.setFocus(); + } + + @Override + public void setActionBars(final IActionBars actionBars) { + super.setActionBars(actionBars); + getActionBarContributor().shareGlobalActions(this, actionBars); + } + }; + propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory)); + propertySheetPages.add(propertySheetPage); + + return propertySheetPage; + } + + /** + * This deals with how we want selection in the outliner to affect the other + * views. * * @generated */ - public void handleContentOutlineSelection(ISelection selection) { - if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { - Iterator selectedElements = ((IStructuredSelection)selection).iterator(); - if (selectedElements.hasNext()) { - // Get the first selected element. - // - Object selectedElement = selectedElements.next(); - - // If it's the selection viewer, then we want it to select the same selection as this selection. - // - if (currentViewerPane.getViewer() == selectionViewer) { - ArrayList selectionList = new ArrayList(); - selectionList.add(selectedElement); - while (selectedElements.hasNext()) { - selectionList.add(selectedElements.next()); - } - - // Set the selection to the widget. - // - selectionViewer.setSelection(new StructuredSelection(selectionList)); - } - else { - // Set the input to the widget. - // - if (currentViewerPane.getViewer().getInput() != selectedElement) { - currentViewerPane.getViewer().setInput(selectedElement); - currentViewerPane.setTitle(selectedElement); - } - } - } - } - } - - /** - * This is for implementing {@link IEditorPart} and simply tests the command stack. + public void handleContentOutlineSelection(final ISelection selection) { + if ((currentViewerPane != null) && !selection.isEmpty() && (selection instanceof IStructuredSelection)) { + final Iterator selectedElements = ((IStructuredSelection) selection).iterator(); + if (selectedElements.hasNext()) { + // Get the first selected element. + // + final Object selectedElement = selectedElements.next(); + + // If it's the selection viewer, then we want it to select the same selection as + // this selection. + // + if (currentViewerPane.getViewer() == selectionViewer) { + final ArrayList selectionList = new ArrayList<>(); + selectionList.add(selectedElement); + while (selectedElements.hasNext()) { + selectionList.add(selectedElements.next()); + } + + // Set the selection to the widget. + // + selectionViewer.setSelection(new StructuredSelection(selectionList)); + } else // Set the input to the widget. + // + if (currentViewerPane.getViewer().getInput() != selectedElement) { + currentViewerPane.getViewer().setInput(selectedElement); + currentViewerPane.setTitle(selectedElement); + } + } + } + } + + /** + * This is for implementing {@link IEditorPart} and simply tests the command + * stack. * * @generated */ @Override public boolean isDirty() { - return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); - } + return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded(); + } /** - * This is for implementing {@link IEditorPart} and simply saves the model file. + * This is for implementing {@link IEditorPart} and simply saves the model file. + * * * @generated */ @Override - public void doSave(IProgressMonitor progressMonitor) { - // Save only resources that have actually changed. - // - final Map saveOptions = new HashMap(); - saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER); - saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED); - - // Do the work within an operation because this is a long running activity that modifies the workbench. - // - WorkspaceModifyOperation operation = - new WorkspaceModifyOperation() { - // This is the method that gets invoked when the operation runs. - // - @Override - public void execute(IProgressMonitor monitor) { - // Save the resources to the file system. - // - boolean first = true; - List resources = editingDomain.getResourceSet().getResources(); - for (int i = 0; i < resources.size(); ++i) { - Resource resource = resources.get(i); - if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) { - try { - long timeStamp = resource.getTimeStamp(); - resource.save(saveOptions); - if (resource.getTimeStamp() != timeStamp) { - savedResources.add(resource); - } - } - catch (Exception exception) { - resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception)); - } - first = false; - } - } - } - }; - - updateProblemIndication = false; - try { - // This runs the options, and shows progress. - // - new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation); - - // Refresh the necessary state. - // - ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone(); - firePropertyChange(IEditorPart.PROP_DIRTY); - } - catch (Exception exception) { - // Something went wrong that shouldn't. - // - FEditorPlugin.INSTANCE.log(exception); - } - updateProblemIndication = true; - updateProblemIndication(); - } - - /** - * This returns whether something has been persisted to the URI of the specified resource. - * The implementation uses the URI converter from the editor's resource set to try to open an input stream. - * - * @generated - */ - protected boolean isPersisted(Resource resource) { - boolean result = false; - try { - InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI()); - if (stream != null) { - result = true; - stream.close(); - } - } - catch (IOException e) { - // Ignore - } - return result; - } - - /** - * This always returns true because it is not currently supported. - * - * @generated - */ + * + * @generated + */ + protected boolean isPersisted(final Resource resource) { + boolean result = false; + try { + final InputStream stream = editingDomain.getResourceSet().getURIConverter() + .createInputStream(resource.getURI()); + if (stream != null) { + result = true; + stream.close(); + } + } catch (final IOException e) { + // Ignore + } + return result; + } + + /** + * This always returns true because it is not currently supported. + * + * @generated + */ @Override public boolean isSaveAsAllowed() { - return true; - } + return true; + } /** - * This also changes the editor's input. - * - * @generated - */ + * This also changes the editor's input. + * + * @generated + */ @Override public void doSaveAs() { - SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); - saveAsDialog.open(); - IPath path = saveAsDialog.getResult(); - if (path != null) { - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if (file != null) { - doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file)); - } - } - } - - /** - * - * @generated - */ - protected void doSaveAs(URI uri, IEditorInput editorInput) { - (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); - setInputWithNotify(editorInput); - setPartName(editorInput.getName()); - IProgressMonitor progressMonitor = - getActionBars().getStatusLineManager() != null ? - getActionBars().getStatusLineManager().getProgressMonitor() : - new NullProgressMonitor(); - doSave(progressMonitor); - } - - /** - * - * @generated - */ + final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); + saveAsDialog.open(); + final IPath path = saveAsDialog.getResult(); + if (path != null) { + final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); + if (file != null) { + doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file)); + } + } + } + + /** + * + * + * @generated + */ + protected void doSaveAs(final URI uri, final IEditorInput editorInput) { + (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); + setInputWithNotify(editorInput); + setPartName(editorInput.getName()); + final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null + ? getActionBars().getStatusLineManager().getProgressMonitor() + : new NullProgressMonitor(); + doSave(progressMonitor); + } + + /** + * + * + * @generated + */ @Override - public void gotoMarker(IMarker marker) { - List targetObjects = markerHelper.getTargetObjects(editingDomain, marker); - if (!targetObjects.isEmpty()) { - setSelectionToViewer(targetObjects); - } - } - - /** - * This is called during startup. - * - * @generated - */ + public void gotoMarker(final IMarker marker) { + final List targetObjects = markerHelper.getTargetObjects(editingDomain, marker); + if (!targetObjects.isEmpty()) { + setSelectionToViewer(targetObjects); + } + } + + /** + * This is called during startup. + * + * @generated + */ @Override - public void init(IEditorSite site, IEditorInput editorInput) { - setSite(site); - setInputWithNotify(editorInput); - setPartName(editorInput.getName()); - site.setSelectionProvider(this); - site.getPage().addPartListener(partListener); - ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); - } - - /** - * - * @generated - */ + public void init(final IEditorSite site, final IEditorInput editorInput) { + setSite(site); + setInputWithNotify(editorInput); + setPartName(editorInput.getName()); + site.setSelectionProvider(this); + site.getPage().addPartListener(partListener); + ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, + IResourceChangeEvent.POST_CHANGE); + } + + /** + * + * + * @generated + */ @Override public void setFocus() { - if (currentViewerPane != null) { - currentViewerPane.setFocus(); - } - else { - getControl(getActivePage()).setFocus(); - } - } + if (currentViewerPane != null) { + currentViewerPane.setFocus(); + } else { + getControl(getActivePage()).setFocus(); + } + } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. - * - * - * @generated - */ + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. + * + * @generated + */ @Override - public void addSelectionChangedListener(ISelectionChangedListener listener) { - selectionChangedListeners.add(listener); - } + public void addSelectionChangedListener(final ISelectionChangedListener listener) { + selectionChangedListeners.add(listener); + } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. - * - * - * @generated - */ + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. + * + * @generated + */ @Override - public void removeSelectionChangedListener(ISelectionChangedListener listener) { - selectionChangedListeners.remove(listener); - } + public void removeSelectionChangedListener(final ISelectionChangedListener listener) { + selectionChangedListeners.remove(listener); + } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. - * - * @generated - */ + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to + * return this editor's overall selection. + * + * @generated + */ @Override public ISelection getSelection() { - return editorSelection; - } + return editorSelection; + } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. - * Calling this result will notify the listeners. - * - * - * @generated - */ + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set + * this editor's overall selection. Calling this result will notify the + * listeners. + * + * @generated + */ @Override - public void setSelection(ISelection selection) { - editorSelection = selection; - - for (ISelectionChangedListener listener : selectionChangedListeners) { - listener.selectionChanged(new SelectionChangedEvent(this, selection)); - } - setStatusLineManager(selection); - } - - /** - * - * @generated - */ - public void setStatusLineManager(ISelection selection) { - IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? - contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); - - if (statusLineManager != null) { - if (selection instanceof IStructuredSelection) { - Collection collection = ((IStructuredSelection)selection).toList(); - switch (collection.size()) { - case 0: { - statusLineManager.setMessage(getString("_UI_NoObjectSelected")); - break; - } - case 1: { - String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next()); - statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); - break; - } - default: { - statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); - break; - } - } - } - else { - statusLineManager.setMessage(""); - } - } - } - - /** - * This looks up a string in the plugin's plugin.properties file. - * - * @generated - */ - private static String getString(String key) { - return FEditorPlugin.INSTANCE.getString(key); - } + public void setSelection(final ISelection selection) { + editorSelection = selection; + + for (final ISelectionChangedListener listener : selectionChangedListeners) { + listener.selectionChanged(new SelectionChangedEvent(this, selection)); + } + setStatusLineManager(selection); + } /** - * This looks up a string in plugin.properties, making a substitution. - * - * - * @generated - */ - private static String getString(String key, Object s1) { - return FEditorPlugin.INSTANCE.getString(key, new Object [] { s1 }); - } + * + * + * @generated + */ + public void setStatusLineManager(final ISelection selection) { + final IStatusLineManager statusLineManager = (currentViewer != null) && (currentViewer == contentOutlineViewer) + ? contentOutlineStatusLineManager + : getActionBars().getStatusLineManager(); + + if (statusLineManager != null) { + if (selection instanceof IStructuredSelection) { + final Collection collection = ((IStructuredSelection) selection).toList(); + switch (collection.size()) { + case 0: { + statusLineManager.setMessage(getString("_UI_NoObjectSelected")); + break; + } + case 1: { + final String text = new AdapterFactoryItemDelegator(adapterFactory) + .getText(collection.iterator().next()); + statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); + break; + } + default: { + statusLineManager + .setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); + break; + } + } + } else { + statusLineManager.setMessage(""); + } + } + } + + /** + * This looks up a string in the plugin's plugin.properties file. + * + * @generated + */ + private static String getString(final String key) { + return FEditorPlugin.INSTANCE.getString(key); + } + + /** + * This looks up a string in plugin.properties, making a substitution. + * + * @generated + */ + private static String getString(final String key, final Object s1) { + return FEditorPlugin.INSTANCE.getString(key, new Object[] { s1 }); + } /** - * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu. - * - * @generated - */ + * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill + * the context menus with contributions from the Edit menu. + * + * @generated + */ @Override - public void menuAboutToShow(IMenuManager menuManager) { - ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); - } + public void menuAboutToShow(final IMenuManager menuManager) { + ((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); + } /** - * - * @generated - */ + * + * + * @generated + */ public EditingDomainActionBarContributor getActionBarContributor() { - return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor(); - } + return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor(); + } /** - * - * @generated - */ + * + * + * @generated + */ public IActionBars getActionBars() { - return getActionBarContributor().getActionBars(); - } + return getActionBarContributor().getActionBars(); + } /** - * - * @generated - */ + * + * + * @generated + */ public AdapterFactory getAdapterFactory() { - return adapterFactory; - } + return adapterFactory; + } /** - * - * @generated - */ + * + * + * @generated + */ @Override public void dispose() { - updateProblemIndication = false; + updateProblemIndication = false; - ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); + ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); - getSite().getPage().removePartListener(partListener); + getSite().getPage().removePartListener(partListener); - adapterFactory.dispose(); + adapterFactory.dispose(); - if (getActionBarContributor().getActiveEditor() == this) { - getActionBarContributor().setActiveEditor(null); - } + if (getActionBarContributor().getActiveEditor() == this) { + getActionBarContributor().setActiveEditor(null); + } - for (PropertySheetPage propertySheetPage : propertySheetPages) { - propertySheetPage.dispose(); - } + for (final PropertySheetPage propertySheetPage : propertySheetPages) { + propertySheetPage.dispose(); + } - if (contentOutlinePage != null) { - contentOutlinePage.dispose(); - } + if (contentOutlinePage != null) { + contentOutlinePage.dispose(); + } - super.dispose(); - } + super.dispose(); + } /** - * Returns whether the outline view should be presented to the user. - * - * - * @generated - */ + * Returns whether the outline view should be presented to the user. + * + * @generated + */ protected boolean showOutlineView() { - return true; - } + return true; + } } diff --git a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorModelWizard.java b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorModelWizard.java index 4dd8e0b..c2d9473 100755 --- a/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorModelWizard.java +++ b/bundles/org.somox.sourcecodedecorator.editor/src/org/somox/sourcecodedecorator/presentation/SourcecodedecoratorModelWizard.java @@ -37,7 +37,6 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -59,270 +58,273 @@ import org.somox.sourcecodedecorator.provider.FEditPlugin; /** - * This is a simple wizard for creating a new model file. + * This is a simple wizard for creating a new model file. * * @generated */ public class SourcecodedecoratorModelWizard extends Wizard implements INewWizard { /** - * The supported extensions for created files. - * - * @generated - */ - public static final List FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameExtensions").split("\\s*,\\s*"))); + * The supported extensions for created files. + * + * @generated + */ + public static final List FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList( + FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameExtensions").split("\\s*,\\s*"))); /** - * A formatted list of supported file extensions, suitable for display. - * - * - * @generated - */ - public static final String FORMATTED_FILE_EXTENSIONS = FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); + * A formatted list of supported file extensions, suitable for display. + * + * @generated + */ + public static final String FORMATTED_FILE_EXTENSIONS = FEditorPlugin.INSTANCE + .getString("_UI_SourcecodedecoratorEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); /** - * This caches an instance of the model package. - * - * @generated - */ + * This caches an instance of the model package. + * + * @generated + */ protected SourcecodedecoratorPackage sourcecodedecoratorPackage = SourcecodedecoratorPackage.eINSTANCE; /** - * This caches an instance of the model factory. - * - * @generated - */ - protected SourcecodedecoratorFactory sourcecodedecoratorFactory = sourcecodedecoratorPackage.getSourcecodedecoratorFactory(); + * This caches an instance of the model factory. + * + * @generated + */ + protected SourcecodedecoratorFactory sourcecodedecoratorFactory = sourcecodedecoratorPackage + .getSourcecodedecoratorFactory(); /** - * This is the file creation page. - * - * @generated - */ + * This is the file creation page. + * + * @generated + */ protected SourcecodedecoratorModelWizardNewFileCreationPage newFileCreationPage; /** - * This is the initial object creation page. - * - * @generated - */ + * This is the initial object creation page. + * + * @generated + */ protected SourcecodedecoratorModelWizardInitialObjectCreationPage initialObjectCreationPage; /** - * Remember the selection during initialization for populating the default container. + * Remember the selection during initialization for populating the default + * container. * * @generated */ protected IStructuredSelection selection; /** - * Remember the workbench during initialization. - * - * @generated - */ + * Remember the workbench during initialization. + * + * @generated + */ protected IWorkbench workbench; /** - * Caches the names of the types that can be created as the root object. - * - * - * @generated - */ + * Caches the names of the types that can be created as the root object. + * + * @generated + */ protected List initialObjectNames; /** - * This just records the information. - * - * @generated - */ + * This just records the information. + * + * @generated + */ @Override - public void init(IWorkbench workbench, IStructuredSelection selection) { - this.workbench = workbench; - this.selection = selection; - setWindowTitle(FEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); - setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FEditorPlugin.INSTANCE.getImage("full/wizban/NewSourcecodedecorator"))); - } + public void init(final IWorkbench workbench, final IStructuredSelection selection) { + this.workbench = workbench; + this.selection = selection; + setWindowTitle(FEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); + setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE + .getImageDescriptor(FEditorPlugin.INSTANCE.getImage("full/wizban/NewSourcecodedecorator"))); + } /** - * Returns the names of the types that can be created as the root object. - * - * @generated - */ + * Returns the names of the types that can be created as the root object. + * + * @generated + */ protected Collection getInitialObjectNames() { - if (initialObjectNames == null) { - initialObjectNames = new ArrayList(); - for (EClassifier eClassifier : sourcecodedecoratorPackage.getEClassifiers()) { - if (eClassifier instanceof EClass) { - EClass eClass = (EClass)eClassifier; - if (!eClass.isAbstract()) { - initialObjectNames.add(eClass.getName()); - } - } - } - Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator()); - } - return initialObjectNames; - } + if (initialObjectNames == null) { + initialObjectNames = new ArrayList<>(); + for (final EClassifier eClassifier : sourcecodedecoratorPackage.getEClassifiers()) { + if ((eClassifier instanceof final EClass eClass) && !eClass.isAbstract()) { + initialObjectNames.add(eClass.getName()); + } + } + Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator()); + } + return initialObjectNames; + } /** - * Create a new model. - * - * @generated - */ + * Create a new model. + * + * @generated + */ protected EObject createInitialModel() { - EClass eClass = (EClass)sourcecodedecoratorPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName()); - EObject rootObject = sourcecodedecoratorFactory.create(eClass); - return rootObject; - } + final EClass eClass = (EClass) sourcecodedecoratorPackage + .getEClassifier(initialObjectCreationPage.getInitialObjectName()); + return sourcecodedecoratorFactory.create(eClass); + } /** - * Do the work after everything is specified. - * - * @generated - */ + * Do the work after everything is specified. + * + * @generated + */ @Override public boolean performFinish() { - try { - // Remember the file. - // - final IFile modelFile = getModelFile(); - - // Do the work within an operation. - // - WorkspaceModifyOperation operation = - new WorkspaceModifyOperation() { - @Override - protected void execute(IProgressMonitor progressMonitor) { - try { - // Create a resource set - // - ResourceSet resourceSet = new ResourceSetImpl(); - - // Get the URI of the model file. - // - URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true); - - // Create a resource for this file. - // - Resource resource = resourceSet.createResource(fileURI); - - // Add the initial model object to the contents. - // - EObject rootObject = createInitialModel(); - if (rootObject != null) { - resource.getContents().add(rootObject); - } - - // Save the contents of the resource to the file system. - // - Map options = new HashMap(); - options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding()); - resource.save(options); - } - catch (Exception exception) { - FEditorPlugin.INSTANCE.log(exception); - } - finally { - progressMonitor.done(); - } - } - }; - - getContainer().run(false, false, operation); - - // Select the new file resource in the current view. - // - IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); - IWorkbenchPage page = workbenchWindow.getActivePage(); - final IWorkbenchPart activePart = page.getActivePart(); - if (activePart instanceof ISetSelectionTarget) { - final ISelection targetSelection = new StructuredSelection(modelFile); - getShell().getDisplay().asyncExec - (new Runnable() { - @Override - public void run() { - ((ISetSelectionTarget)activePart).selectReveal(targetSelection); - } - }); - } - - // Open an editor on the new file. - // - try { - page.openEditor - (new FileEditorInput(modelFile), - workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId()); - } - catch (PartInitException exception) { - MessageDialog.openError(workbenchWindow.getShell(), FEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); - return false; - } - - return true; - } - catch (Exception exception) { - FEditorPlugin.INSTANCE.log(exception); - return false; - } - } + try { + // Remember the file. + // + final IFile modelFile = getModelFile(); + + // Do the work within an operation. + // + final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { + @Override + protected void execute(final IProgressMonitor progressMonitor) { + try { + // Create a resource set + // + final ResourceSet resourceSet = new ResourceSetImpl(); + + // Get the URI of the model file. + // + final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true); + + // Create a resource for this file. + // + final Resource resource = resourceSet.createResource(fileURI); + + // Add the initial model object to the contents. + // + final EObject rootObject = createInitialModel(); + if (rootObject != null) { + resource.getContents().add(rootObject); + } + + // Save the contents of the resource to the file system. + // + final Map options = new HashMap<>(); + options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding()); + resource.save(options); + } catch (final Exception exception) { + FEditorPlugin.INSTANCE.log(exception); + } finally { + progressMonitor.done(); + } + } + }; + + getContainer().run(false, false, operation); + + // Select the new file resource in the current view. + // + final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); + final IWorkbenchPage page = workbenchWindow.getActivePage(); + final IWorkbenchPart activePart = page.getActivePart(); + if (activePart instanceof ISetSelectionTarget) { + final ISelection targetSelection = new StructuredSelection(modelFile); + getShell().getDisplay() + .asyncExec(() -> ((ISetSelectionTarget) activePart).selectReveal(targetSelection)); + } + + // Open an editor on the new file. + // + try { + page.openEditor(new FileEditorInput(modelFile), + workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId()); + } catch (final PartInitException exception) { + MessageDialog.openError(workbenchWindow.getShell(), + FEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); + return false; + } + + return true; + } catch (final Exception exception) { + FEditorPlugin.INSTANCE.log(exception); + return false; + } + } /** - * This is the one page of the wizard. - * - * @generated - */ + * This is the one page of the wizard. + * + * @generated + */ public class SourcecodedecoratorModelWizardNewFileCreationPage extends WizardNewFileCreationPage { /** - * Pass in the selection. - * - * @generated - */ - public SourcecodedecoratorModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) { - super(pageId, selection); - } + * Pass in the selection. + * + * @generated + */ + public SourcecodedecoratorModelWizardNewFileCreationPage(final String pageId, + final IStructuredSelection selection) { + super(pageId, selection); + } /** - * The framework calls this to see if the file is correct. - * - * @generated - */ + * The framework calls this to see if the file is correct. + * + * @generated + */ @Override protected boolean validatePage() { - if (super.validatePage()) { - String extension = new Path(getFileName()).getFileExtension(); - if (extension == null || !FILE_EXTENSIONS.contains(extension)) { - String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; - setErrorMessage(FEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS })); - return false; - } - return true; - } - return false; - } + if (super.validatePage()) { + final String extension = new Path(getFileName()).getFileExtension(); + if ((extension == null) || !FILE_EXTENSIONS.contains(extension)) { + final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" + : "_WARN_FilenameExtension"; + setErrorMessage(FEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS })); + return false; + } + return true; + } + return false; + } /** - * - * @generated - */ + * + * + * @generated + */ public IFile getModelFile() { - return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName())); - } + return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName())); + } } /** - * This is the page where the type of object to create is selected. - * - * @generated - */ + * This is the page where the type of object to create is selected. + * + * @generated + */ public class SourcecodedecoratorModelWizardInitialObjectCreationPage extends WizardPage { /** - * - * @generated - */ + * + * + * @generated + */ protected Combo initialObjectField; /** @@ -331,246 +333,253 @@ public class SourcecodedecoratorModelWizardInitialObjectCreationPage extends Wiz protected List encodings; /** - * - * @generated - */ + * + * + * @generated + */ protected Combo encodingField; /** - * Pass in the selection. - * - * @generated - */ - public SourcecodedecoratorModelWizardInitialObjectCreationPage(String pageId) { - super(pageId); - } + * Pass in the selection. + * + * @generated + */ + public SourcecodedecoratorModelWizardInitialObjectCreationPage(final String pageId) { + super(pageId); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); { - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.verticalSpacing = 12; - composite.setLayout(layout); - - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.grabExcessVerticalSpace = true; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - } - - Label containerLabel = new Label(composite, SWT.LEFT); - { - containerLabel.setText(FEditorPlugin.INSTANCE.getString("_UI_ModelObject")); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - containerLabel.setLayoutData(data); - } - - initialObjectField = new Combo(composite, SWT.BORDER); - { - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - initialObjectField.setLayoutData(data); - } - - for (String objectName : getInitialObjectNames()) { - initialObjectField.add(getLabel(objectName)); - } - - if (initialObjectField.getItemCount() == 1) { - initialObjectField.select(0); - } - initialObjectField.addModifyListener(validator); - - Label encodingLabel = new Label(composite, SWT.LEFT); - { - encodingLabel.setText(FEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - encodingLabel.setLayoutData(data); - } - encodingField = new Combo(composite, SWT.BORDER); - { - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - encodingField.setLayoutData(data); - } - - for (String encoding : getEncodings()) { - encodingField.add(encoding); - } - - encodingField.select(0); - encodingField.addModifyListener(validator); - - setPageComplete(validatePage()); - setControl(composite); - } + public void createControl(final Composite parent) { + final Composite composite = new Composite(parent, SWT.NONE); + { + final GridLayout layout = new GridLayout(); + layout.numColumns = 1; + layout.verticalSpacing = 12; + composite.setLayout(layout); + + final GridData data = new GridData(); + data.verticalAlignment = GridData.FILL; + data.grabExcessVerticalSpace = true; + data.horizontalAlignment = GridData.FILL; + composite.setLayoutData(data); + } + + final Label containerLabel = new Label(composite, SWT.LEFT); + { + containerLabel.setText(FEditorPlugin.INSTANCE.getString("_UI_ModelObject")); + + final GridData data = new GridData(); + data.horizontalAlignment = GridData.FILL; + containerLabel.setLayoutData(data); + } + + initialObjectField = new Combo(composite, SWT.BORDER); + { + final GridData data = new GridData(); + data.horizontalAlignment = GridData.FILL; + data.grabExcessHorizontalSpace = true; + initialObjectField.setLayoutData(data); + } + + for (final String objectName : getInitialObjectNames()) { + initialObjectField.add(getLabel(objectName)); + } + + if (initialObjectField.getItemCount() == 1) { + initialObjectField.select(0); + } + initialObjectField.addModifyListener(validator); + + final Label encodingLabel = new Label(composite, SWT.LEFT); + { + encodingLabel.setText(FEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); + + final GridData data = new GridData(); + data.horizontalAlignment = GridData.FILL; + encodingLabel.setLayoutData(data); + } + encodingField = new Combo(composite, SWT.BORDER); + { + final GridData data = new GridData(); + data.horizontalAlignment = GridData.FILL; + data.grabExcessHorizontalSpace = true; + encodingField.setLayoutData(data); + } + + for (final String encoding : getEncodings()) { + encodingField.add(encoding); + } + + encodingField.select(0); + encodingField.addModifyListener(validator); + + setPageComplete(validatePage()); + setControl(composite); + } /** - * - * @generated - */ - protected ModifyListener validator = new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - setPageComplete(validatePage()); - } - }; + * + * + * @generated + */ + protected ModifyListener validator = e -> setPageComplete(validatePage()); /** - * - * @generated - */ + * + * + * @generated + */ protected boolean validatePage() { - return getInitialObjectName() != null && getEncodings().contains(encodingField.getText()); - } + return (getInitialObjectName() != null) && getEncodings().contains(encodingField.getText()); + } /** - * - * @generated - */ + * + * + * @generated + */ @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - if (initialObjectField.getItemCount() == 1) { - initialObjectField.clearSelection(); - encodingField.setFocus(); - } - else { - encodingField.clearSelection(); - initialObjectField.setFocus(); - } - } - } + public void setVisible(final boolean visible) { + super.setVisible(visible); + if (visible) { + if (initialObjectField.getItemCount() == 1) { + initialObjectField.clearSelection(); + encodingField.setFocus(); + } else { + encodingField.clearSelection(); + initialObjectField.setFocus(); + } + } + } /** - * - * @generated - */ + * + * + * @generated + */ public String getInitialObjectName() { - String label = initialObjectField.getText(); + final String label = initialObjectField.getText(); - for (String name : getInitialObjectNames()) { - if (getLabel(name).equals(label)) { - return name; - } - } - return null; - } + for (final String name : getInitialObjectNames()) { + if (getLabel(name).equals(label)) { + return name; + } + } + return null; + } /** - * - * @generated - */ + * + * + * @generated + */ public String getEncoding() { - return encodingField.getText(); - } + return encodingField.getText(); + } /** - * Returns the label for the specified type name. + * Returns the label for the specified type name. * * @generated */ - protected String getLabel(String typeName) { - try { - return FEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); - } - catch(MissingResourceException mre) { - FEditorPlugin.INSTANCE.log(mre); - } - return typeName; - } + protected String getLabel(final String typeName) { + try { + return FEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); + } catch (final MissingResourceException mre) { + FEditorPlugin.INSTANCE.log(mre); + } + return typeName; + } /** - * - * @generated - */ + * + * + * @generated + */ protected Collection getEncodings() { - if (encodings == null) { - encodings = new ArrayList(); - for (StringTokenizer stringTokenizer = new StringTokenizer(FEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) { - encodings.add(stringTokenizer.nextToken()); - } - } - return encodings; - } + if (encodings == null) { + encodings = new ArrayList<>(); + for (final StringTokenizer stringTokenizer = new StringTokenizer( + FEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) { + encodings.add(stringTokenizer.nextToken()); + } + } + return encodings; + } } /** - * The framework calls this to create the contents of the wizard. - * - * @generated - */ + * The framework calls this to create the contents of the wizard. + * + * @generated + */ @Override public void addPages() { - // Create a page, set the title, and the initial model file name. - // - newFileCreationPage = new SourcecodedecoratorModelWizardNewFileCreationPage("Whatever", selection); - newFileCreationPage.setTitle(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_label")); - newFileCreationPage.setDescription(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_description")); - newFileCreationPage.setFileName(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); - addPage(newFileCreationPage); - - // Try and get the resource selection to determine a current directory for the file dialog. - // - if (selection != null && !selection.isEmpty()) { - // Get the resource... - // - Object selectedElement = selection.iterator().next(); - if (selectedElement instanceof IResource) { - // Get the resource parent, if its a file. - // - IResource selectedResource = (IResource)selectedElement; - if (selectedResource.getType() == IResource.FILE) { - selectedResource = selectedResource.getParent(); - } - - // This gives us a directory... - // - if (selectedResource instanceof IFolder || selectedResource instanceof IProject) { - // Set this for the container. - // - newFileCreationPage.setContainerFullPath(selectedResource.getFullPath()); - - // Make up a unique new name here. - // - String defaultModelBaseFilename = FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameDefaultBase"); - String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0); - String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; - for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) { - modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; - } - newFileCreationPage.setFileName(modelFilename); - } - } - } - initialObjectCreationPage = new SourcecodedecoratorModelWizardInitialObjectCreationPage("Whatever2"); - initialObjectCreationPage.setTitle(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_label")); - initialObjectCreationPage.setDescription(FEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); - addPage(initialObjectCreationPage); - } + // Create a page, set the title, and the initial model file name. + // + newFileCreationPage = new SourcecodedecoratorModelWizardNewFileCreationPage("Whatever", selection); + newFileCreationPage.setTitle(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_label")); + newFileCreationPage + .setDescription(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_description")); + newFileCreationPage + .setFileName(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorEditorFilenameDefaultBase") + "." + + FILE_EXTENSIONS.get(0)); + addPage(newFileCreationPage); + + // Try and get the resource selection to determine a current directory for the + // file dialog. + // + if ((selection != null) && !selection.isEmpty()) { + // Get the resource... + // + final Object selectedElement = selection.iterator().next(); + if (selectedElement instanceof IResource selectedResource) { + if (selectedResource.getType() == IResource.FILE) { + selectedResource = selectedResource.getParent(); + } + + // This gives us a directory... + // + if ((selectedResource instanceof IFolder) || (selectedResource instanceof IProject)) { + // Set this for the container. + // + newFileCreationPage.setContainerFullPath(selectedResource.getFullPath()); + + // Make up a unique new name here. + // + final String defaultModelBaseFilename = FEditorPlugin.INSTANCE + .getString("_UI_SourcecodedecoratorEditorFilenameDefaultBase"); + final String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0); + String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; + for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) { + modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; + } + newFileCreationPage.setFileName(modelFilename); + } + } + } + initialObjectCreationPage = new SourcecodedecoratorModelWizardInitialObjectCreationPage("Whatever2"); + initialObjectCreationPage + .setTitle(FEditorPlugin.INSTANCE.getString("_UI_SourcecodedecoratorModelWizard_label")); + initialObjectCreationPage + .setDescription(FEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); + addPage(initialObjectCreationPage); + } /** - * Get the file from the page. - * - * @generated - */ + * Get the file from the page. + * + * @generated + */ public IFile getModelFile() { - return newFileCreationPage.getModelFile(); - } + return newFileCreationPage.getModelFile(); + } } diff --git a/bundles/org.somox.sourcecodedecorator/META-INF/MANIFEST.MF b/bundles/org.somox.sourcecodedecorator/META-INF/MANIFEST.MF index a2f7e16..90b6097 100644 --- a/bundles/org.somox.sourcecodedecorator/META-INF/MANIFEST.MF +++ b/bundles/org.somox.sourcecodedecorator/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.somox.sourcecodedecorator, org.somox.sourcecodedecorator.impl, org.somox.sourcecodedecorator.util -Require-Bundle: org.eclipse.core.runtime, +Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, de.uka.ipd.sdq.identifier;visibility:=reexport, @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime, de.uka.ipd.sdq.units;visibility:=reexport, org.palladiosimulator.pcm;visibility:=reexport, de.uka.ipd.sdq.probfunction;visibility:=reexport, - org.emftext.language.java;visibility:=reexport, - org.emftext.language.java.edit + tools.mdsd.jamopp.model.java;visibility:=reexport, + tools.mdsd.jamopp.model.java.edit;visibility:=reexport Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.somox.sourcecodedecorator diff --git a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.aird b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.aird index 5503af3..6803a53 100755 --- a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.aird +++ b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.aird @@ -586,7 +586,7 @@ - + KEEP_LOCATION @@ -620,7 +620,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -642,7 +642,7 @@ - + KEEP_LOCATION @@ -656,7 +656,7 @@ - + diff --git a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.ecore b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.ecore index f53fdc7..085a5d9 100755 --- a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.ecore +++ b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.ecore @@ -18,7 +18,7 @@ + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//containers/CompilationUnit" /> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#_Wo2YzNz1Ed2bJ_pQViWxFg" /> @@ -109,7 +109,7 @@ + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//classifiers/ConcreteClassifier" /> @@ -134,7 +134,7 @@ ordered="false" lowerBound="1" upperBound="-1" - eType="ecore:EClass ../../org.emftext.language.java/metamodel/java.ecore#//classifiers/ConcreteClassifier" /> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//classifiers/ConcreteClassifier" /> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#_Wo2ZO9z1Ed2bJ_pQViWxFg" /> @@ -188,7 +188,7 @@ name="InnerDatatypeSourceCodeLink"> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//members/Field" /> @@ -197,7 +197,7 @@ name="AbstractActionClassMethodLink"> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//members/ClassMethod" /> @@ -216,7 +216,7 @@ + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//members/Member" /> @@ -227,7 +227,7 @@ + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#//statements/StatementListContainer" /> @@ -239,6 +239,6 @@ name="statement" lowerBound="1" upperBound="-1" - eType="ecore:EClass ../../org.emftext.language.java/metamodel/java.ecore#_Wo2YzNz1Ed2bJ_pQViWxFg" /> + eType="ecore:EClass ../../tools.mdsd.jamopp.model.java/metamodel/java.ecore#_Wo2YzNz1Ed2bJ_pQViWxFg" /> diff --git a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.genmodel b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.genmodel index 55940a6..acd5cb4 100755 --- a/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.genmodel +++ b/bundles/org.somox.sourcecodedecorator/model/sourcecodedecorator.genmodel @@ -1,10 +1,13 @@ - + sourcecodedecorator.ecore diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractActionClassMethodLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractActionClassMethodLink.java index e37303c..2ae333f 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractActionClassMethodLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractActionClassMethodLink.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.members.ClassMethod; import org.palladiosimulator.pcm.seff.AbstractAction; +import tools.mdsd.jamopp.model.java.members.ClassMethod; + /** * A representation of the model object ' * Abstract Action Class Method Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractMethodLevelSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractMethodLevelSourceCodeLink.java index a4a38bd..bed1532 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractMethodLevelSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/AbstractMethodLevelSourceCodeLink.java @@ -2,7 +2,7 @@ */ package org.somox.sourcecodedecorator; -import org.emftext.language.java.members.Member; +import tools.mdsd.jamopp.model.java.members.Member; /** * A representation of the model object ' diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ComponentImplementingClassesLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ComponentImplementingClassesLink.java index 4f000ab..6c122ce 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ComponentImplementingClassesLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ComponentImplementingClassesLink.java @@ -4,9 +4,10 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.palladiosimulator.pcm.repository.RepositoryComponent; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * A representation of the model object ' * Component Implementing Classes Link'. @@ -98,7 +99,7 @@ public interface ComponentImplementingClassesLink extends EObject { /** * Returns the value of the 'Implementing Classes' reference * list. The list contents are of type - * {@link org.emftext.language.java.classifiers.ConcreteClassifier}. *

        * If the meaning of the 'Implementing Classes' reference list isn't diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ControlFlowLevelSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ControlFlowLevelSourceCodeLink.java index 95a9e3e..3d72c8e 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ControlFlowLevelSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/ControlFlowLevelSourceCodeLink.java @@ -2,9 +2,10 @@ */ package org.somox.sourcecodedecorator; -import org.emftext.language.java.statements.Statement; import org.palladiosimulator.pcm.seff.AbstractAction; +import tools.mdsd.jamopp.model.java.statements.Statement; + /** * A representation of the model object ' Control * Flow Level Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/DataTypeSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/DataTypeSourceCodeLink.java index efcb57e..74e622f 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/DataTypeSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/DataTypeSourceCodeLink.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.common.util.EList; -import org.emftext.language.java.types.Type; import org.palladiosimulator.pcm.repository.DataType; +import tools.mdsd.jamopp.model.java.types.Type; + /** * A representation of the model object ' Data * Type Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/FileLevelSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/FileLevelSourceCodeLink.java index ed7a839..fc744ad 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/FileLevelSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/FileLevelSourceCodeLink.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.containers.CompilationUnit; import org.palladiosimulator.pcm.repository.RepositoryComponent; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; + /** * A representation of the model object ' File * Level Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InnerDatatypeSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InnerDatatypeSourceCodeLink.java index b6559f6..b55e895 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InnerDatatypeSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InnerDatatypeSourceCodeLink.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.members.Field; import org.palladiosimulator.pcm.repository.InnerDeclaration; +import tools.mdsd.jamopp.model.java.members.Field; + /** * A representation of the model object ' Inner * Datatype Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InterfaceSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InterfaceSourceCodeLink.java index e58c278..aa5ec37 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InterfaceSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/InterfaceSourceCodeLink.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.palladiosimulator.pcm.repository.Interface; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * A representation of the model object ' * Interface Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SEFF2MethodMapping.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SEFF2MethodMapping.java index 6650648..285d77a 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SEFF2MethodMapping.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SEFF2MethodMapping.java @@ -3,9 +3,10 @@ package org.somox.sourcecodedecorator; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.seff.ServiceEffectSpecification; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; + /** * A representation of the model object 'SEFF2 * Method Mapping'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SeffElementSourceCodeLink.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SeffElementSourceCodeLink.java index 9128ff8..0954e65 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SeffElementSourceCodeLink.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/SeffElementSourceCodeLink.java @@ -4,9 +4,9 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.emftext.language.java.statements.Statement; import de.uka.ipd.sdq.identifier.Identifier; +import tools.mdsd.jamopp.model.java.statements.Statement; /** * A representation of the model object 'Seff @@ -58,8 +58,9 @@ public interface SeffElementSourceCodeLink extends EObject { /** * Returns the value of the 'Statement' reference list. The list - * contents are of type {@link org.emftext.language.java.statements.Statement}. - * + * contents are of type + * {@link tools.mdsd.jamopp.model.java.statements.Statement}. *

        * If the meaning of the 'Statement' reference list isn't clear, there * really should be more of a description here... diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractActionClassMethodLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractActionClassMethodLinkImpl.java index 810cd8f..7956b6c 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractActionClassMethodLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractActionClassMethodLinkImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.members.ClassMethod; import org.palladiosimulator.pcm.seff.AbstractAction; import org.somox.sourcecodedecorator.AbstractActionClassMethodLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.members.ClassMethod; + /** * An implementation of the model object ' * Abstract Action Class Method Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractMethodLevelSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractMethodLevelSourceCodeLinkImpl.java index ddfcff2..c79deda 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractMethodLevelSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/AbstractMethodLevelSourceCodeLinkImpl.java @@ -6,10 +6,11 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.emftext.language.java.members.Member; import org.somox.sourcecodedecorator.AbstractMethodLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.members.Member; + /** * An implementation of the model object ' * Abstract Method Level Source Code Link'. An implementation of the model object ' * Component Implementing Classes Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/ControlFlowLevelSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/ControlFlowLevelSourceCodeLinkImpl.java index e2aab29..d6e1978 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/ControlFlowLevelSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/ControlFlowLevelSourceCodeLinkImpl.java @@ -7,11 +7,12 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.emftext.language.java.statements.Statement; import org.palladiosimulator.pcm.seff.AbstractAction; import org.somox.sourcecodedecorator.ControlFlowLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.statements.Statement; + /** * An implementation of the model object ' * Control Flow Level Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/DataTypeSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/DataTypeSourceCodeLinkImpl.java index 6214d55..2e7dec6 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/DataTypeSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/DataTypeSourceCodeLinkImpl.java @@ -13,12 +13,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.emftext.language.java.types.Type; import org.palladiosimulator.pcm.repository.DataType; import org.somox.sourcecodedecorator.DataTypeSourceCodeLink; import org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.types.Type; + /** * An implementation of the model object ' Data * Type Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/FileLevelSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/FileLevelSourceCodeLinkImpl.java index 2c27ebf..61e150f 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/FileLevelSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/FileLevelSourceCodeLinkImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.containers.CompilationUnit; import org.palladiosimulator.pcm.repository.RepositoryComponent; import org.somox.sourcecodedecorator.FileLevelSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.containers.CompilationUnit; + /** * An implementation of the model object ' File * Level Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InnerDatatypeSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InnerDatatypeSourceCodeLinkImpl.java index 77d73b0..440e157 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InnerDatatypeSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InnerDatatypeSourceCodeLinkImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.members.Field; import org.palladiosimulator.pcm.repository.InnerDeclaration; import org.somox.sourcecodedecorator.InnerDatatypeSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.members.Field; + /** * An implementation of the model object ' Inner * Datatype Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InterfaceSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InterfaceSourceCodeLinkImpl.java index b468676..658d505 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InterfaceSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/InterfaceSourceCodeLinkImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.classifiers.ConcreteClassifier; import org.palladiosimulator.pcm.repository.Interface; import org.somox.sourcecodedecorator.InterfaceSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier; + /** * An implementation of the model object ' * Interface Source Code Link'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SEFF2MethodMappingImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SEFF2MethodMappingImpl.java index 13fdced..9e31644 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SEFF2MethodMappingImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SEFF2MethodMappingImpl.java @@ -8,11 +8,12 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.emftext.language.java.statements.StatementListContainer; import org.palladiosimulator.pcm.seff.ServiceEffectSpecification; import org.somox.sourcecodedecorator.SEFF2MethodMapping; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; +import tools.mdsd.jamopp.model.java.statements.StatementListContainer; + /** * An implementation of the model object 'SEFF2 * Method Mapping'. diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SeffElementSourceCodeLinkImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SeffElementSourceCodeLinkImpl.java index 72b4d08..7b93b39 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SeffElementSourceCodeLinkImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SeffElementSourceCodeLinkImpl.java @@ -12,11 +12,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectResolvingEList; -import org.emftext.language.java.statements.Statement; import org.somox.sourcecodedecorator.SeffElementSourceCodeLink; import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; import de.uka.ipd.sdq.identifier.Identifier; +import tools.mdsd.jamopp.model.java.statements.Statement; /** * An implementation of the model object 'Seff diff --git a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SourcecodedecoratorPackageImpl.java b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SourcecodedecoratorPackageImpl.java index afa08b0..4297263 100755 --- a/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SourcecodedecoratorPackageImpl.java +++ b/bundles/org.somox.sourcecodedecorator/src/org/somox/sourcecodedecorator/impl/SourcecodedecoratorPackageImpl.java @@ -7,24 +7,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.emftext.language.java.annotations.AnnotationsPackage; -import org.emftext.language.java.arrays.ArraysPackage; -import org.emftext.language.java.classifiers.ClassifiersPackage; -import org.emftext.language.java.commons.CommonsPackage; -import org.emftext.language.java.containers.ContainersPackage; -import org.emftext.language.java.expressions.ExpressionsPackage; -import org.emftext.language.java.generics.GenericsPackage; -import org.emftext.language.java.imports.ImportsPackage; -import org.emftext.language.java.instantiations.InstantiationsPackage; -import org.emftext.language.java.literals.LiteralsPackage; -import org.emftext.language.java.members.MembersPackage; -import org.emftext.language.java.modifiers.ModifiersPackage; -import org.emftext.language.java.operators.OperatorsPackage; -import org.emftext.language.java.parameters.ParametersPackage; -import org.emftext.language.java.references.ReferencesPackage; -import org.emftext.language.java.statements.StatementsPackage; -import org.emftext.language.java.types.TypesPackage; -import org.emftext.language.java.variables.VariablesPackage; import org.palladiosimulator.pcm.PcmPackage; import org.palladiosimulator.pcm.repository.RepositoryPackage; import org.palladiosimulator.pcm.seff.SeffPackage; @@ -47,6 +29,24 @@ import org.somox.sourcecodedecorator.SourcecodedecoratorPackage; import de.uka.ipd.sdq.identifier.IdentifierPackage; +import tools.mdsd.jamopp.model.java.annotations.AnnotationsPackage; +import tools.mdsd.jamopp.model.java.arrays.ArraysPackage; +import tools.mdsd.jamopp.model.java.classifiers.ClassifiersPackage; +import tools.mdsd.jamopp.model.java.commons.CommonsPackage; +import tools.mdsd.jamopp.model.java.containers.ContainersPackage; +import tools.mdsd.jamopp.model.java.expressions.ExpressionsPackage; +import tools.mdsd.jamopp.model.java.generics.GenericsPackage; +import tools.mdsd.jamopp.model.java.imports.ImportsPackage; +import tools.mdsd.jamopp.model.java.instantiations.InstantiationsPackage; +import tools.mdsd.jamopp.model.java.literals.LiteralsPackage; +import tools.mdsd.jamopp.model.java.members.MembersPackage; +import tools.mdsd.jamopp.model.java.modifiers.ModifiersPackage; +import tools.mdsd.jamopp.model.java.operators.OperatorsPackage; +import tools.mdsd.jamopp.model.java.parameters.ParametersPackage; +import tools.mdsd.jamopp.model.java.references.ReferencesPackage; +import tools.mdsd.jamopp.model.java.statements.StatementsPackage; +import tools.mdsd.jamopp.model.java.types.TypesPackage; +import tools.mdsd.jamopp.model.java.variables.VariablesPackage; /** * An implementation of the model Package.