Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Wagelaar2018-01-08 09:07:52 -0500
committerDennis Wagelaar2018-01-08 09:09:55 -0500
commit3eed509aa69167c06b3c55992fabdcef21db2a84 (patch)
tree2bb716708f8f84b78ff66a78d342021181c929e6
parentd8ba2bbe174181d03c42b440c93afdfca6fa9801 (diff)
downloadorg.eclipse.atl-3eed509aa69167c06b3c55992fabdcef21db2a84.tar.gz
org.eclipse.atl-3eed509aa69167c06b3c55992fabdcef21db2a84.tar.xz
org.eclipse.atl-3eed509aa69167c06b3c55992fabdcef21db2a84.zip
415863: Support (multiple) virtual dispatch for lazy rules
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=415863
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetSuperItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java13
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java819
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm.launcher/plugin.xml7
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore11
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.genmodel6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java4
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java4
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java4
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java52
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java6
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java11
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetSuperImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java1047
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java2
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java93
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java33
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest-trace.xmi4
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.atl21
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.emftvmbin3647 -> 3810 bytes
189 files changed, 1247 insertions, 1985 deletions
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF
index 71597892..b3935ca4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.m2m.atl.emftvm.trace;visibility:=reexport,
- org.eclipse.m2m.atl.emftvm.trace.edit
+ org.eclipse.m2m.atl.emftvm.trace.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java
index 7bc870bc..b1f3655f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AddItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Add} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class AddItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java
index 661ab952..6306edde 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstInItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.AllinstIn} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class AllinstInItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java
index 5d3efe69..19426e68 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AllinstItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Allinst} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class AllinstItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java
index e408a374..8cea5d21 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/AndItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.And} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class AndItemProvider
- extends CodeBlockInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends CodeBlockInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java
index 882e79df..d1874c20 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/BranchInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.BranchInstruction;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
* @generated
*/
public class BranchInstructionItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java
index 1cd5d090..b3e3fe35 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/CodeBlockInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.CodeBlockInstruction;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
* @generated
*/
public class CodeBlockInstructionItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java
index cd384004..a8ed089f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DeleteItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Delete} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class DeleteItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java
index a72081d3..bc64d8b8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Dup} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class DupItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java
index b11c0bd1..7203b9da 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/DupX1ItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.DupX1} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class DupX1ItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java
index 95634682..f82d9fb3 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/EnditerateItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Enditerate} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class EnditerateItemProvider
- extends BranchInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends BranchInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java
index 177433f3..d719da44 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FeatureItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.Feature;
* @generated
*/
public class FeatureItemProvider
- extends TypedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends TypedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java
index 5f2f796b..f7770ab2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.FieldInstruction;
* @generated
*/
public class FieldInstructionItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java
index d7e479d6..4e4a6e11 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FieldItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
@@ -38,13 +33,7 @@ import org.eclipse.m2m.atl.emftvm.Field;
* @generated
*/
public class FieldItemProvider
- extends FeatureItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FeatureItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java
index 0b2c7007..9a1fd00a 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.Findtype;
* @generated
*/
public class FindtypeItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java
index 5951a5ab..c3b35730 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/FindtypeSItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.FindtypeS} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class FindtypeSItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java
index 118e5ae2..1a4eb8d7 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Get} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java
index 824c9e44..bec05024 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetStaticItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.GetStatic} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetStaticItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetSuperItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetSuperItemProvider.java
index 4fab94a5..46fcd2ec 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetSuperItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetSuperItemProvider.java
@@ -9,12 +9,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.GetSuper} object.
@@ -23,13 +18,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetSuperItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java
index dd19d7d7..43319aed 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetTransItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.GetTrans} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetTransItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java
index cc9e6ac9..203a229f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetcbItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Getcb} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetcbItemProvider
- extends CodeBlockInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends CodeBlockInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java
index 2f598827..b4fac079 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Getenv} object.
@@ -32,13 +27,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetenvItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java
index 1015fea0..2d4791bb 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GetenvtypeItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Getenvtype} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GetenvtypeItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java
index 51d535d8..0520ed17 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/GotoItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Goto} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class GotoItemProvider
- extends BranchInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends BranchInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java
index 44a522e6..6b286e94 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.If} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class IfItemProvider
- extends BranchInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends BranchInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java
index 67e1f586..92d5bd79 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfnItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Ifn} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class IfnItemProvider
- extends BranchInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends BranchInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java
index ae4900a2..aa984c47 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IfteItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.Ifte;
* @generated
*/
public class IfteItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java
index 8f893a28..b89847d9 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ImpliesItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Implies} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class ImpliesItemProvider
- extends CodeBlockInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends CodeBlockInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java
index f09c2317..2438b596 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InputRuleElementItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
@@ -38,13 +33,7 @@ import org.eclipse.m2m.atl.emftvm.InputRuleElement;
* @generated
*/
public class InputRuleElementItemProvider
- extends RuleElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends RuleElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java
index d739de4f..a71b964b 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InsertItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Insert} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InsertItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java
index 670eb04a..fe270485 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeAllCbsItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.InvokeAllCbs} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InvokeAllCbsItemProvider
- extends InvokeInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java
index 46446351..99d5d65f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.InvokeCb;
* @generated
*/
public class InvokeCbItemProvider
- extends CodeBlockInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends CodeBlockInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java
index 6167ff97..a6661e95 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeCbSItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.InvokeCbS} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InvokeCbSItemProvider
- extends InvokeInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java
index 414403ff..2b4883cb 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.InvokeInstruction;
* @generated
*/
public class InvokeInstructionItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java
index 40af27c7..a3a0a5a1 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Invoke} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InvokeItemProvider
- extends InvokeOperationInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeOperationInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java
index 14d418c9..947da1d8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeOperationInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.InvokeOperationInstruction;
* @generated
*/
public class InvokeOperationInstructionItemProvider
- extends InvokeInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java
index 6f693f66..00c0cdb2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeStaticItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.InvokeStatic} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InvokeStaticItemProvider
- extends InvokeOperationInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeOperationInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java
index f90460a6..6847f870 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/InvokeSuperItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.InvokeSuper} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class InvokeSuperItemProvider
- extends InvokeOperationInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeOperationInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java
index 91ec3e68..6708fb78 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IsnullItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Isnull} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class IsnullItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java
index d010b798..944e52c7 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/IterateItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Iterate} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class IterateItemProvider
- extends BranchInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends BranchInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java
index a7000a4a..9c34acb0 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LoadItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Load} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class LoadItemProvider
- extends LocalVariableInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends LocalVariableInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java
index 562faaaf..e9f4558d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableInstructionItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.LocalVariableInstruction;
* @generated
*/
public class LocalVariableInstructionItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java
index 6b1bdacc..71240558 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/LocalVariableItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.LocalVariable;
* @generated
*/
public class LocalVariableItemProvider
- extends TypedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends TypedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java
index b4f92322..278a0d4d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.Match;
* @generated
*/
public class MatchItemProvider
- extends InvokeInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java
index 859ffc3d..60191258 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MatchSItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.MatchS} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class MatchSItemProvider
- extends InvokeInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InvokeInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java
index f1e54ea8..d7adbce0 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/MetamodelItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.m2m.atl.emftvm.Metamodel;
/**
@@ -33,13 +28,7 @@ import org.eclipse.m2m.atl.emftvm.Metamodel;
* @generated
*/
public class MetamodelItemProvider
- extends ModelItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends ModelItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java
index 85b2ca38..e7618f45 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ModuleItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
@@ -38,13 +33,7 @@ import org.eclipse.m2m.atl.emftvm.Module;
* @generated
*/
public class ModuleItemProvider
- extends NamedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends NamedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java
index 603e5b69..9062c8f8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.New;
* @generated
*/
public class NewItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java
index ec0678be..8a5be92f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NewSItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.NewS} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class NewSItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java
index 644ee052..0d033937 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/NotItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Not} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class NotItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java
index ae836eef..73f947c3 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OperationItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
@@ -38,13 +33,7 @@ import org.eclipse.m2m.atl.emftvm.Operation;
* @generated
*/
public class OperationItemProvider
- extends FeatureItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FeatureItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java
index f1a18835..20798e81 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OrItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Or} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class OrItemProvider
- extends CodeBlockInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends CodeBlockInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java
index 3418341b..09b597f7 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/OutputRuleElementItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
import org.eclipse.m2m.atl.emftvm.OutputRuleElement;
@@ -34,13 +29,7 @@ import org.eclipse.m2m.atl.emftvm.OutputRuleElement;
* @generated
*/
public class OutputRuleElementItemProvider
- extends RuleElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends RuleElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java
index 067c8789..b9706628 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ParameterItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.m2m.atl.emftvm.Parameter;
/**
@@ -32,13 +27,7 @@ import org.eclipse.m2m.atl.emftvm.Parameter;
* @generated
*/
public class ParameterItemProvider
- extends TypedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends TypedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java
index 18fbdb2c..2cb4f92e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PopItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Pop} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class PopItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java
index 1690028c..8cde7947 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.Push;
* @generated
*/
public class PushItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java
index 7c43ab46..9905e9b8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushfItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Pushf} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class PushfItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java
index 05d58084..5cdebd17 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/PushtItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Pusht} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class PushtItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java
index 508b1809..3b567631 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RemoveItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Remove} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class RemoveItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java
index 2aeb0ab5..4401edbd 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/ReturnItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Return} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class ReturnItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java
index 9c059a9e..0eeffaa4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleElementItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.RuleElement;
* @generated
*/
public class RuleElementItemProvider
- extends TypedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends TypedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java
index 3b873bd0..8049895d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/RuleItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
@@ -38,13 +33,7 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* @generated
*/
public class RuleItemProvider
- extends NamedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends NamedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java
index 853ee8e5..296ab13f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Set} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class SetItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java
index 5378d60d..abcc022d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SetStaticItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.SetStatic} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class SetStaticItemProvider
- extends FieldInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends FieldInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java
index 98d53fc6..b173fc95 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/StoreItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Store} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class StoreItemProvider
- extends LocalVariableInstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends LocalVariableInstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java
index 9f241b88..8d18f48f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Swap} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class SwapItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java
index f745353f..e799615f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/SwapX1ItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.SwapX1} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class SwapX1ItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java
index 1b7631de..83b96153 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/TypedElementItemProvider.java
@@ -17,12 +17,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
@@ -36,13 +31,7 @@ import org.eclipse.m2m.atl.emftvm.TypedElement;
* @generated
*/
public class TypedElementItemProvider
- extends NamedElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends NamedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java
index 4994e55d..6b0c1f12 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.edit/src/org/eclipse/m2m/atl/emftvm/provider/XorItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.m2m.atl.emftvm.Xor} object.
@@ -31,13 +26,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* @generated
*/
public class XorItemProvider
- extends InstructionItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+ extends InstructionItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF
index 77159fee..758e5f4d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.emf.validation;bundle-version="1.4.0",
- org.eclipse.m2m.atl.emftvm.trace.edit
+ org.eclipse.m2m.atl.emftvm.trace.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java
index 00d2a149..e1e20365 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm.editor/src/org/eclipse/m2m/atl/emftvm/presentation/EmftvmEditor.java
@@ -135,8 +135,8 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* @generated
*/
public class EmftvmEditor
- extends MultiPageEditorPart
- implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+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.
* <!-- begin-user-doc -->
@@ -292,38 +292,38 @@ public class EmftvmEditor
* @generated
*/
protected IPartListener partListener =
- new IPartListener() {
- public void partActivated(IWorkbenchPart p) {
- if (p instanceof ContentOutline) {
- if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
- getActionBarContributor().setActiveEditor(EmftvmEditor.this);
+ new IPartListener() {
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(EmftvmEditor.this);
- setCurrentViewer(contentOutlineViewer);
- }
- }
- else if (p instanceof PropertySheet) {
- if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
- getActionBarContributor().setActiveEditor(EmftvmEditor.this);
- handleActivate();
- }
+ setCurrentViewer(contentOutlineViewer);
}
- else if (p == EmftvmEditor.this) {
+ }
+ else if (p instanceof PropertySheet) {
+ if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+ getActionBarContributor().setActiveEditor(EmftvmEditor.this);
handleActivate();
}
}
- public void partBroughtToTop(IWorkbenchPart p) {
- // Ignore.
- }
- public void partClosed(IWorkbenchPart p) {
- // Ignore.
+ else if (p == EmftvmEditor.this) {
+ handleActivate();
}
- public void partDeactivated(IWorkbenchPart p) {
- // Ignore.
- }
- public void partOpened(IWorkbenchPart p) {
- // Ignore.
- }
- };
+ }
+ public void partBroughtToTop(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partClosed(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partDeactivated(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partOpened(IWorkbenchPart p) {
+ // Ignore.
+ }
+ };
/**
* Resources that have been removed since last activation.
@@ -371,60 +371,60 @@ public class EmftvmEditor
* <!-- end-user-doc -->
* @generated
*/
- protected EContentAdapter problemIndicationAdapter =
- new EContentAdapter() {
- @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);
- }
+ protected EContentAdapter problemIndicationAdapter =
+ new EContentAdapter() {
+ protected boolean dispatching;
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
- }
- break;
- }
+ @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: {
+ 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);
}
}
-
- @Override
- protected void setTarget(Resource target) {
- basicSetTarget(target);
+ else {
+ super.notifyChanged(notification);
}
+ }
- @Override
- protected void unsetTarget(Resource target) {
- basicUnsetTarget(target);
- resourceToDiagnosticMap.remove(target);
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
- }
+ protected void dispatchUpdateProblemIndication() {
+ if (updateProblemIndication && !dispatching) {
+ dispatching = true;
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ 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.
@@ -433,76 +433,76 @@ public class EmftvmEditor
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
- new IResourceChangeListener() {
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
- protected ResourceSet resourceSet = editingDomain.getResourceSet();
- protected Collection<Resource> changedResources = new ArrayList<Resource>();
- protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
- 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);
- }
+ new IResourceChangeListener() {
+ public void resourceChanged(IResourceChangeEvent event) {
+ final IResourceDelta delta = event.getDelta();
+ try {
+ class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+ protected ResourceSet resourceSet = editingDomain.getResourceSet();
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+ public boolean visit(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<Resource> getChangedResources() {
- return changedResources;
+ return false;
}
- public Collection<Resource> getRemovedResources() {
- return removedResources;
- }
+ return true;
}
- final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty()) {
- getSite().getPage().closeEditor(EmftvmEditor.this, false);
- }
- }
- });
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
}
- if (!visitor.getChangedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- changedResources.addAll(visitor.getChangedResources());
- if (getSite().getPage().getActiveEditor() == EmftvmEditor.this) {
- handleActivate();
- }
- }
- });
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
}
}
- catch (CoreException exception) {
- EmftvmEditorPlugin.INSTANCE.log(exception);
+
+ final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+ delta.accept(visitor);
+
+ if (!visitor.getRemovedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ removedResources.addAll(visitor.getRemovedResources());
+ if (!isDirty()) {
+ getSite().getPage().closeEditor(EmftvmEditor.this, false);
+ }
+ }
+ });
+ }
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == EmftvmEditor.this) {
+ handleActivate();
+ }
+ }
+ });
}
}
- };
+ catch (final CoreException exception) {
+ EmftvmEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
/**
* Handles activation of the editor or it's associated views.
@@ -514,11 +514,11 @@ public class EmftvmEditor
// Recompute the read only state.
//
if (editingDomain.getResourceToReadOnlyMap() != null) {
- editingDomain.getResourceToReadOnlyMap().clear();
+ editingDomain.getResourceToReadOnlyMap().clear();
- // Refresh any actions that may become enabled or disabled.
- //
- setSelection(getSelection());
+ // Refresh any actions that may become enabled or disabled.
+ //
+ setSelection(getSelection());
}
if (!removedResources.isEmpty()) {
@@ -553,13 +553,13 @@ public class EmftvmEditor
editingDomain.getCommandStack().flush();
updateProblemIndication = false;
- for (Resource resource : changedResources) {
+ for (final Resource resource : changedResources) {
if (resource.isLoaded()) {
resource.unload();
try {
resource.load(Collections.EMPTY_MAP);
}
- catch (IOException exception) {
+ catch (final IOException exception) {
if (!resourceToDiagnosticMap.containsKey(resource)) {
resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
@@ -575,7 +575,7 @@ public class EmftvmEditor
updateProblemIndication();
}
}
-
+
/**
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
@@ -584,14 +584,14 @@ public class EmftvmEditor
*/
protected void updateProblemIndication() {
if (updateProblemIndication) {
- BasicDiagnostic diagnostic =
- new BasicDiagnostic
+ final BasicDiagnostic diagnostic =
+ new BasicDiagnostic
(Diagnostic.OK,
- "org.eclipse.m2m.atl.emftvm.editor",
- 0,
- null,
- new Object [] { editingDomain.getResourceSet() });
- for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+ "org.eclipse.m2m.atl.emftvm.editor",
+ 0,
+ null,
+ new Object [] { editingDomain.getResourceSet() });
+ for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
if (childDiagnostic.getSeverity() != Diagnostic.OK) {
diagnostic.add(childDiagnostic);
}
@@ -605,7 +605,7 @@ public class EmftvmEditor
}
}
else if (diagnostic.getSeverity() != Diagnostic.OK) {
- ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+ final ProblemEditorPart problemEditorPart = new ProblemEditorPart();
problemEditorPart.setDiagnostic(diagnostic);
problemEditorPart.setMarkerHelper(markerHelper);
try {
@@ -614,7 +614,7 @@ public class EmftvmEditor
setActivePage(lastEditorPage);
showTabs();
}
- catch (PartInitException exception) {
+ catch (final PartInitException exception) {
EmftvmEditorPlugin.INSTANCE.log(exception);
}
}
@@ -625,7 +625,7 @@ public class EmftvmEditor
try {
markerHelper.createMarkers(diagnostic);
}
- catch (CoreException exception) {
+ catch (final CoreException exception) {
EmftvmEditorPlugin.INSTANCE.log(exception);
}
}
@@ -641,10 +641,10 @@ public class EmftvmEditor
*/
protected boolean handleDirtyConflict() {
return
- MessageDialog.openQuestion
+ MessageDialog.openQuestion
(getSite().getShell(),
- getString("_UI_FileConflict_label"),
- getString("_WARN_FileConflict"));
+ getString("_UI_FileConflict_label"),
+ getString("_WARN_FileConflict"));
}
/**
@@ -677,37 +677,37 @@ public class EmftvmEditor
// Create the command stack that will notify this editor as commands are executed.
//
- BasicCommandStack commandStack = new BasicCommandStack();
+ 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
- (new CommandStackListener() {
- public void commandStackChanged(final EventObject event) {
- getContainer().getDisplay().asyncExec
- (new Runnable() {
- 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<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
- PropertySheetPage propertySheetPage = i.next();
- if (propertySheetPage.getControl().isDisposed()) {
- i.remove();
- }
- else {
- propertySheetPage.refresh();
- }
- }
- }
- });
- }
- });
+ (new CommandStackListener() {
+ public void commandStackChanged(final EventObject event) {
+ getContainer().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ 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<PropertySheetPage> 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.
//
@@ -720,7 +720,7 @@ public class EmftvmEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
+ @Override
protected void firePropertyChange(int action) {
super.firePropertyChange(action);
}
@@ -736,16 +736,16 @@ public class EmftvmEditor
// Make sure it's okay.
//
if (theSelection != null && !theSelection.isEmpty()) {
- Runnable runnable =
- new Runnable() {
- 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);
- }
+ final Runnable runnable =
+ new Runnable() {
+ 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);
}
}
@@ -784,7 +784,7 @@ public class EmftvmEditor
*/
@Override
public Object [] getElements(Object object) {
- Object parent = super.getParent(object);
+ final Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
@@ -795,7 +795,7 @@ public class EmftvmEditor
*/
@Override
public Object [] getChildren(Object object) {
- Object parent = super.getParent(object);
+ final Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
@@ -806,7 +806,7 @@ public class EmftvmEditor
*/
@Override
public boolean hasChildren(Object object) {
- Object parent = super.getParent(object);
+ final Object parent = super.getParent(object);
return parent != null;
}
@@ -851,13 +851,13 @@ public class EmftvmEditor
// Create the listener on demand.
//
selectionChangedListener =
- new ISelectionChangedListener() {
- // This just notifies those things that are affected by the section.
- //
- public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
- setSelection(selectionChangedEvent.getSelection());
- }
- };
+ new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
}
// Stop listening to the old one.
@@ -899,16 +899,16 @@ public class EmftvmEditor
* @generated
*/
protected void createContextMenuFor(StructuredViewer viewer) {
- MenuManager contextMenu = new MenuManager("#PopUp");
+ final MenuManager contextMenu = new MenuManager("#PopUp");
contextMenu.add(new Separator("additions"));
contextMenu.setRemoveAllWhenShown(true);
contextMenu.addMenuListener(this);
- Menu menu= contextMenu.createContextMenu(viewer.getControl());
+ final 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() };
+ final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ final Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
}
@@ -920,7 +920,7 @@ public class EmftvmEditor
* @generated
*/
public void createModel() {
- URI resourceURI = EditUIUtil.getURI(getEditorInput());
+ final URI resourceURI = EditUIUtil.getURI(getEditorInput());
Exception exception = null;
Resource resource = null;
try {
@@ -928,12 +928,12 @@ public class EmftvmEditor
//
resource = editingDomain.getResourceSet().getResource(resourceURI, true);
}
- catch (Exception e) {
+ catch (final Exception e) {
exception = e;
resource = editingDomain.getResourceSet().getResource(resourceURI, false);
}
- Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+ final Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
if (diagnostic.getSeverity() != Diagnostic.OK) {
resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
@@ -948,25 +948,26 @@ public class EmftvmEditor
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
- BasicDiagnostic basicDiagnostic =
- new BasicDiagnostic
- (Diagnostic.ERROR,
- "org.eclipse.m2m.atl.emftvm.editor",
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
- new Object [] { exception == null ? (Object)resource : exception });
+ final boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty()) {
+ final BasicDiagnostic basicDiagnostic =
+ new BasicDiagnostic
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+ "org.eclipse.m2m.atl.emftvm.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
+ new BasicDiagnostic
(Diagnostic.ERROR,
- "org.eclipse.m2m.atl.emftvm.editor",
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
- new Object[] { exception });
+ "org.eclipse.m2m.atl.emftvm.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object[] { exception });
}
else {
return Diagnostic.OK_INSTANCE;
@@ -991,24 +992,25 @@ public class EmftvmEditor
// Create a page for the selection tree view.
//
{
- ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), EmftvmEditor.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);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ final Tree tree = new Tree(composite, SWT.MULTI);
+ final 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());
@@ -1018,27 +1020,27 @@ public class EmftvmEditor
new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
createContextMenuFor(selectionViewer);
- int pageIndex = addPage(viewerPane.getControl());
+ final 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(), EmftvmEditor.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);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ final Tree tree = new Tree(composite, SWT.MULTI);
+ final TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
parentViewer = (TreeViewer)viewerPane.getViewer();
@@ -1047,50 +1049,50 @@ public class EmftvmEditor
parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
createContextMenuFor(parentViewer);
- int pageIndex = addPage(viewerPane.getControl());
+ final 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(), EmftvmEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new ListViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.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());
+ final 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(), EmftvmEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TreeViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.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));
@@ -1099,40 +1101,40 @@ public class EmftvmEditor
new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
createContextMenuFor(treeViewer);
- int pageIndex = addPage(viewerPane.getControl());
+ final 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(), EmftvmEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TableViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.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();
+ final Table table = tableViewer.getTable();
+ final TableLayout layout = new TableLayout();
table.setLayout(layout);
table.setHeaderVisible(true);
table.setLinesVisible(true);
- TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+ final 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);
+ final TableColumn selfColumn = new TableColumn(table, SWT.NONE);
layout.addColumnData(new ColumnWeightData(2, 100, true));
selfColumn.setText(getString("_UI_SelfColumn_label"));
selfColumn.setResizable(true);
@@ -1142,40 +1144,40 @@ public class EmftvmEditor
tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
createContextMenuFor(tableViewer);
- int pageIndex = addPage(viewerPane.getControl());
+ final 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(), EmftvmEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TreeViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ final ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EmftvmEditor.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();
+ final Tree tree = treeViewerWithColumns.getTree();
tree.setLayoutData(new FillLayout());
tree.setHeaderVisible(true);
tree.setLinesVisible(true);
- TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+ final 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);
+ final TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
selfColumn.setText(getString("_UI_SelfColumn_label"));
selfColumn.setResizable(true);
selfColumn.setWidth(200);
@@ -1185,40 +1187,40 @@ public class EmftvmEditor
treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
createContextMenuFor(treeViewerWithColumns);
- int pageIndex = addPage(viewerPane.getControl());
+ final int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
}
getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- setActivePage(0);
- }
- });
+ (new Runnable() {
+ public void run() {
+ 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;
- }
+ (new ControlAdapter() {
+ boolean guard = false;
+ @Override
+ public void controlResized(ControlEvent event) {
+ if (!guard) {
+ guard = true;
+ hideTabs();
+ guard = false;
}
- });
+ }
+ });
getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
/**
@@ -1233,7 +1235,7 @@ public class EmftvmEditor
setPageText(0, "");
if (getContainer() instanceof CTabFolder) {
((CTabFolder)getContainer()).setTabHeight(1);
- Point point = getContainer().getSize();
+ final Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y + 6);
}
}
@@ -1251,7 +1253,7 @@ public class EmftvmEditor
setPageText(0, getString("_UI_SelectionPage_label"));
if (getContainer() instanceof CTabFolder) {
((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
- Point point = getContainer().getSize();
+ final Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y - 6);
}
}
@@ -1278,7 +1280,7 @@ public class EmftvmEditor
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key) {
if (key.equals(IContentOutlinePage.class)) {
@@ -1314,6 +1316,7 @@ public class EmftvmEditor
// Set up the tree viewer.
//
+ contentOutlineViewer.setUseHashlookup(true);
contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
contentOutlineViewer.setInput(editingDomain.getResourceSet());
@@ -1323,9 +1326,9 @@ public class EmftvmEditor
createContextMenuFor(contentOutlineViewer);
if (!editingDomain.getResourceSet().getResources().isEmpty()) {
- // Select the root object in the view.
- //
- contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
}
}
@@ -1347,13 +1350,13 @@ public class EmftvmEditor
// Listen to selection so that we can handle it is a special way.
//
contentOutlinePage.addSelectionChangedListener
- (new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- //
- public void selectionChanged(SelectionChangedEvent event) {
- handleContentOutlineSelection(event.getSelection());
- }
- });
+ (new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
}
return contentOutlinePage;
@@ -1366,20 +1369,20 @@ public class EmftvmEditor
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
- PropertySheetPage propertySheetPage =
- new ExtendedPropertySheetPage(editingDomain) {
- @Override
- public void setSelectionToViewer(List<?> selection) {
- EmftvmEditor.this.setSelectionToViewer(selection);
- EmftvmEditor.this.setFocus();
- }
+ final PropertySheetPage propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ EmftvmEditor.this.setSelectionToViewer(selection);
+ EmftvmEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
propertySheetPages.add(propertySheetPage);
@@ -1394,16 +1397,16 @@ public class EmftvmEditor
*/
public void handleContentOutlineSelection(ISelection selection) {
if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
- Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+ final Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
if (selectedElements.hasNext()) {
// Get the first selected element.
//
- Object selectedElement = selectedElements.next();
+ 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) {
- ArrayList<Object> selectionList = new ArrayList<Object>();
+ final ArrayList<Object> selectionList = new ArrayList<Object>();
selectionList.add(selectedElement);
while (selectedElements.hasNext()) {
selectionList.add(selectedElements.next());
@@ -1451,32 +1454,34 @@ public class EmftvmEditor
// 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.
+ final 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.
//
- @Override
- public void execute(IProgressMonitor monitor) {
- // Save the resources to the file system.
- //
- boolean first = true;
- for (Resource resource : editingDomain.getResourceSet().getResources()) {
- 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);
- }
+ boolean first = true;
+ final List<Resource> resources = editingDomain.getResourceSet().getResources();
+ for (int i = 0; i < resources.size(); ++i) {
+ final Resource resource = resources.get(i);
+ if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+ try {
+ final 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;
}
+ catch (final Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ first = false;
}
}
- };
+ }
+ };
updateProblemIndication = false;
try {
@@ -1489,7 +1494,7 @@ public class EmftvmEditor
((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
firePropertyChange(IEditorPart.PROP_DIRTY);
}
- catch (Exception exception) {
+ catch (final Exception exception) {
// Something went wrong that shouldn't.
//
EmftvmEditorPlugin.INSTANCE.log(exception);
@@ -1508,13 +1513,13 @@ public class EmftvmEditor
protected boolean isPersisted(Resource resource) {
boolean result = false;
try {
- InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+ final InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
if (stream != null) {
result = true;
stream.close();
}
}
- catch (IOException e) {
+ catch (final IOException e) {
// Ignore
}
return result;
@@ -1539,11 +1544,11 @@ public class EmftvmEditor
*/
@Override
public void doSaveAs() {
- SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+ final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
saveAsDialog.open();
- IPath path = saveAsDialog.getResult();
+ final IPath path = saveAsDialog.getResult();
if (path != null) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
if (file != null) {
doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
}
@@ -1559,11 +1564,11 @@ public class EmftvmEditor
(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
- IProgressMonitor progressMonitor =
- getActionBars().getStatusLineManager() != null ?
- getActionBars().getStatusLineManager().getProgressMonitor() :
- new NullProgressMonitor();
- doSave(progressMonitor);
+ final IProgressMonitor progressMonitor =
+ getActionBars().getStatusLineManager() != null ?
+ getActionBars().getStatusLineManager().getProgressMonitor() :
+ new NullProgressMonitor();
+ doSave(progressMonitor);
}
/**
@@ -1572,7 +1577,7 @@ public class EmftvmEditor
* @generated
*/
public void gotoMarker(IMarker marker) {
- List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+ final List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
if (!targetObjects.isEmpty()) {
setSelectionToViewer(targetObjects);
}
@@ -1649,7 +1654,7 @@ public class EmftvmEditor
public void setSelection(ISelection selection) {
editorSelection = selection;
- for (ISelectionChangedListener listener : selectionChangedListeners) {
+ for (final ISelectionChangedListener listener : selectionChangedListeners) {
listener.selectionChanged(new SelectionChangedEvent(this, selection));
}
setStatusLineManager(selection);
@@ -1661,26 +1666,26 @@ public class EmftvmEditor
* @generated
*/
public void setStatusLineManager(ISelection selection) {
- IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
- contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+ final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+ contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
if (statusLineManager != null) {
if (selection instanceof IStructuredSelection) {
- Collection<?> collection = ((IStructuredSelection)selection).toList();
+ final 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;
- }
+ 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 {
@@ -1765,7 +1770,7 @@ public class EmftvmEditor
getActionBarContributor().setActiveEditor(null);
}
- for (PropertySheetPage propertySheetPage : propertySheetPages) {
+ for (final PropertySheetPage propertySheetPage : propertySheetPages) {
propertySheetPage.dispose();
}
diff --git a/plugins/org.eclipse.m2m.atl.emftvm.launcher/plugin.xml b/plugins/org.eclipse.m2m.atl.emftvm.launcher/plugin.xml
index d1b4155f..f203bbba 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm.launcher/plugin.xml
+++ b/plugins/org.eclipse.m2m.atl.emftvm.launcher/plugin.xml
@@ -16,6 +16,13 @@
class="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMLaunchConfigurationTabGroup"
id="org.eclipse.m2m.atl.emftvm.launcher.launchConfigurationTabGroup"
type="org.eclipse.m2m.atl.emftvm.launcher.EMFTVMTransformation">
+ <launchMode
+ mode="debug"
+ perspective="org.eclipse.debug.ui.DebugPerspective">
+ </launchMode>
+ <launchMode
+ mode="run">
+ </launchMode>
</launchConfigurationTabGroup>
</extension>
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore b/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore
index 070b038e..8a5ba91f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore
+++ b/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.ecore
@@ -593,7 +593,12 @@
</eOperations>
<eOperations name="applyOne" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
<eParameters name="frame" eType="#//StackFrame"/>
- <eParameters name="trace" eType="ecore:EClass platform:/plugin/org.eclipse.m2m.atl.emftvm.trace/model/trace.ecore#//TraceLink"/>
+ <eParameters name="valuesMap">
+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
+ <eTypeArguments eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eGenericType>
+ </eParameters>
</eOperations>
<eOperations name="applyFor" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
<eParameters name="frame" eType="#//StackFrame"/>
@@ -622,6 +627,10 @@
<eOperations name="findInputElement" eType="#//InputRuleElement">
<eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eOperations>
+ <eOperations name="getUniqueTrace" eType="ecore:EClass platform:/plugin/org.eclipse.m2m.atl.emftvm.trace/model/trace.ecore#//TraceLink">
+ <eParameters name="frame" eType="#//StackFrame"/>
+ <eParameters name="values" eType="#//EJavaObjectArray"/>
+ </eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="module" eType="#//Module"
eOpposite="#//Module/rules"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" lowerBound="1" eType="#//RuleMode"/>
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.genmodel b/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.genmodel
index f5daac57..e0d3a78a 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.genmodel
+++ b/plugins/org.eclipse.m2m.atl.emftvm/model/emftvm.genmodel
@@ -502,7 +502,7 @@
</genOperations>
<genOperations ecoreOperation="emftvm.ecore#//Rule/applyOne">
<genParameters ecoreParameter="emftvm.ecore#//Rule/applyOne/frame"/>
- <genParameters ecoreParameter="emftvm.ecore#//Rule/applyOne/trace"/>
+ <genParameters ecoreParameter="emftvm.ecore#//Rule/applyOne/valuesMap"/>
</genOperations>
<genOperations ecoreOperation="emftvm.ecore#//Rule/applyFor">
<genParameters ecoreParameter="emftvm.ecore#//Rule/applyFor/frame"/>
@@ -527,6 +527,10 @@
<genOperations ecoreOperation="emftvm.ecore#//Rule/findInputElement">
<genParameters ecoreParameter="emftvm.ecore#//Rule/findInputElement/name"/>
</genOperations>
+ <genOperations ecoreOperation="emftvm.ecore#//Rule/getUniqueTrace">
+ <genParameters ecoreParameter="emftvm.ecore#//Rule/getUniqueTrace/frame"/>
+ <genParameters ecoreParameter="emftvm.ecore#//Rule/getUniqueTrace/values"/>
+ </genOperations>
</genClasses>
<genClasses ecoreClass="emftvm.ecore#//RuleElement">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute emftvm.ecore#//RuleElement/models"/>
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java
index 038f264b..98683969 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/BranchInstruction.java
@@ -20,11 +20,11 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.BranchInstruction#getOffset <em>Offset</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.BranchInstruction#getTarget <em>Target</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getBranchInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java
index 29abf5b8..d1acd5ad 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlock.java
@@ -26,6 +26,7 @@ import org.eclipse.m2m.atl.emftvm.util.StackFrame;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlock#getMaxLocals <em>Max Locals</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlock#getMaxStack <em>Max Stack</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.m2m.atl.emftvm.util.StackFrame;
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlock#getParentFrame <em>Parent Frame</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlock#getBindingFor <em>Binding For</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getCodeBlock()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java
index 2bf033be..01717fff 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/CodeBlockInstruction.java
@@ -20,11 +20,11 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlockInstruction#getCbIndex <em>Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.CodeBlockInstruction#getCodeBlock <em>Code Block</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getCodeBlockInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java
index 722b2123..8be3daea 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ConstantTag.java
@@ -306,6 +306,8 @@ public enum ConstantTag implements Enumerator {
* @param literal the literal string value
* @return the '<em><b>Constant Tag</b></em>' literal with the specified literal value.
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ConstantTag get(String literal) {
@@ -324,6 +326,8 @@ public enum ConstantTag implements Enumerator {
* @param name the literal name
* @return the '<em><b>Constant Tag</b></em>' literal with the specified name.
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ConstantTag getByName(String name) {
@@ -342,6 +346,8 @@ public enum ConstantTag implements Enumerator {
* @param value the literal integer value
* @return the '<em><b>Constant Tag</b></em>' literal with the specified integer value.
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ConstantTag get(int value) {
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java
index c6e44af2..d8979042 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ExecEnv.java
@@ -33,6 +33,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.ExecEnv#getMetaModels <em>Meta Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.ExecEnv#getInputModels <em>Input Models</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
* <li>{@link org.eclipse.m2m.atl.emftvm.ExecEnv#isJitDisabled <em>Jit Disabled</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.ExecEnv#getCurrentPhase <em>Current Phase</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getExecEnv()
* @model
@@ -676,7 +676,7 @@ public interface ExecEnv extends EObject {
* Returns all rules registered in this {@link ExecEnv}.
* @return all rules registered in this {@link ExecEnv}.
* <!-- end-user-doc -->
- * @model kind="operation" dataType="org.eclipse.m2m.atl.emftvm.LazyList<org.eclipse.m2m.atl.emftvm.Rule>"
+ * @model kind="operation" dataType="org.eclipse.m2m.atl.emftvm.LazyList&lt;org.eclipse.m2m.atl.emftvm.Rule&gt;"
* @generated
*/
LazyList<Rule> getRules();
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java
index 1844c91a..957a9e47 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Feature.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EClassifier;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Feature#isStatic <em>Static</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Feature#getEContext <em>EContext</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EClassifier;
* <li>{@link org.eclipse.m2m.atl.emftvm.Feature#getContext <em>Context</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Feature#getContextModel <em>Context Model</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getFeature()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java
index 9b771216..3617923b 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FeatureTag.java
@@ -208,6 +208,8 @@ public enum FeatureTag implements Enumerator {
* @param literal the literal value
* @return the '<em><b>Feature Tag</b></em>' literal with the specified literal value.
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static FeatureTag get(String literal) {
@@ -226,6 +228,8 @@ public enum FeatureTag implements Enumerator {
* @param name the literal name
* @return the '<em><b>Feature Tag</b></em>' literal with the specified name.
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static FeatureTag getByName(String name) {
@@ -244,6 +248,8 @@ public enum FeatureTag implements Enumerator {
* @param value the literal integer value
* @return the '<em><b>Feature Tag</b></em>' literal with the specified integer value.
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static FeatureTag get(int value) {
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java
index ea449765..09e0f3bf 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Field.java
@@ -22,12 +22,12 @@ import org.eclipse.m2m.atl.emftvm.util.StackFrame;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Field#getStaticValue <em>Static Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Field#getInitialiser <em>Initialiser</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Field#getRule <em>Rule</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getField()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java
index b46a2ccb..4539b524 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/FieldInstruction.java
@@ -20,10 +20,10 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.FieldInstruction#getFieldname <em>Fieldname</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getFieldInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java
index b5c3c111..b1bb8d32 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Findtype.java
@@ -20,11 +20,11 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Findtype#getModelname <em>Modelname</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Findtype#getTypename <em>Typename</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getFindtype()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java
index e4240543..75711d62 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Ifte.java
@@ -20,13 +20,13 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Ifte#getThenCbIndex <em>Then Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Ifte#getElseCbIndex <em>Else Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Ifte#getThenCb <em>Then Cb</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Ifte#getElseCb <em>Else Cb</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getIfte()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java
index 1949db59..c5c880cd 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InputRuleElement.java
@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.InputRuleElement#getBinding <em>Binding</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.InputRuleElement#getInputFor <em>Input For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.InputRuleElement#isMapsToSelf <em>Maps To Self</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getInputRuleElement()
* @model
@@ -122,7 +122,7 @@ public interface InputRuleElement extends RuleElement {
* @param env the execution environment context
* @return a new {@link Iterable} of possible match values for this rule element.
* <!-- end-user-doc -->
- * @model dataType="org.eclipse.m2m.atl.emftvm.EJavaIterable<org.eclipse.emf.ecore.EObject>"
+ * @model dataType="org.eclipse.m2m.atl.emftvm.EJavaIterable&lt;org.eclipse.emf.ecore.EObject&gt;"
* @generated
*/
Iterable<EObject> createIterable(ExecEnv env);
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java
index d1e1d55e..f8890e10 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Instruction.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Instruction#getOwningBlock <em>Owning Block</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Instruction#getOpcode <em>Opcode</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.m2m.atl.emftvm.Instruction#getStackLevel <em>Stack Level</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Instruction#getLineNumber <em>Line Number</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java
index 9796ae1e..d4c1c553 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeInstruction.java
@@ -20,10 +20,10 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.InvokeInstruction#getArgcount <em>Argcount</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getInvokeInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java
index ed4af3d8..d50ee27b 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/InvokeOperationInstruction.java
@@ -22,10 +22,10 @@ import java.lang.reflect.Method;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.InvokeOperationInstruction#getOpname <em>Opname</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getInvokeOperationInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java
index f81410b5..ad36a71e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LineNumber.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.LineNumber#getStartLine <em>Start Line</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LineNumber#getStartColumn <em>Start Column</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.m2m.atl.emftvm.LineNumber#getOwningBlock <em>Owning Block</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LineNumber#getInstructions <em>Instructions</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getLineNumber()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java
index bbf23523..710fa7df 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariable.java
@@ -20,6 +20,7 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariable#getSlot <em>Slot</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariable#getOwningBlock <em>Owning Block</em>}</li>
@@ -28,7 +29,6 @@ package org.eclipse.m2m.atl.emftvm;
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariable#getStartInstructionIndex <em>Start Instruction Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariable#getEndInstructionIndex <em>End Instruction Index</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getLocalVariable()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java
index 4bfe819c..c1d79d24 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/LocalVariableInstruction.java
@@ -20,13 +20,13 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariableInstruction#getCbOffset <em>Cb Offset</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariableInstruction#getSlot <em>Slot</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariableInstruction#getLocalVariableIndex <em>Local Variable Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.LocalVariableInstruction#getLocalVariable <em>Local Variable</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getLocalVariableInstruction()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java
index b7ffe37d..3c55c3e8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Match.java
@@ -20,10 +20,10 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Match#getRulename <em>Rulename</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getMatch()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java
index db496e4b..f9d406f8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Model.java
@@ -24,11 +24,11 @@ import org.eclipse.m2m.atl.emftvm.util.LazyList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Model#getResource <em>Resource</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Model#isAllowInterModelReferences <em>Allow Inter Model References</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getModel()
* @model
@@ -94,7 +94,7 @@ public interface Model extends EObject {
* @param type the metaclass for which to find the instances
* @return all instances of the given <code>type</code>.
* <!-- end-user-doc -->
- * @model dataType="org.eclipse.m2m.atl.emftvm.LazyList<org.eclipse.emf.ecore.EObject>"
+ * @model dataType="org.eclipse.m2m.atl.emftvm.LazyList&lt;org.eclipse.emf.ecore.EObject&gt;"
* @generated
*/
LazyList<EObject> allInstancesOf(EClass type);
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java
index 9bd99708..434a82b1 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclaration.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.ModelDeclaration#getModelName <em>Model Name</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.ModelDeclaration#getMetaModelName <em>Meta Model Name</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.m2m.atl.emftvm.ModelDeclaration#getInoutModelFor <em>Inout Model For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.ModelDeclaration#getOutputModelFor <em>Output Model For</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getModelDeclaration()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java
index a26e2d87..724cdd2e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/ModelDeclarationTag.java
@@ -130,6 +130,8 @@ public enum ModelDeclarationTag implements Enumerator {
* @param literal the literal string value
* @return the '<em><b>Model Declaration Tag</b></em>' literal with the specified literal value.
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ModelDeclarationTag get(String literal) {
@@ -148,6 +150,8 @@ public enum ModelDeclarationTag implements Enumerator {
* @param name the literal name
* @return the '<em><b>Model Declaration Tag</b></em>' literal with the specified name.
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ModelDeclarationTag getByName(String name) {
@@ -166,6 +170,8 @@ public enum ModelDeclarationTag implements Enumerator {
* @param value the literal integer value
* @return the '<em><b>Model Declaration Tag</b></em>' literal with the specified integer value.
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ModelDeclarationTag get(int value) {
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java
index a80d140d..1cdf5295 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Module.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Module#getSourceName <em>Source Name</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Module#getFeatures <em>Features</em>}</li>
@@ -31,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.m2m.atl.emftvm.Module#getInoutModels <em>Inout Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Module#getOutputModels <em>Output Models</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getModule()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java
index 3c5713c7..d3294e22 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/NamedElement.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.NamedElement#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getNamedElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java
index 72295401..e8cd1a18 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/New.java
@@ -20,10 +20,10 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.New#getModelname <em>Modelname</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getNew()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java
index 145401b1..c99735b1 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Opcode.java
@@ -1310,6 +1310,8 @@ public enum Opcode implements Enumerator {
* @param literal the literal string value
* @return the '<em><b>Opcode</b></em>' literal with the specified literal value.
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Opcode get(String literal) {
@@ -1328,6 +1330,8 @@ public enum Opcode implements Enumerator {
* @param name the literal name
* @return the '<em><b>Opcode</b></em>' literal with the specified name.
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Opcode getByName(String name) {
@@ -1346,6 +1350,8 @@ public enum Opcode implements Enumerator {
* @param value the literal integer value
* @return the '<em><b>Opcode</b></em>' literal with the specified integer value.
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Opcode get(int value) {
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java
index 0acfe0dc..7f61c200 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Operation.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Operation#getParameters <em>Parameters</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Operation#isQuery <em>Query</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Operation#getBody <em>Body</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getOperation()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java
index a5711a8c..4dbbe350 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/OutputRuleElement.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.OutputRuleElement#getMapsTo <em>Maps To</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.OutputRuleElement#getOutputFor <em>Output For</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getOutputRuleElement()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java
index 0eddf36a..fde564aa 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Parameter.java
@@ -20,10 +20,10 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Parameter#getOperation <em>Operation</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getParameter()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java
index 72bd8a82..56d7c09d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Push.java
@@ -20,6 +20,7 @@ package org.eclipse.m2m.atl.emftvm;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Push#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Push#getStringValue <em>String Value</em>}</li>
@@ -32,7 +33,6 @@ package org.eclipse.m2m.atl.emftvm;
* <li>{@link org.eclipse.m2m.atl.emftvm.Push#getLongValue <em>Long Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Push#getEnumValue <em>Enum Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getPush()
* @model
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java
index 4942b3ab..a5f29c22 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/Rule.java
@@ -27,6 +27,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMException;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#getModule <em>Module</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#getMode <em>Mode</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.m2m.atl.emftvm.util.VMException;
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#isLeaf <em>Leaf</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#isWithLeaves <em>With Leaves</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getRule()
* @model
@@ -549,7 +549,7 @@ public interface Rule extends NamedElement {
/**
* <!-- begin-user-doc -->
- * Matches this rule only (without suoer-rules) for <code>valuesMap</code>.
+ * Matches this rule only (without super-rules) for <code>valuesMap</code>.
* Call {@link #compileState()} before calling this method.
* @param frame the stack frame in which to execute the matcher
* @param valuesMap the values to match against
@@ -626,25 +626,23 @@ public interface Rule extends NamedElement {
/**
* <!-- begin-user-doc -->
- * Applies {@link #getRule()} to <code>trace</code>
+ * Applies this rule to <code>trace</code>
* @param frame the stack frame in which to execute the applier and post-apply
- * @param trace the source and target values to which to apply the rule
+ * @param valuesMap the source and target values to which to apply the rule
* @return the rule application result
* <!-- end-user-doc -->
* @model frameDataType="org.eclipse.m2m.atl.emftvm.StackFrame"
* @generated
*/
- Object applyOne(StackFrame frame, TraceLink trace);
+ Object applyOne(StackFrame frame, Map<String, Object> valuesMap);
/**
- * <!-- begin-user-doc -->
- * Applies this rule for the given <code>trace</code>. Call {@link #compileState()} before calling this method.
- *
- * @param frame
- * the stack frame context
- * @param trace
- * the trace link to apply the rule for
- * @return the application result
+ * <!-- begin-user-doc -->
+ * Applies this rule for the given <code>trace</code>.
+ * Call {@link #compileState()} before calling this method.
+ * @param frame the stack frame context
+ * @param trace the trace link to apply the rule for
+ * @return the application result
* <!-- end-user-doc -->
* @model frameDataType="org.eclipse.m2m.atl.emftvm.StackFrame"
* @generated
@@ -652,15 +650,15 @@ public interface Rule extends NamedElement {
Object applyFor(StackFrame frame, TraceLink trace);
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* Post-applies this rule for the given <code>trace</code>. Call {@link #compileState()} before calling this
* method.
- *
+ *
* @param frame
* the stack frame context
* @param trace
* the trace link to post-apply the rule for
- * @return the post-application result
+ * @return the post-application result
* <!-- end-user-doc -->
* @model frameDataType="org.eclipse.m2m.atl.emftvm.StackFrame"
* @generated
@@ -674,7 +672,7 @@ public interface Rule extends NamedElement {
* Call {@link #compileState()} before calling this method.
* @return the transitive closure of super-rules.
* <!-- end-user-doc -->
- * @model kind="operation" dataType="org.eclipse.m2m.atl.emftvm.LazySet<org.eclipse.m2m.atl.emftvm.Rule>"
+ * @model kind="operation" dataType="org.eclipse.m2m.atl.emftvm.LazySet&lt;org.eclipse.m2m.atl.emftvm.Rule&gt;"
* @generated
*/
LazySet<Rule> getAllESuperRules();
@@ -734,7 +732,7 @@ public interface Rule extends NamedElement {
/**
* <!-- begin-user-doc -->
* Finds the {@link InputRuleElement} with the given name within the rule inheritance hierarchy depth-first.
- *
+ *
* @param name
* the input element name
* @return the {@link InputRuleElement} with the given name or <code>null</code>
@@ -744,4 +742,22 @@ public interface Rule extends NamedElement {
*/
InputRuleElement findInputElement(String name);
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * Returns the unique rule application trace for <code>values</code>, if
+ * applicable.
+ *
+ * @param frame
+ * the stack frame context
+ * @param values
+ * the source values for the trace
+ * @return the unique rule application trace, or <code>null</code>
+ *
+ * <!-- end-user-doc -->
+ * @model frameDataType="org.eclipse.m2m.atl.emftvm.StackFrame" valuesDataType="org.eclipse.m2m.atl.emftvm.EJavaObjectArray"
+ * @generated
+ */
+ TraceLink getUniqueTrace(StackFrame frame, Object[] values);
+
} // Rule
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java
index 4a91808c..cd9cb7af 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleElement.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.RuleElement#getModels <em>Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.RuleElement#getEModels <em>EModels</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getRuleElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java
index 85e138e2..d71b81ac 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/RuleMode.java
@@ -130,6 +130,8 @@ public enum RuleMode implements Enumerator {
* @param literal the literal string value
* @return the '<em><b>Rule Mode</b></em>' literal with the specified literal value.
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static RuleMode get(String literal) {
@@ -148,6 +150,8 @@ public enum RuleMode implements Enumerator {
* @param name the literal name
* @return the '<em><b>Rule Mode</b></em>' literal with the specified name.
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static RuleMode getByName(String name) {
@@ -166,6 +170,8 @@ public enum RuleMode implements Enumerator {
* @param value the literal integer value
* @return the '<em><b>Rule Mode</b></em>' literal with the specified integer value.
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static RuleMode get(int value) {
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java
index 477813f7..4e3ef171 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/TypedElement.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EClassifier;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.TypedElement#getEType <em>EType</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.TypedElement#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.TypedElement#getTypeModel <em>Type Model</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.m2m.atl.emftvm.EmftvmPackage#getTypedElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java
index 0283cb6f..86f508b0 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AddImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Add</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java
index 65d44ab9..9b7089fe 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Allinst</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java
index d87a8060..e525a4e0 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AllinstInImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Allinst in</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java
index f9b5875e..7acb7430 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/AndImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>And</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java
index 5108cfd1..aa17c623 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/BranchInstructionImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.m2m.atl.emftvm.Instruction;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.BranchInstructionImpl#getOffset <em>Offset</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.BranchInstructionImpl#getTarget <em>Target</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java
index 6c0e41d8..c6e2cb89 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockImpl.java
@@ -109,6 +109,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockImpl#getMaxLocals <em>Max Locals</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockImpl#getMaxStack <em>Max Stack</em>}</li>
@@ -125,7 +126,6 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockImpl#getParentFrame <em>Parent Frame</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockImpl#getBindingFor <em>Binding For</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java
index 8a2f1700..7d0d6da4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/CodeBlockInstructionImpl.java
@@ -27,11 +27,11 @@ import org.eclipse.m2m.atl.emftvm.EmftvmPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockInstructionImpl#getCbIndex <em>Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.CodeBlockInstructionImpl#getCodeBlock <em>Code Block</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java
index 29857d79..4f563452 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DeleteImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Delete</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java
index 9abbc2d2..deb74ce6 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Dup</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java
index f837d27a..5966763c 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/DupX1Impl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Dup x1</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java
index fb63727a..6982ac6d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EmftvmPackageImpl.java
@@ -3772,7 +3772,12 @@ public class EmftvmPackageImpl extends EPackageImpl implements EmftvmPackage {
op = addEOperation(ruleEClass, theEcorePackage.getEJavaObject(), "applyOne", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getStackFrame(), "frame", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, theTracePackage.getTraceLink(), "trace", 0, 1, IS_UNIQUE, IS_ORDERED);
+ g1 = createEGenericType(ecorePackage.getEMap());
+ g2 = createEGenericType(theEcorePackage.getEString());
+ g1.getETypeArguments().add(g2);
+ g2 = createEGenericType(ecorePackage.getEJavaObject());
+ g1.getETypeArguments().add(g2);
+ addEParameter(op, g1, "valuesMap", 0, 1, IS_UNIQUE, IS_ORDERED);
op = addEOperation(ruleEClass, theEcorePackage.getEJavaObject(), "applyFor", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getStackFrame(), "frame", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -3804,6 +3809,10 @@ public class EmftvmPackageImpl extends EPackageImpl implements EmftvmPackage {
op = addEOperation(ruleEClass, this.getInputRuleElement(), "findInputElement", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(ruleEClass, theTracePackage.getTraceLink(), "getUniqueTrace", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getStackFrame(), "frame", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getEJavaObjectArray(), "values", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(ruleElementEClass, RuleElement.class, "RuleElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getRuleElement_Models(), theEcorePackage.getEString(), "models", null, 0, -1, RuleElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getRuleElement_EModels(), this.getModel(), null, "eModels", null, 0, -1, RuleElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java
index 7d6835b3..8849ce2b 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/EnditerateImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Enditerate</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java
index d0cb408a..745f1be7 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ExecEnvImpl.java
@@ -94,6 +94,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ExecEnvImpl#getMetaModels <em>Meta Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ExecEnvImpl#getInputModels <em>Input Models</em>}</li>
@@ -106,7 +107,6 @@ import org.eclipse.m2m.atl.emftvm.util.VMMonitor;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ExecEnvImpl#isJitDisabled <em>Jit Disabled</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ExecEnvImpl#getCurrentPhase <em>Current Phase</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java
index 0bff4f18..7e6d3574 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FeatureImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FeatureImpl#isStatic <em>Static</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FeatureImpl#getEContext <em>EContext</em>}</li>
@@ -38,7 +39,6 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FeatureImpl#getContext <em>Context</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FeatureImpl#getContextModel <em>Context Model</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java
index 5fefa045..6f7e33e4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldImpl.java
@@ -38,12 +38,12 @@ import org.eclipse.m2m.atl.emftvm.util.VMException;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FieldImpl#getStaticValue <em>Static Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FieldImpl#getInitialiser <em>Initialiser</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FieldImpl#getRule <em>Rule</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java
index 974830b4..de3c7ce0 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FieldInstructionImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.m2m.atl.emftvm.FieldInstruction;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FieldInstructionImpl#getFieldname <em>Fieldname</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java
index c1402ffa..6086fdc2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeImpl.java
@@ -26,11 +26,11 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FindtypeImpl#getModelname <em>Modelname</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.FindtypeImpl#getTypename <em>Typename</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java
index 2741c05c..26824689 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/FindtypeSImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Findtype s</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java
index 398fb901..27f08b2b 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Get</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java
index 9e1629a2..a47a52e4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetStaticImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Get static</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetSuperImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetSuperImpl.java
index 9ec27308..a4ac6222 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetSuperImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetSuperImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Get Super</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java
index 41e2654f..8f3f222c 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetTransImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Get trans</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java
index ec5f5954..9503dccc 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetcbImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Getcb</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java
index 3ad752c8..f64c75fd 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvImpl.java
@@ -21,8 +21,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Getenv</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java
index 86e0964e..0830eed3 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GetenvtypeImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Getenvtype</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java
index 1e3ddb92..c36adb12 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/GotoImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Goto</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java
index 3359dcfb..76687fd4 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>If</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java
index a16b170a..57679f7e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfnImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Ifn</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java
index 2428bd9b..bf28e4e6 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IfteImpl.java
@@ -28,13 +28,13 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.IfteImpl#getThenCbIndex <em>Then Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.IfteImpl#getElseCbIndex <em>Else Cb Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.IfteImpl#getThenCb <em>Then Cb</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.IfteImpl#getElseCb <em>Else Cb</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java
index 2e028c28..8c57e2d9 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ImpliesImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Implies</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java
index b7527090..0104a81a 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InputRuleElementImpl.java
@@ -35,12 +35,12 @@ import org.eclipse.m2m.atl.emftvm.util.LazyList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InputRuleElementImpl#getBinding <em>Binding</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InputRuleElementImpl#getInputFor <em>Input For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InputRuleElementImpl#isMapsToSelf <em>Maps To Self</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java
index 1d3d674d..07ed5011 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InsertImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Insert</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java
index b5ac0bc6..ae7d0bd9 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InstructionImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InstructionImpl#getOwningBlock <em>Owning Block</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InstructionImpl#getOpcode <em>Opcode</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InstructionImpl#getStackLevel <em>Stack Level</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InstructionImpl#getLineNumber <em>Line Number</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java
index 7be443f1..7ed598c8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeAllCbsImpl.java
@@ -23,8 +23,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Invoke all cbs</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java
index f46c17a6..9ba7201e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbImpl.java
@@ -28,10 +28,10 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InvokeCbImpl#getArgcount <em>Argcount</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java
index d75cc3e3..32398647 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeCbSImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Invoke cb s</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java
index 9798be68..5e6e8835 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Invoke</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java
index 28087e7e..212af60f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeInstructionImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.m2m.atl.emftvm.InvokeInstruction;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InvokeInstructionImpl#getArgcount <em>Argcount</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java
index 57e831fd..2c2f6471 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeOperationInstructionImpl.java
@@ -27,10 +27,10 @@ import org.eclipse.m2m.atl.emftvm.InvokeOperationInstruction;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.InvokeOperationInstructionImpl#getOpname <em>Opname</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java
index db8abb14..82a9dd4a 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeStaticImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Invoke static</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java
index 3cdc1be8..a94b6fee 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/InvokeSuperImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Invoke super</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java
index b2690ed7..e2e992fa 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IsnullImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Isnull</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java
index cc3d0477..4a4f959f 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/IterateImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Iterate</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java
index 7f21ac75..bf90dd27 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LineNumberImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.m2m.atl.emftvm.LineNumber;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LineNumberImpl#getStartLine <em>Start Line</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LineNumberImpl#getStartColumn <em>Start Column</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.m2m.atl.emftvm.LineNumber;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LineNumberImpl#getOwningBlock <em>Owning Block</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LineNumberImpl#getInstructions <em>Instructions</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java
index 2f851662..6e236fe3 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LoadImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Load</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java
index d291d239..9080b42c 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.m2m.atl.emftvm.LocalVariable;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableImpl#getSlot <em>Slot</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableImpl#getOwningBlock <em>Owning Block</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.m2m.atl.emftvm.LocalVariable;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableImpl#getStartInstructionIndex <em>Start Instruction Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableImpl#getEndInstructionIndex <em>End Instruction Index</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java
index 79c5698b..8d0776e2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/LocalVariableInstructionImpl.java
@@ -28,13 +28,13 @@ import org.eclipse.m2m.atl.emftvm.LocalVariableInstruction;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableInstructionImpl#getCbOffset <em>Cb Offset</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableInstructionImpl#getSlot <em>Slot</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableInstructionImpl#getLocalVariableIndex <em>Local Variable Index</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.LocalVariableInstructionImpl#getLocalVariable <em>Local Variable</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java
index 0562aad7..6d63483e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.MatchImpl#getRulename <em>Rulename</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java
index d7385369..8d165794 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MatchSImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Match s</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java
index 680e44c9..a01d5827 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/MetamodelImpl.java
@@ -36,8 +36,6 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil;
* An implementation of the model object '<em><b>Metamodel</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java
index ff0b80ba..dee08ad5 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelDeclarationImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.m2m.atl.emftvm.Module;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelDeclarationImpl#getModelName <em>Model Name</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelDeclarationImpl#getMetaModelName <em>Meta Model Name</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.m2m.atl.emftvm.Module;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelDeclarationImpl#getInoutModelFor <em>Inout Model For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelDeclarationImpl#getOutputModelFor <em>Output Model For</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java
index a20ee741..00bfac49 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModelImpl.java
@@ -38,11 +38,11 @@ import org.eclipse.m2m.atl.emftvm.util.ResourceIterable;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelImpl#getResource <em>Resource</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModelImpl#isAllowInterModelReferences <em>Allow Inter Model References</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java
index 78066781..a6b00b59 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ModuleImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModuleImpl#getSourceName <em>Source Name</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModuleImpl#getFeatures <em>Features</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModuleImpl#getInoutModels <em>Inout Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ModuleImpl#getOutputModels <em>Output Models</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java
index a9b2c5f6..2fb02081 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NamedElementImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.m2m.atl.emftvm.NamedElement;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.NamedElementImpl#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java
index a0866faa..5a306018 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.NewImpl#getModelname <em>Modelname</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java
index 39cf40c8..217d7174 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NewSImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>New s</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java
index 72b266c6..47a092ae 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/NotImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Opcode;
* An implementation of the model object '<em><b>Not</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java
index aa070ae9..15d4e315 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OperationImpl.java
@@ -35,12 +35,12 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.OperationImpl#getParameters <em>Parameters</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.OperationImpl#isQuery <em>Query</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.OperationImpl#getBody <em>Body</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java
index 4bd968b0..ec5ba5cb 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OrImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Or;
* An implementation of the model object '<em><b>Or</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java
index c65db145..706db739 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/OutputRuleElementImpl.java
@@ -34,11 +34,11 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.OutputRuleElementImpl#getMapsTo <em>Maps To</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.OutputRuleElementImpl#getOutputFor <em>Output For</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java
index 930d88bd..02e64c40 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ParameterImpl.java
@@ -29,10 +29,10 @@ import org.eclipse.m2m.atl.emftvm.Parameter;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.ParameterImpl#getOperation <em>Operation</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java
index 858945c3..f05d3e85 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PopImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Pop;
* An implementation of the model object '<em><b>Pop</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java
index 162df6e1..fc2d1ad2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.m2m.atl.emftvm.util.EnumLiteral;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.PushImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.PushImpl#getStringValue <em>String Value</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.m2m.atl.emftvm.util.EnumLiteral;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.PushImpl#getLongValue <em>Long Value</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.PushImpl#getEnumValue <em>Enum Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java
index 4b2838b2..18ae92a6 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushfImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Pushf;
* An implementation of the model object '<em><b>Pushf</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java
index ee6d6d44..cf930161 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/PushtImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Pusht;
* An implementation of the model object '<em><b>Pusht</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java
index 3995299e..85c1f8cf 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RemoveImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Remove;
* An implementation of the model object '<em><b>Remove</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java
index 1de7673a..203220ab 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/ReturnImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Return;
* An implementation of the model object '<em><b>Return</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java
index 02afc685..f1ee792d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleElementImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.m2m.atl.emftvm.RuleElement;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleElementImpl#getModels <em>Models</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleElementImpl#getEModels <em>EModels</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java
index 6f921d74..c69636ad 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/RuleImpl.java
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright (c) 2011 Vrije Universiteit Brussel.
+ * Copyright (c) 2017-2018 Dennis Wagelaar.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,6 +69,7 @@ import org.eclipse.m2m.atl.emftvm.util.VMException;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleImpl#getModule <em>Module</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleImpl#getMode <em>Mode</em>}</li>
@@ -87,7 +89,6 @@ import org.eclipse.m2m.atl.emftvm.util.VMException;
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleImpl#isLeaf <em>Leaf</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.RuleImpl#isWithLeaves <em>With Leaves</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -135,16 +136,60 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param values the source values to match against
* @return <code>true</code> iff this rule matches against <code>values</code>
*/
- public abstract boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ public abstract boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values);
/**
- * Matches
- * @param frame
- * @param values
- * @return
+ * Returns the unique rule application trace for <code>values</code>, if applicable.
+ * @param frame the stack frame context
+ * @param values the source values for the trace
+ * @return the unique rule application trace, or <code>null</code>
*/
- public abstract Object matchManual(final StackFrame frame, final Object[] values);
+ public TraceLink getUniqueTrace(final StackFrame frame, final Object[] values) {
+ for (final Rule subRule : getESubRules()) {
+ final TraceLink subTraceLink = subRule.getUniqueTrace(frame, values);
+ if (subTraceLink != null) {
+ return subTraceLink;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Applies {@link #getRule()} to <code>trace</code>
+ *
+ * @param frame
+ * the stack frame in which to execute the applier and post-apply
+ * @param trace
+ * the trace link with values to which to apply the rule
+ * @return the rule application result
+ */
+ public Object applyOne(final StackFrame frame, final TraceLink trace) {
+ Object result = null;
+ for (final Rule rule : getAllESuperRules()) {
+ if (rule.getApplier() != null) {
+ result = rule.applyFor(frame, trace);
+ } else {
+ rule.applyFor(frame, trace);
+ }
+ if (rule.getPostApply() != null) {
+ result = rule.postApplyFor(frame, trace);
+ } else {
+ rule.postApplyFor(frame, trace);
+ }
+ }
+ if (getApplier() != null) {
+ result = applierCbState.applyFor(frame, trace);
+ } else {
+ applierCbState.applyFor(frame, trace);
+ }
+ if (getPostApply() != null) {
+ result = applierCbState.postApplyFor(frame, trace);
+ } else {
+ applierCbState.postApplyFor(frame, trace);
+ }
+ return result;
+ }
}
/**
@@ -176,54 +221,6 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* {@inheritDoc}
*/
@Override
- public Object matchManual(final StackFrame frame, final Object[] values) {
- assert !isUnique();
- final Map<String, Object> valuesMap = createValuesMap(values);
- if (matchOne(frame, valuesMap)) {
- final Set<Rule> matchedRules = matchManualSubRules(RuleImpl.this, frame, valuesMap);
- final int size = matchedRules.size();
- switch (size) {
- case 0:
- //TODO should not work for abstract rules
- return applyOne(frame, createTrace(frame, valuesMap));
- case 1:
- return matchedRules.iterator().next().applyOne(frame, createTrace(frame, valuesMap));
- default:
- throw new VMException(frame, String.format("More than one matching sub-rule found for %s: %s",
- RuleImpl.this, matchedRules));
- }
- } else {
- return null;
- }
- }
-
- /**
- * TODO
- * @param rule
- * @param frame
- * @param valuesMap
- * @return
- */
- private Set<Rule> matchManualSubRules(final Rule rule, final StackFrame frame, final Map<String, Object> valuesMap) {
- final Set<Rule> matchedRules = new HashSet<Rule>();
- for (Rule subRule : rule.getESubRules()) {
- if (subRule.matchOneOnly(frame, valuesMap)) {
- Set<Rule> matchedSubRules = matchManualSubRules(subRule, frame, valuesMap);
- if (!matchedSubRules.isEmpty()) {
- matchedRules.addAll(matchedSubRules);
- } else {
- //TODO not for abstract rules
- matchedRules.add(subRule);
- }
- }
- }
- return matchedRules;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public boolean matchFor(final StackFrame frame, final Object[] values) {
assert !isUnique();
return matcherCbState.matchFor(frame, values);
@@ -233,7 +230,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* {@inheritDoc}
*/
@Override
- public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values) {
assert !isUnique();
return matcherCbState.matchFor(frame, valuesMap, values);
@@ -259,7 +256,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
} else {
final SourceElementList sel = TraceFactory.eINSTANCE.createSourceElementList();
final EList<SourceElement> ses = sel.getSourceElements();
- for (InputRuleElement re : inputElements) {
+ for (final InputRuleElement re : inputElements) {
ses.add(trace.getSourceElement(re.getName(), false));
}
sel.setUniqueFor(tr);
@@ -290,31 +287,6 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* {@inheritDoc}
*/
@Override
- public Object matchManual(final StackFrame frame, final Object[] values) {
- assert isUnique();
- final Map<TraceLink, Object> uniqueResults = frame.getEnv().getUniqueResults();
- // Reuse existing application result for unique rules
- TraceLink trace = getUniqueTrace(frame, values);
- if (trace != null) {
- return uniqueResults.get(trace);
- }
- // Otherwise match as normal
- final Map<String, Object> valuesMap = createValuesMap(values);
- if (matchOne(frame, valuesMap)) {
- trace = createTrace(frame, valuesMap);
- final Object resultValue = applyTo(frame, trace);
- // Store unique result for later retrieval
- uniqueResults.put(trace, resultValue);
- return resultValue;
- } else {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public boolean matchFor(final StackFrame frame, final Object[] values) {
assert isUnique();
// Don't match if values have previously matched
@@ -338,7 +310,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* {@inheritDoc}
*/
@Override
- public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values) {
assert isUnique();
// Don't match if values have previously matched
@@ -359,12 +331,10 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
/**
- * Returns the unique rule application trace for <code>values</code>, if applicable.
- * @param frame the stack frame context
- * @param values the source values for the trace
- * @return the unique rule application trace, or <code>null</code>
+ * {@inheritDoc}
*/
- private TraceLink getUniqueTrace(final StackFrame frame, final Object[] values) {
+ @Override
+ public TraceLink getUniqueTrace(final StackFrame frame, final Object[] values) {
final TracedRule tr = frame.getEnv().getTraces().getLinksByRule(getName(), false);
if (tr != null) {
if (values.length == 1) {
@@ -379,7 +349,18 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
}
}
- return null;
+ return super.getUniqueTrace(frame, values);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object applyOne(final StackFrame frame, final TraceLink trace) {
+ final Object resultValue = super.applyOne(frame, trace);
+ // Store unique result for later retrieval
+ frame.getEnv().getUniqueResults().put(trace, resultValue);
+ return resultValue;
}
}
@@ -413,7 +394,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class DefaultOffState extends DefaultState {
-
+
/**
* {@inheritDoc}
*/
@@ -430,13 +411,13 @@ public class RuleImpl extends NamedElementImpl implements Rule {
return false;
}
}
-
+
/**
* {@link DefaultState} class for rules with {@link Rule#isDefault()} set to <code>true</code>.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class DefaultOnState extends DefaultState {
-
+
/**
* {@inheritDoc}
*/
@@ -469,7 +450,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected abstract class SuperRulesState {
-
+
/**
* Matches {@link #getRule()}.
* @param frame the stack frame in which to execute the matcher
@@ -495,7 +476,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class WithoutSuperRulesState extends SuperRulesState {
-
+
/**
* {@inheritDoc}
*/
@@ -523,7 +504,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
// Create value iterables and initial value array
final EList<InputRuleElement> allInputs = getInputElements();
final List<Iterable<EObject>> iterables = new ArrayList<Iterable<EObject>>(allInputs.size());
- for (InputRuleElement re : allInputs) {
+ for (final InputRuleElement re : allInputs) {
if (re.getBinding() != null) {
// Skip bound elements until all non-bound values have been set
iterables.add(null);
@@ -535,33 +516,34 @@ public class RuleImpl extends NamedElementImpl implements Rule {
iterableMap = null;
}
}
-
+
/**
* {@link SuperRulesState} class for rules with {@link Rule#getESuperRules()}.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class WithSuperRulesState extends SuperRulesState {
-
+
/**
* {@inheritDoc}
*/
+ @Override
public boolean match(final StackFrame frame) {
final EList<Rule> superRules = getESuperRules();
assert !superRules.isEmpty();
// Retrieve super-rule matches
final List<TracedRule> superMatches = new ArrayList<TracedRule>(superRules.size());
final TraceLinkSet matches = frame.getEnv().getMatches();
- for (Rule superRule : superRules) {
- TracedRule superMatch = matches.getLinksByRule(superRule.getName(), false);
+ for (final Rule superRule : superRules) {
+ final TracedRule superMatch = matches.getLinksByRule(superRule.getName(), false);
assert superMatch != null;
superMatches.add(superMatch);
}
// Do the matching
- return matchFor(frame,
- new LinkedHashMap<String, Object>(getInputElements().size()),
- 0,
- superMatches,
- iterableMap,
+ return matchFor(frame,
+ new LinkedHashMap<String, Object>(getInputElements().size()),
+ 0,
+ superMatches,
+ iterableMap,
new LinkedHashMap<TracedRule, TraceLink>(superRules.size()));
}
@@ -575,17 +557,17 @@ public class RuleImpl extends NamedElementImpl implements Rule {
// Retrieve super-rule matches
final List<TracedRule> superMatches = new ArrayList<TracedRule>(superRules.size());
final TraceLinkSet matches = frame.getEnv().getMatches();
- for (Rule superRule : superRules) {
- TracedRule superMatch = matches.getLinksByRule(superRule.getName(), false);
+ for (final Rule superRule : superRules) {
+ final TracedRule superMatch = matches.getLinksByRule(superRule.getName(), false);
assert superMatch != null;
superMatches.add(superMatch);
}
// Do the matching
- return matchOneFor(frame,
- new LinkedHashMap<String, Object>(getInputElements().size()),
- 0,
- superMatches,
- iterableMap,
+ return matchOneFor(frame,
+ new LinkedHashMap<String, Object>(getInputElements().size()),
+ 0,
+ superMatches,
+ iterableMap,
new HashMap<TracedRule, TraceLink>(superRules.size()));
}
@@ -596,15 +578,15 @@ public class RuleImpl extends NamedElementImpl implements Rule {
public void compileIterables(final ExecEnv env) {
// Collect input element names for all super-rules
final java.util.Set<String> superRuleElementNames = new HashSet<String>();
- for (Rule rule : getAllESuperRules()) {
- for (RuleElement re : rule.getInputElements()) {
+ for (final Rule rule : getAllESuperRules()) {
+ for (final RuleElement re : rule.getInputElements()) {
superRuleElementNames.add(re.getName());
}
}
// Create iterables for all new input elements
final Map<String, Iterable<EObject>> iterables = new LinkedHashMap<String, Iterable<EObject>>();
- for (InputRuleElement re : getInputElements()) {
- String name = re.getName();
+ for (final InputRuleElement re : getInputElements()) {
+ final String name = re.getName();
if (!superRuleElementNames.contains(name) && re.getBinding() == null) {
// Skip bound elements until all non-bound values have been set
iterables.put(name, re.createIterable(env));
@@ -620,7 +602,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected abstract class RuleModeState {
-
+
/**
* Matches {@link #getRule()} for the automatic single stage, if applicable.
* @param frame the stack frame in which to execute the matcher
@@ -651,7 +633,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
throw new VMException(frame, String.format(
"Rule %s is not a manual rule", this));
}
-
+
/**
* Matches this rule against <code>values</code>,
* and records a match in {@link ExecEnv#getMatches()} in case of a match.
@@ -673,7 +655,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param values the source values to match against
* @return <code>true</code> iff this rule matches against <code>values</code>
*/
- public abstract boolean matchFor(StackFrame frame, Map<String, Object> valuesMap,
+ public abstract boolean matchFor(StackFrame frame, Map<String, Object> valuesMap,
Object[] values);
}
@@ -682,14 +664,63 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class ManualState extends RuleModeState {
-
+
/**
* {@inheritDoc}
*/
@Override
public Object matchManual(final StackFrame frame, final Object[] values) {
assert getMode() == RuleMode.MANUAL;
- return uniqueState.matchManual(frame, values);
+ // Reuse existing application result for unique rules
+ final TraceLink trace = getUniqueTrace(frame, values);
+ if (trace != null) {
+ return frame.getEnv().getUniqueResults().get(trace);
+ }
+ // Otherwise match as normal
+ final Map<String, Object> valuesMap = createValuesMap(values);
+ if (matchOne(frame, valuesMap)) {
+ final Set<Rule> matchedRules = matchManualSubRules(RuleImpl.this, frame, valuesMap);
+ switch (matchedRules.size()) {
+ case 0:
+ return isAbstract() ? null : applyOne(frame, valuesMap);
+ case 1:
+ final Rule subRule = matchedRules.iterator().next();
+ assert !subRule.isAbstract();
+ return subRule.applyOne(frame, valuesMap);
+ default:
+ throw new VMException(frame, String.format("More than one matching sub-rule found for %s: %s",
+ RuleImpl.this, matchedRules));
+ }
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Matches the sub-rules of the given rule manually.
+ *
+ * @param rule
+ * the rule for which to match the sub-rules
+ * @param frame
+ * the stack frame context
+ * @param valuesMap
+ * the map of all values, including super-rule elements
+ * @return the matching (non-abstract) sub-rules
+ */
+ protected Set<Rule> matchManualSubRules(final Rule rule, final StackFrame frame,
+ final Map<String, Object> valuesMap) {
+ final Set<Rule> matchedRules = new HashSet<Rule>();
+ for (final Rule subRule : rule.getESubRules()) {
+ if (subRule.matchOneOnly(frame, valuesMap)) {
+ final Set<Rule> matchedSubRules = matchManualSubRules(subRule, frame, valuesMap);
+ if (!matchedSubRules.isEmpty()) {
+ matchedRules.addAll(matchedSubRules);
+ } else if (!subRule.isAbstract()) {
+ matchedRules.add(subRule);
+ }
+ }
+ }
+ return matchedRules;
}
/**
@@ -698,7 +729,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public boolean matchFor(final StackFrame frame, final Object[] values) {
assert getMode() == RuleMode.MANUAL;
- throw new VMException(frame,
+ throw new VMException(frame,
"matchFor(StackFrame, EObject[]) should not be used for manual rules");
}
@@ -709,7 +740,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
public boolean matchFor(final StackFrame frame,
final Map<String, Object> valuesMap, final Object[] values) {
assert getMode() == RuleMode.MANUAL;
- throw new VMException(frame,
+ throw new VMException(frame,
"matchFor(StackFrame, Map<String, EObject>, EObject[]) should not be used for manual rules");
}
}
@@ -719,7 +750,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected class AutomaticSingleState extends RuleModeState {
-
+
/**
* {@inheritDoc}
*/
@@ -742,7 +773,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* {@inheritDoc}
*/
@Override
- public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values) {
assert getMode() == RuleMode.AUTOMATIC_SINGLE;
return matcherCbState.matchFor(frame, valuesMap, values);
@@ -782,7 +813,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
assert getMode() == RuleMode.AUTOMATIC_RECURSIVE;
return uniqueState.matchFor(frame, valuesMap, values);
}
-
+
}
/**
@@ -847,7 +878,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final TraceLinkSet matches = env.getMatches();
matches.getRules().clear();
matches.getDefaultSourceElements().clear();
- for (Rule rule : getAllESuperRules()) {
+ for (final Rule rule : getAllESuperRules()) {
rule.applyFor(frame, trace);
rule.postApplyFor(frame, trace);
}
@@ -911,7 +942,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
protected abstract class AbstractState {
-
+
/**
* Creates trace elements for the recorded matches for this rule.
* @param frame the stack frame context
@@ -987,16 +1018,16 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final TraceLinkSet traces = env.getTraces();
traces.getRules().add(tr);
// Remove overridden matches
- for (Iterator<TraceLink> links = tr.getLinks().iterator(); links.hasNext();) {
- TraceLink trace = links.next();
+ for (final Iterator<TraceLink> links = tr.getLinks().iterator(); links.hasNext();) {
+ final TraceLink trace = links.next();
if (trace.isOverridden()) {
links.remove(); // This match is overridden by a sub-rule
} else {
createAllUniqueMappings(trace);
- boolean defaultMappingSet = completeTraceFor(frame, trace);
+ final boolean defaultMappingSet = completeTraceFor(frame, trace);
// Mark default/unique source elements if applicable
if (!defaultMappingSet) {
- EList<SourceElement> ses = trace.getSourceElements();
+ final EList<SourceElement> ses = trace.getSourceElements();
defaultState.createDefaultMapping(traces, ses);
}
}
@@ -1013,9 +1044,9 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (tr == null) {
throw new VMException(frame, String.format("Cannot apply %s; no traces exist", RuleImpl.this));
}
- for (TraceLink trace : tr.getLinks()) {
+ for (final TraceLink trace : tr.getLinks()) {
assert !trace.isOverridden();
- for (Rule rule : getAllESuperRules()) {
+ for (final Rule rule : getAllESuperRules()) {
rule.applyFor(frame, trace);
}
applierCbState.applyFor(frame, trace);
@@ -1032,9 +1063,9 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (tr == null) {
throw new VMException(frame, String.format("Cannot post-apply %s; no traces exist", RuleImpl.this));
}
- for (TraceLink trace : tr.getLinks()) {
+ for (final TraceLink trace : tr.getLinks()) {
assert !trace.isOverridden();
- for (Rule rule : getAllESuperRules()) {
+ for (final Rule rule : getAllESuperRules()) {
rule.postApplyFor(frame, trace);
}
applierCbState.postApplyFor(frame, trace);
@@ -1060,8 +1091,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final TraceLink match = TraceFactory.eINSTANCE.createTraceLink();
final EList<SourceElement> ses = match.getSourceElements();
int i = 0;
- for (InputRuleElement re : getInputElements()) {
- SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
+ for (final InputRuleElement re : getInputElements()) {
+ final SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
se.setName(re.getName());
se.setRuntimeObject(values[i++]);
se.setMapsToSelf(re.isMapsToSelf());
@@ -1079,16 +1110,16 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param values the source values to match against
* @return <code>true</code> iff this rule matches against <code>values</code>
*/
- public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ public boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values) {
final TraceLink match = TraceFactory.eINSTANCE.createTraceLink();
final EList<SourceElement> ses = match.getSourceElements();
// Add all values for the match, not just the ones specified in the rule signature
- for (Entry<String, Object> v : valuesMap.entrySet()) {
- SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
+ for (final Entry<String, Object> v : valuesMap.entrySet()) {
+ final SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
se.setName(v.getKey());
se.setRuntimeObject(v.getValue());
- InputRuleElement re = findInputElement(v.getKey());
+ final InputRuleElement re = findInputElement(v.getKey());
se.setMapsToSelf(re == null ? false : re.isMapsToSelf());
ses.add(se);
}
@@ -1140,7 +1171,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
/**
- * Base class for code that depends on whether the rule has a
+ * Base class for code that depends on whether the rule has a
* {@link Rule#getApplier()} code block and/or a {@link Rule#getPostApply()} code block.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
*/
@@ -1148,7 +1179,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
/**
* Applies this rule for the given <code>trace</code>.
- *
+ *
* @param frame
* the stack frame context
* @param trace
@@ -1159,7 +1190,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
/**
* Post-applies this rule for the given <code>trace</code>.
- *
+ *
* @param frame
* the stack frame context
* @param trace
@@ -1541,7 +1572,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
*/
protected boolean withLeaves = WITH_LEAVES_EDEFAULT;
/**
- * Field storage and lookup.
+ * Field storage and lookup.
*/
protected FieldContainer fieldContainer = new FieldContainer();
@@ -1690,7 +1721,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public void setMode(RuleMode newMode) {
- RuleMode oldMode = mode;
+ final RuleMode oldMode = mode;
mode = newMode == null ? MODE_EDEFAULT : newMode;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__MODE, oldMode, mode));
@@ -1765,10 +1796,10 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public NotificationChain basicSetMatcher(CodeBlock newMatcher, NotificationChain msgs) {
- CodeBlock oldMatcher = matcher;
+ final CodeBlock oldMatcher = matcher;
matcher = newMatcher;
if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__MATCHER, oldMatcher, newMatcher);
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__MATCHER, oldMatcher, newMatcher);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
return msgs;
@@ -1811,10 +1842,10 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public NotificationChain basicSetApplier(CodeBlock newApplier, NotificationChain msgs) {
- CodeBlock oldApplier = applier;
+ final CodeBlock oldApplier = applier;
applier = newApplier;
if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__APPLIER, oldApplier, newApplier);
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__APPLIER, oldApplier, newApplier);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
return msgs;
@@ -1857,10 +1888,10 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public NotificationChain basicSetPostApply(CodeBlock newPostApply, NotificationChain msgs) {
- CodeBlock oldPostApply = postApply;
+ final CodeBlock oldPostApply = postApply;
postApply = newPostApply;
if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__POST_APPLY, oldPostApply, newPostApply);
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__POST_APPLY, oldPostApply, newPostApply);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
return msgs;
@@ -1916,7 +1947,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public void setAbstract(boolean newAbstract) {
- boolean oldAbstract = abstract_;
+ final boolean oldAbstract = abstract_;
abstract_ = newAbstract;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__ABSTRACT, oldAbstract, abstract_));
@@ -1952,7 +1983,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public void setDefault(boolean newDefault) {
- boolean oldDefault = default_;
+ final boolean oldDefault = default_;
default_ = newDefault;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__DEFAULT, oldDefault, default_));
@@ -1975,7 +2006,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public void setDistinctElements(boolean newDistinctElements) {
- boolean oldDistinctElements = distinctElements;
+ final boolean oldDistinctElements = distinctElements;
distinctElements = newDistinctElements;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__DISTINCT_ELEMENTS, oldDistinctElements, distinctElements));
@@ -1998,7 +2029,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated
*/
public void setUnique(boolean newUnique) {
- boolean oldUnique = unique;
+ final boolean oldUnique = unique;
unique = newUnique;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EmftvmPackage.RULE__UNIQUE, oldUnique, unique));
@@ -2027,7 +2058,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
public boolean isWithLeaves() {
if (!withLeavesSet) {
withLeaves = false;
- for (Rule subRule : getESubRules()) {
+ for (final Rule subRule : getESubRules()) {
if (subRule.isLeaf() || subRule.isWithLeaves()) {
withLeaves = true;
break;
@@ -2122,7 +2153,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated NOT
*/
public boolean matchOne(final StackFrame frame, final Map<String, Object> valuesMap) {
- for (Rule superRule : getESuperRules()) {
+ for (final Rule superRule : getESuperRules()) {
if (!superRule.matchOne(frame, valuesMap)) {
return false;
}
@@ -2144,14 +2175,14 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final EList<InputRuleElement> inputs = getInputElements();
for (int index = 0; index < inputs.size(); index++) {
- InputRuleElement re = inputs.get(index);
- Object value = valuesMap.get(re.getName());
+ final InputRuleElement re = inputs.get(index);
+ final Object value = valuesMap.get(re.getName());
if (value == null) {
throw new VMException(frame, String.format(
- "Cannot match rule input element %s against null value for %s",
+ "Cannot match rule input element %s against null value for %s",
re, this));
}
- EClassifier eType = re.getEType();
+ final EClassifier eType = re.getEType();
if (eType instanceof EEnum) {
// Fix for Bug # 441027
if (!(value instanceof EnumLiteral)) {
@@ -2160,7 +2191,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
} else if (!eType.isInstance(value)) {
return false;
}
- EList<Model> inmodels = re.getEModels();
+ final EList<Model> inmodels = re.getEModels();
if (!inmodels.isEmpty() && !(value instanceof EObject && inmodels.contains(env.getModelOf((EObject) value)))) {
return false;
}
@@ -2169,7 +2200,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
// Check bound values
- CodeBlock binding = re.getBinding();
+ final CodeBlock binding = re.getBinding();
if (binding != null) {
final Object bvalue = binding.execute(frame.getSubFrame(binding, values));
if (bvalue == null) {
@@ -2210,18 +2241,18 @@ public class RuleImpl extends NamedElementImpl implements Rule {
boolean defaultMappingSet = false;
final ExecEnv env = frame.getEnv();
final int seSize = trace.getSourceElements().size();
- for (OutputRuleElement ore : getOutputElements()) {
- String oreName = ore.getName();
+ for (final OutputRuleElement ore : getOutputElements()) {
+ final String oreName = ore.getName();
// If there is *any* target element with the same name, it overrides us
if (trace.getTargetElement(oreName) != null) {
continue;
}
- TargetElement te = TraceFactory.eINSTANCE.createTargetElement();
+ final TargetElement te = TraceFactory.eINSTANCE.createTargetElement();
te.setName(oreName);
te.setTargetOf(trace);
- EList<SourceElement> teMapsTo = te.getMapsTo();
- for (InputRuleElement source : ore.getMapsTo()) {
- SourceElement mapsTo = trace.getSourceElement(source.getName(), false);
+ final EList<SourceElement> teMapsTo = te.getMapsTo();
+ for (final InputRuleElement source : ore.getMapsTo()) {
+ final SourceElement mapsTo = trace.getSourceElement(source.getName(), false);
assert mapsTo != null;
teMapsTo.add(mapsTo);
}
@@ -2232,17 +2263,17 @@ public class RuleImpl extends NamedElementImpl implements Rule {
EClass type;
try {
type = (EClass)env.findType(ore.getTypeModel(), ore.getType());
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new VMException(frame);
}
- EList<Model> models = ore.getEModels();
+ final EList<Model> models = ore.getEModels();
assert models.size() == 1;
te.setObject(models.get(0).newElement(type));
assert te.getObject() != null;
assert te.getObject().eResource() != null;
assert te.getObject().eResource() == models.get(0).getResource();
}
- for (Rule superRule : getESuperRules()) {
+ for (final Rule superRule : getESuperRules()) {
defaultMappingSet |= superRule.completeTraceFor(frame, trace);
}
return defaultMappingSet;
@@ -2284,31 +2315,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* <!-- end-user-doc -->
* @generated NOT
*/
- public Object applyOne(final StackFrame frame, final TraceLink trace) {
- Object result = null;
- for (Rule rule : getAllESuperRules()) {
- if (rule.getApplier() != null) {
- result = rule.applyFor(frame, trace);
- } else {
- rule.applyFor(frame, trace);
- }
- if (rule.getPostApply() != null) {
- result = rule.postApplyFor(frame, trace);
- } else {
- rule.postApplyFor(frame, trace);
- }
- }
- if (getApplier() != null) {
- result = applierCbState.applyFor(frame, trace);
- } else {
- applierCbState.applyFor(frame, trace);
- }
- if (getPostApply() != null) {
- result = applierCbState.postApplyFor(frame, trace);
- } else {
- applierCbState.postApplyFor(frame, trace);
- }
- return result;
+ public Object applyOne(final StackFrame frame, Map<String, Object> valuesMap) {
+ return uniqueState.applyOne(frame, createTrace(frame, valuesMap));
}
/**
@@ -2341,7 +2349,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (allESuperRules == null) {
final EList<Rule> eSuperRules = getESuperRules();
LazySet<Rule> superRules = new LazySet<Rule>();
- for (Rule rule : eSuperRules) {
+ for (final Rule rule : eSuperRules) {
superRules = superRules.union(rule.getAllESuperRules());
}
superRules = superRules.union(new LazySet<Rule>(eSuperRules));
@@ -2422,7 +2430,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @generated NOT
*/
public InputRuleElement findInputElement(final String name) {
- for (InputRuleElement ire : getInputElements()) {
+ for (final InputRuleElement ire : getInputElements()) {
if (name.equals(ire.getName())) {
return ire;
}
@@ -2439,38 +2447,48 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* <!-- begin-user-doc. -->
* {@inheritDoc}
* <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public TraceLink getUniqueTrace(final StackFrame frame, final Object[] values) {
+ return uniqueState.getUniqueTrace(frame, values);
+ }
+
+ /**
+ * <!-- begin-user-doc. -->
+ * {@inheritDoc}
+ * <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetModule((Module)otherEnd, msgs);
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getInputElements()).basicAdd(otherEnd, msgs);
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutputElements()).basicAdd(otherEnd, msgs);
- case EmftvmPackage.RULE__ESUPER_RULES:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getESuperRules()).basicAdd(otherEnd, msgs);
- case EmftvmPackage.RULE__ESUB_RULES:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getESubRules()).basicAdd(otherEnd, msgs);
- case EmftvmPackage.RULE__MATCHER:
- if (matcher != null)
- msgs = ((InternalEObject)matcher).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__MATCHER, null, msgs);
- return basicSetMatcher((CodeBlock)otherEnd, msgs);
- case EmftvmPackage.RULE__APPLIER:
- if (applier != null)
- msgs = ((InternalEObject)applier).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__APPLIER, null, msgs);
- return basicSetApplier((CodeBlock)otherEnd, msgs);
- case EmftvmPackage.RULE__POST_APPLY:
- if (postApply != null)
- msgs = ((InternalEObject)postApply).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__POST_APPLY, null, msgs);
- return basicSetPostApply((CodeBlock)otherEnd, msgs);
- case EmftvmPackage.RULE__FIELDS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getFields()).basicAdd(otherEnd, msgs);
+ case EmftvmPackage.RULE__MODULE:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetModule((Module)otherEnd, msgs);
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getInputElements()).basicAdd(otherEnd, msgs);
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutputElements()).basicAdd(otherEnd, msgs);
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getESuperRules()).basicAdd(otherEnd, msgs);
+ case EmftvmPackage.RULE__ESUB_RULES:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getESubRules()).basicAdd(otherEnd, msgs);
+ case EmftvmPackage.RULE__MATCHER:
+ if (matcher != null)
+ msgs = ((InternalEObject)matcher).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__MATCHER, null, msgs);
+ return basicSetMatcher((CodeBlock)otherEnd, msgs);
+ case EmftvmPackage.RULE__APPLIER:
+ if (applier != null)
+ msgs = ((InternalEObject)applier).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__APPLIER, null, msgs);
+ return basicSetApplier((CodeBlock)otherEnd, msgs);
+ case EmftvmPackage.RULE__POST_APPLY:
+ if (postApply != null)
+ msgs = ((InternalEObject)postApply).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmftvmPackage.RULE__POST_APPLY, null, msgs);
+ return basicSetPostApply((CodeBlock)otherEnd, msgs);
+ case EmftvmPackage.RULE__FIELDS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getFields()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -2484,24 +2502,24 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- return basicSetModule(null, msgs);
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- return ((InternalEList<?>)getInputElements()).basicRemove(otherEnd, msgs);
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- return ((InternalEList<?>)getOutputElements()).basicRemove(otherEnd, msgs);
- case EmftvmPackage.RULE__ESUPER_RULES:
- return ((InternalEList<?>)getESuperRules()).basicRemove(otherEnd, msgs);
- case EmftvmPackage.RULE__ESUB_RULES:
- return ((InternalEList<?>)getESubRules()).basicRemove(otherEnd, msgs);
- case EmftvmPackage.RULE__MATCHER:
- return basicSetMatcher(null, msgs);
- case EmftvmPackage.RULE__APPLIER:
- return basicSetApplier(null, msgs);
- case EmftvmPackage.RULE__POST_APPLY:
- return basicSetPostApply(null, msgs);
- case EmftvmPackage.RULE__FIELDS:
- return ((InternalEList<?>)getFields()).basicRemove(otherEnd, msgs);
+ case EmftvmPackage.RULE__MODULE:
+ return basicSetModule(null, msgs);
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ return ((InternalEList<?>)getInputElements()).basicRemove(otherEnd, msgs);
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ return ((InternalEList<?>)getOutputElements()).basicRemove(otherEnd, msgs);
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ return ((InternalEList<?>)getESuperRules()).basicRemove(otherEnd, msgs);
+ case EmftvmPackage.RULE__ESUB_RULES:
+ return ((InternalEList<?>)getESubRules()).basicRemove(otherEnd, msgs);
+ case EmftvmPackage.RULE__MATCHER:
+ return basicSetMatcher(null, msgs);
+ case EmftvmPackage.RULE__APPLIER:
+ return basicSetApplier(null, msgs);
+ case EmftvmPackage.RULE__POST_APPLY:
+ return basicSetPostApply(null, msgs);
+ case EmftvmPackage.RULE__FIELDS:
+ return ((InternalEList<?>)getFields()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -2515,8 +2533,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
switch (eContainerFeatureID()) {
- case EmftvmPackage.RULE__MODULE:
- return eInternalContainer().eInverseRemove(this, EmftvmPackage.MODULE__RULES, Module.class, msgs);
+ case EmftvmPackage.RULE__MODULE:
+ return eInternalContainer().eInverseRemove(this, EmftvmPackage.MODULE__RULES, Module.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -2530,40 +2548,40 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- return getModule();
- case EmftvmPackage.RULE__MODE:
- return getMode();
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- return getInputElements();
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- return getOutputElements();
- case EmftvmPackage.RULE__ESUPER_RULES:
- return getESuperRules();
- case EmftvmPackage.RULE__ESUB_RULES:
- return getESubRules();
- case EmftvmPackage.RULE__MATCHER:
- return getMatcher();
- case EmftvmPackage.RULE__APPLIER:
- return getApplier();
- case EmftvmPackage.RULE__POST_APPLY:
- return getPostApply();
- case EmftvmPackage.RULE__SUPER_RULES:
- return getSuperRules();
- case EmftvmPackage.RULE__ABSTRACT:
- return isAbstract();
- case EmftvmPackage.RULE__FIELDS:
- return getFields();
- case EmftvmPackage.RULE__DEFAULT:
- return isDefault();
- case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
- return isDistinctElements();
- case EmftvmPackage.RULE__UNIQUE:
- return isUnique();
- case EmftvmPackage.RULE__LEAF:
- return isLeaf();
- case EmftvmPackage.RULE__WITH_LEAVES:
- return isWithLeaves();
+ case EmftvmPackage.RULE__MODULE:
+ return getModule();
+ case EmftvmPackage.RULE__MODE:
+ return getMode();
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ return getInputElements();
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ return getOutputElements();
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ return getESuperRules();
+ case EmftvmPackage.RULE__ESUB_RULES:
+ return getESubRules();
+ case EmftvmPackage.RULE__MATCHER:
+ return getMatcher();
+ case EmftvmPackage.RULE__APPLIER:
+ return getApplier();
+ case EmftvmPackage.RULE__POST_APPLY:
+ return getPostApply();
+ case EmftvmPackage.RULE__SUPER_RULES:
+ return getSuperRules();
+ case EmftvmPackage.RULE__ABSTRACT:
+ return isAbstract();
+ case EmftvmPackage.RULE__FIELDS:
+ return getFields();
+ case EmftvmPackage.RULE__DEFAULT:
+ return isDefault();
+ case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
+ return isDistinctElements();
+ case EmftvmPackage.RULE__UNIQUE:
+ return isUnique();
+ case EmftvmPackage.RULE__LEAF:
+ return isLeaf();
+ case EmftvmPackage.RULE__WITH_LEAVES:
+ return isWithLeaves();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -2578,57 +2596,57 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- setModule((Module)newValue);
- return;
- case EmftvmPackage.RULE__MODE:
- setMode((RuleMode)newValue);
- return;
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- getInputElements().clear();
- getInputElements().addAll((Collection<? extends InputRuleElement>)newValue);
- return;
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- getOutputElements().clear();
- getOutputElements().addAll((Collection<? extends OutputRuleElement>)newValue);
- return;
- case EmftvmPackage.RULE__ESUPER_RULES:
- getESuperRules().clear();
- getESuperRules().addAll((Collection<? extends Rule>)newValue);
- return;
- case EmftvmPackage.RULE__ESUB_RULES:
- getESubRules().clear();
- getESubRules().addAll((Collection<? extends Rule>)newValue);
- return;
- case EmftvmPackage.RULE__MATCHER:
- setMatcher((CodeBlock)newValue);
- return;
- case EmftvmPackage.RULE__APPLIER:
- setApplier((CodeBlock)newValue);
- return;
- case EmftvmPackage.RULE__POST_APPLY:
- setPostApply((CodeBlock)newValue);
- return;
- case EmftvmPackage.RULE__SUPER_RULES:
- getSuperRules().clear();
- getSuperRules().addAll((Collection<? extends String>)newValue);
- return;
- case EmftvmPackage.RULE__ABSTRACT:
- setAbstract((Boolean)newValue);
- return;
- case EmftvmPackage.RULE__FIELDS:
- getFields().clear();
- getFields().addAll((Collection<? extends Field>)newValue);
- return;
- case EmftvmPackage.RULE__DEFAULT:
- setDefault((Boolean)newValue);
- return;
- case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
- setDistinctElements((Boolean)newValue);
- return;
- case EmftvmPackage.RULE__UNIQUE:
- setUnique((Boolean)newValue);
- return;
+ case EmftvmPackage.RULE__MODULE:
+ setModule((Module)newValue);
+ return;
+ case EmftvmPackage.RULE__MODE:
+ setMode((RuleMode)newValue);
+ return;
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ getInputElements().clear();
+ getInputElements().addAll((Collection<? extends InputRuleElement>)newValue);
+ return;
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ getOutputElements().clear();
+ getOutputElements().addAll((Collection<? extends OutputRuleElement>)newValue);
+ return;
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ getESuperRules().clear();
+ getESuperRules().addAll((Collection<? extends Rule>)newValue);
+ return;
+ case EmftvmPackage.RULE__ESUB_RULES:
+ getESubRules().clear();
+ getESubRules().addAll((Collection<? extends Rule>)newValue);
+ return;
+ case EmftvmPackage.RULE__MATCHER:
+ setMatcher((CodeBlock)newValue);
+ return;
+ case EmftvmPackage.RULE__APPLIER:
+ setApplier((CodeBlock)newValue);
+ return;
+ case EmftvmPackage.RULE__POST_APPLY:
+ setPostApply((CodeBlock)newValue);
+ return;
+ case EmftvmPackage.RULE__SUPER_RULES:
+ getSuperRules().clear();
+ getSuperRules().addAll((Collection<? extends String>)newValue);
+ return;
+ case EmftvmPackage.RULE__ABSTRACT:
+ setAbstract((Boolean)newValue);
+ return;
+ case EmftvmPackage.RULE__FIELDS:
+ getFields().clear();
+ getFields().addAll((Collection<? extends Field>)newValue);
+ return;
+ case EmftvmPackage.RULE__DEFAULT:
+ setDefault((Boolean)newValue);
+ return;
+ case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
+ setDistinctElements((Boolean)newValue);
+ return;
+ case EmftvmPackage.RULE__UNIQUE:
+ setUnique((Boolean)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -2642,51 +2660,51 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- setModule((Module)null);
- return;
- case EmftvmPackage.RULE__MODE:
- setMode(MODE_EDEFAULT);
- return;
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- getInputElements().clear();
- return;
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- getOutputElements().clear();
- return;
- case EmftvmPackage.RULE__ESUPER_RULES:
- getESuperRules().clear();
- return;
- case EmftvmPackage.RULE__ESUB_RULES:
- getESubRules().clear();
- return;
- case EmftvmPackage.RULE__MATCHER:
- setMatcher((CodeBlock)null);
- return;
- case EmftvmPackage.RULE__APPLIER:
- setApplier((CodeBlock)null);
- return;
- case EmftvmPackage.RULE__POST_APPLY:
- setPostApply((CodeBlock)null);
- return;
- case EmftvmPackage.RULE__SUPER_RULES:
- getSuperRules().clear();
- return;
- case EmftvmPackage.RULE__ABSTRACT:
- setAbstract(ABSTRACT_EDEFAULT);
- return;
- case EmftvmPackage.RULE__FIELDS:
- getFields().clear();
- return;
- case EmftvmPackage.RULE__DEFAULT:
- setDefault(DEFAULT_EDEFAULT);
- return;
- case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
- setDistinctElements(DISTINCT_ELEMENTS_EDEFAULT);
- return;
- case EmftvmPackage.RULE__UNIQUE:
- setUnique(UNIQUE_EDEFAULT);
- return;
+ case EmftvmPackage.RULE__MODULE:
+ setModule((Module)null);
+ return;
+ case EmftvmPackage.RULE__MODE:
+ setMode(MODE_EDEFAULT);
+ return;
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ getInputElements().clear();
+ return;
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ getOutputElements().clear();
+ return;
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ getESuperRules().clear();
+ return;
+ case EmftvmPackage.RULE__ESUB_RULES:
+ getESubRules().clear();
+ return;
+ case EmftvmPackage.RULE__MATCHER:
+ setMatcher((CodeBlock)null);
+ return;
+ case EmftvmPackage.RULE__APPLIER:
+ setApplier((CodeBlock)null);
+ return;
+ case EmftvmPackage.RULE__POST_APPLY:
+ setPostApply((CodeBlock)null);
+ return;
+ case EmftvmPackage.RULE__SUPER_RULES:
+ getSuperRules().clear();
+ return;
+ case EmftvmPackage.RULE__ABSTRACT:
+ setAbstract(ABSTRACT_EDEFAULT);
+ return;
+ case EmftvmPackage.RULE__FIELDS:
+ getFields().clear();
+ return;
+ case EmftvmPackage.RULE__DEFAULT:
+ setDefault(DEFAULT_EDEFAULT);
+ return;
+ case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
+ setDistinctElements(DISTINCT_ELEMENTS_EDEFAULT);
+ return;
+ case EmftvmPackage.RULE__UNIQUE:
+ setUnique(UNIQUE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -2700,40 +2718,40 @@ public class RuleImpl extends NamedElementImpl implements Rule {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case EmftvmPackage.RULE__MODULE:
- return getModule() != null;
- case EmftvmPackage.RULE__MODE:
- return mode != MODE_EDEFAULT;
- case EmftvmPackage.RULE__INPUT_ELEMENTS:
- return inputElements != null && !inputElements.isEmpty();
- case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
- return outputElements != null && !outputElements.isEmpty();
- case EmftvmPackage.RULE__ESUPER_RULES:
- return eSuperRules != null && !eSuperRules.isEmpty();
- case EmftvmPackage.RULE__ESUB_RULES:
- return eSubRules != null && !eSubRules.isEmpty();
- case EmftvmPackage.RULE__MATCHER:
- return matcher != null;
- case EmftvmPackage.RULE__APPLIER:
- return applier != null;
- case EmftvmPackage.RULE__POST_APPLY:
- return postApply != null;
- case EmftvmPackage.RULE__SUPER_RULES:
- return superRules != null && !superRules.isEmpty();
- case EmftvmPackage.RULE__ABSTRACT:
- return abstract_ != ABSTRACT_EDEFAULT;
- case EmftvmPackage.RULE__FIELDS:
- return fields != null && !fields.isEmpty();
- case EmftvmPackage.RULE__DEFAULT:
- return default_ != DEFAULT_EDEFAULT;
- case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
- return distinctElements != DISTINCT_ELEMENTS_EDEFAULT;
- case EmftvmPackage.RULE__UNIQUE:
- return unique != UNIQUE_EDEFAULT;
- case EmftvmPackage.RULE__LEAF:
- return leaf != LEAF_EDEFAULT;
- case EmftvmPackage.RULE__WITH_LEAVES:
- return withLeaves != WITH_LEAVES_EDEFAULT;
+ case EmftvmPackage.RULE__MODULE:
+ return getModule() != null;
+ case EmftvmPackage.RULE__MODE:
+ return mode != MODE_EDEFAULT;
+ case EmftvmPackage.RULE__INPUT_ELEMENTS:
+ return inputElements != null && !inputElements.isEmpty();
+ case EmftvmPackage.RULE__OUTPUT_ELEMENTS:
+ return outputElements != null && !outputElements.isEmpty();
+ case EmftvmPackage.RULE__ESUPER_RULES:
+ return eSuperRules != null && !eSuperRules.isEmpty();
+ case EmftvmPackage.RULE__ESUB_RULES:
+ return eSubRules != null && !eSubRules.isEmpty();
+ case EmftvmPackage.RULE__MATCHER:
+ return matcher != null;
+ case EmftvmPackage.RULE__APPLIER:
+ return applier != null;
+ case EmftvmPackage.RULE__POST_APPLY:
+ return postApply != null;
+ case EmftvmPackage.RULE__SUPER_RULES:
+ return superRules != null && !superRules.isEmpty();
+ case EmftvmPackage.RULE__ABSTRACT:
+ return abstract_ != ABSTRACT_EDEFAULT;
+ case EmftvmPackage.RULE__FIELDS:
+ return fields != null && !fields.isEmpty();
+ case EmftvmPackage.RULE__DEFAULT:
+ return default_ != DEFAULT_EDEFAULT;
+ case EmftvmPackage.RULE__DISTINCT_ELEMENTS:
+ return distinctElements != DISTINCT_ELEMENTS_EDEFAULT;
+ case EmftvmPackage.RULE__UNIQUE:
+ return unique != UNIQUE_EDEFAULT;
+ case EmftvmPackage.RULE__LEAF:
+ return leaf != LEAF_EDEFAULT;
+ case EmftvmPackage.RULE__WITH_LEAVES:
+ return withLeaves != WITH_LEAVES_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -2747,7 +2765,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer();
+ final StringBuffer result = new StringBuffer();
if (abstract_) {
result.append("abstract ");
}
@@ -2926,7 +2944,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @return <code>true</code> iff the rule matches
*/
private boolean matchFor(
- final StackFrame frame,
+ final StackFrame frame,
final Map<String, Object> values, final int index,
final List<TracedRule> superMatches,
final Map<String, Iterable<EObject>> iterables,
@@ -2934,43 +2952,43 @@ public class RuleImpl extends NamedElementImpl implements Rule {
boolean result = false;
final int superSize = superMatches.size();
if (index < superSize) {
- // create copy to distinguish pre-existing source elements from the ones added here
+ // create copy to distinguish pre-existing source elements from the ones added here
final Map<String, Object> newValues = new LinkedHashMap<String, Object>(values);
final TracedRule tr = superMatches.get(index);
MATCH:
- for (TraceLink match : tr.getLinks()) {
- for (SourceElement se : match.getSourceElements()) {
- String seName = se.getName();
- EObject seValue = se.getObject();
- if (values.containsKey(seName)) {
- if (values.get(seName) != seValue) {
- continue MATCH; // go to next match, as elements of the same name must be identical
+ for (final TraceLink match : tr.getLinks()) {
+ for (final SourceElement se : match.getSourceElements()) {
+ final String seName = se.getName();
+ final EObject seValue = se.getObject();
+ if (values.containsKey(seName)) {
+ if (values.get(seName) != seValue) {
+ continue MATCH; // go to next match, as elements of the same name must be identical
+ }
+ } else if (isDistinctElements() && values.containsValue(seValue)) {
+ continue MATCH; // all elements in this rule are distinct
+ } else {
+ newValues.put(seName, seValue);
}
- } else if (isDistinctElements() && values.containsValue(seValue)) {
- continue MATCH; // all elements in this rule are distinct
- } else {
- newValues.put(seName, seValue);
}
- }
- for (RuleElement re : getInputElements()) {
- String reName = re.getName();
- // Not all rule input elements exist in newValues!
- if (newValues.containsKey(reName)
- && !re.getEType().isInstance(newValues.get(reName))) {
- // go to next match, as elements must conform to sub-rule type
- continue MATCH;
+ for (final RuleElement re : getInputElements()) {
+ final String reName = re.getName();
+ // Not all rule input elements exist in newValues!
+ if (newValues.containsKey(reName)
+ && !re.getEType().isInstance(newValues.get(reName))) {
+ // go to next match, as elements must conform to sub-rule type
+ continue MATCH;
+ }
}
+ currentMatches.put(tr, match);
+ result |= matchFor(frame, newValues, index + 1, superMatches, iterables, currentMatches);
}
- currentMatches.put(tr, match);
- result |= matchFor(frame, newValues, index + 1, superMatches, iterables, currentMatches);
- }
} else if (!iterables.isEmpty()) {
result = matchFor(frame, values, iterables, new ArrayList<String>(iterables.keySet()), 0);
} else {
result = matchFor(frame, values, createValuesArray(values), 0);
if (result) {
// Schedule selected parent matches for removal
- for (TraceLink link : currentMatches.values()) {
+ for (final TraceLink link : currentMatches.values()) {
link.setOverridden(true);
}
}
@@ -2988,7 +3006,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @return <code>true</code> iff the rule matches
*/
private boolean matchFor(
- final StackFrame frame,
+ final StackFrame frame,
final Map<String, Object> values,
final Map<String, Iterable<EObject>> iterables,
final List<String> keys,
@@ -2998,7 +3016,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
boolean result = false;
final String key = keys.get(keyIndex);
assert !values.containsKey(key);
- for (EObject o : iterables.get(key)) {
+ for (final EObject o : iterables.get(key)) {
assert frame.getEnv().getModelOf(o) != null;
if (isDistinctElements() && values.containsValue(o)) {
continue; // all elements in this rule are distinct
@@ -3032,8 +3050,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (newIndex < values.length) {
boolean result = false;
-
- for (EObject o : iterables.get(newIndex)) {
+
+ for (final EObject o : iterables.get(newIndex)) {
assert frame.getEnv().getModelOf(o) != null;
if (!distinctState.checkDistinct(values, newIndex, o)) {
continue; // all elements in this rule are distinct
@@ -3042,7 +3060,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
result |= matchFor(frame, values, newIndex + 1, iterables);
values[newIndex] = null;
}
-
+
return result;
} else {
return matchFor(frame, values, 0);
@@ -3082,7 +3100,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
} else if (value instanceof Collection<?>) {
boolean result = false;
- for (EObject v : (Collection<EObject>)value) {
+ for (final EObject v : (Collection<EObject>)value) {
if (!ire.getEType().isInstance(v) || !distinctState.checkDistinct(values, values.length - 1, v)) {
continue; // all elements in this rule are distinct
}
@@ -3095,7 +3113,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (!ire.getEType().isInstance(value) || !distinctState.checkDistinct(values, values.length - 1, value)) {
return false; // all elements in this rule are distinct
}
- values[index] = (EObject)value;
+ values[index] = value;
final boolean result = matchFor(frame, values, index + 1);
values[index] = null;
return result;
@@ -3118,7 +3136,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @return <code>true</code> iff <code>rule</code> matches against <code>values</code>
*/
@SuppressWarnings("unchecked")
- private boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ private boolean matchFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values, final int index) {
// Assign bound input element values
final EList<InputRuleElement> inputs = getInputElements();
@@ -3144,8 +3162,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
} else if (value instanceof Collection<?>) {
final String key = ire.getName();
boolean result = false;
- for (EObject v : (Collection<EObject>)value) {
- if (!ire.getEType().isInstance(v) ||
+ for (final EObject v : (Collection<EObject>)value) {
+ if (!ire.getEType().isInstance(v) ||
(isDistinctElements() && valuesMap.containsValue(v))) {
continue; // all elements in this rule are distinct
}
@@ -3157,13 +3175,13 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
return result;
} else {
- if (!ire.getEType().isInstance(value) ||
+ if (!ire.getEType().isInstance(value) ||
(isDistinctElements() && valuesMap.containsValue(value))) {
return false; // all elements in this rule are distinct
}
final String key = ire.getName();
- values[index] = (EObject)value;
- valuesMap.put(key, (EObject)value);
+ values[index] = value;
+ valuesMap.put(key, value);
final boolean result = matchFor(frame, valuesMap, values, index + 1);
valuesMap.remove(key);
values[index] = null;
@@ -3188,45 +3206,45 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @return <code>true</code> iff the rule matches
*/
private boolean matchOneFor(
- final StackFrame frame,
+ final StackFrame frame,
final Map<String, Object> values, final int index,
final List<TracedRule> superMatches,
final Map<String, Iterable<EObject>> iterables,
final Map<TracedRule, TraceLink> currentMatches) {
final int superSize = superMatches.size();
if (index < superSize) {
- // create copy to distinguish pre-existing source elements from the ones added here
+ // create copy to distinguish pre-existing source elements from the ones added here
final Map<String, Object> newValues = new LinkedHashMap<String, Object>(values);
final TracedRule tr = superMatches.get(index);
MATCH:
- for (TraceLink match : tr.getLinks()) {
- for (SourceElement se : match.getSourceElements()) {
- String seName = se.getName();
- EObject seValue = se.getObject();
- if (values.containsKey(seName)) {
- if (values.get(seName) != seValue) {
- continue MATCH; // go to next match, as elements of the same name must be identical
+ for (final TraceLink match : tr.getLinks()) {
+ for (final SourceElement se : match.getSourceElements()) {
+ final String seName = se.getName();
+ final EObject seValue = se.getObject();
+ if (values.containsKey(seName)) {
+ if (values.get(seName) != seValue) {
+ continue MATCH; // go to next match, as elements of the same name must be identical
+ }
+ } else if (isDistinctElements() && values.containsValue(seValue)) {
+ continue MATCH; // all elements in this rule are distinct
+ } else {
+ newValues.put(seName, seValue);
}
- } else if (isDistinctElements() && values.containsValue(seValue)) {
- continue MATCH; // all elements in this rule are distinct
- } else {
- newValues.put(seName, seValue);
}
- }
- for (RuleElement re : getInputElements()) {
- String reName = re.getName();
- // Not all rule input elements exist in newValues!
- if (newValues.containsKey(reName)
- && !re.getEType().isInstance(newValues.get(reName))) {
- // go to next match, as elements must conform to sub-rule type
- continue MATCH;
+ for (final RuleElement re : getInputElements()) {
+ final String reName = re.getName();
+ // Not all rule input elements exist in newValues!
+ if (newValues.containsKey(reName)
+ && !re.getEType().isInstance(newValues.get(reName))) {
+ // go to next match, as elements must conform to sub-rule type
+ continue MATCH;
+ }
+ }
+ currentMatches.put(tr, match);
+ if (matchOneFor(frame, newValues, index + 1, superMatches, iterables, currentMatches)) {
+ return true;
}
}
- currentMatches.put(tr, match);
- if (matchOneFor(frame, newValues, index + 1, superMatches, iterables, currentMatches)) {
- return true;
- }
- }
return false;
} else if (!iterables.isEmpty()) {
return matchOneFor(frame, values, iterables, new ArrayList<String>(iterables.keySet()), 0);
@@ -3235,7 +3253,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
result = matchOneFor(frame, values, createValuesArray(values), 0);
if (result) {
// Schedule selected parent matches for removal
- for (TraceLink link : currentMatches.values()) {
+ for (final TraceLink link : currentMatches.values()) {
link.setOverridden(true);
}
}
@@ -3251,7 +3269,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param keyIndex
*/
private boolean matchOneFor(
- final StackFrame frame,
+ final StackFrame frame,
final Map<String, Object> values,
final Map<String, Iterable<EObject>> iterables,
final List<String> keys,
@@ -3260,7 +3278,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
if (keyIndex < size) {
final String key = keys.get(keyIndex);
assert !values.containsKey(key);
- for (EObject o : iterables.get(key)) {
+ for (final EObject o : iterables.get(key)) {
assert frame.getEnv().getModelOf(o) != null;
if (isDistinctElements() && values.containsValue(o)) {
continue; // all elements in this rule are distinct
@@ -3286,7 +3304,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param index the current index of <code>values</code> and <code>iterables</code>
* @param iterables the collections over which to iterate
*/
- private boolean matchOneFor(final StackFrame frame, final EObject[] values, final int index,
+ private boolean matchOneFor(final StackFrame frame, final EObject[] values, final int index,
final List<Iterable<EObject>> iterables) {
assert values.length == iterables.size();
int newIndex = index;
@@ -3295,7 +3313,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
if (newIndex < values.length) {
- for (EObject o : iterables.get(newIndex)) {
+ for (final EObject o : iterables.get(newIndex)) {
assert frame.getEnv().getModelOf(o) != null;
if (!distinctState.checkDistinct(values, newIndex, o)) {
continue;
@@ -3344,7 +3362,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
}
} else if (value instanceof Collection<?>) {
- for (EObject v : (Collection<EObject>)value) {
+ for (final EObject v : (Collection<EObject>)value) {
if (!ire.getEType().isInstance(v) || !distinctState.checkDistinct(values, values.length - 1, v)) {
continue; // all elements in this rule are distinct
}
@@ -3382,7 +3400,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @return <code>true</code> iff <code>rule</code> matches against <code>values</code>
*/
@SuppressWarnings("unchecked")
- private boolean matchOneFor(final StackFrame frame, final Map<String, Object> valuesMap,
+ private boolean matchOneFor(final StackFrame frame, final Map<String, Object> valuesMap,
final Object[] values, final int index) {
// Assign bound input element values
final EList<InputRuleElement> inputs = getInputElements();
@@ -3407,8 +3425,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
} else if (value instanceof Collection<?>) {
final String key = ire.getName();
- for (EObject v : (Collection<EObject>)value) {
- if (!ire.getEType().isInstance(v) ||
+ for (final EObject v : (Collection<EObject>)value) {
+ if (!ire.getEType().isInstance(v) ||
(isDistinctElements() && valuesMap.containsValue(v))) {
continue; // all elements in this rule are distinct
}
@@ -3423,13 +3441,13 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
return false;
} else {
- if (!ire.getEType().isInstance(value) ||
+ if (!ire.getEType().isInstance(value) ||
(isDistinctElements() && valuesMap.containsValue(value))) {
return false; // all elements in this rule are distinct
}
final String key = ire.getName();
- values[index] = (EObject)value;
- valuesMap.put(key, (EObject)value);
+ values[index] = value;
+ valuesMap.put(key, value);
final boolean result = matchOneFor(frame, valuesMap, values, index + 1);
valuesMap.remove(key);
values[index] = null;
@@ -3438,7 +3456,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
return matchOneFor(frame, valuesMap, values, index + 1);
}
-
+
// Match values
return uniqueState.matchFor(frame, valuesMap, values);
}
@@ -3452,7 +3470,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final EList<InputRuleElement> allInput = getInputElements();
final Object[] valuesArray = new Object[allInput.size()];
int i = 0;
- for (InputRuleElement re : allInput) {
+ for (final InputRuleElement re : allInput) {
valuesArray[i++] = values.get(re.getName());
// null values allowed, as long as they are later filled in by bound elements
assert getMode() == RuleMode.MANUAL || re.getBinding() != null || valuesArray[i - 1] != null;
@@ -3471,7 +3489,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final Map<String, Object> valuesMap = new LinkedHashMap<String, Object>(allInput.size());
assert allInput.size() == values.length;
int i = 0;
- for (RuleElement re : allInput) {
+ for (final RuleElement re : allInput) {
valuesMap.put(re.getName(), values[i++]);
assert getMode() == RuleMode.MANUAL || values[i - 1] != null;
}
@@ -3493,8 +3511,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
tr.getLinks().add(trace);
final EList<SourceElement> ses = trace.getSourceElements();
//Add all values for the trace, not just the ones specified in the rule signature
- for (Entry<String, Object> v : values.entrySet()) {
- SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
+ for (final Entry<String, Object> v : values.entrySet()) {
+ final SourceElement se = TraceFactory.eINSTANCE.createSourceElement();
se.setName(v.getKey());
se.setRuntimeObject(v.getValue());
ses.add(se);
@@ -3524,8 +3542,8 @@ public class RuleImpl extends NamedElementImpl implements Rule {
"Cannot create a trace for rule %s; no matches exist",
this));
}
- for (Iterator<TraceLink> links = tr.getLinks().iterator(); links.hasNext();) {
- TraceLink trace = links.next();
+ for (final Iterator<TraceLink> links = tr.getLinks().iterator(); links.hasNext();) {
+ final TraceLink trace = links.next();
if (trace.isOverridden()) {
links.remove(); // This match is overridden by a sub-rule
continue;
@@ -3534,7 +3552,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final TracedRule ntr = traces.getLinksByRule(ruleName, true);
ntr.getLinks().add(trace);
uniqueState.createUniqueMapping(trace);
- for (Rule rule : getAllESuperRules()) {
+ for (final Rule rule : getAllESuperRules()) {
rule.createUniqueMapping(trace);
}
final boolean defaultMappingSet = completeTraceFor(frame, trace);
@@ -3549,39 +3567,6 @@ public class RuleImpl extends NamedElementImpl implements Rule {
}
/**
- * Applies {@link #getRule()} to <code>trace</code>
- * @param frame the stack frame in which to execute the applier and post-apply
- * @param trace the source and target values to which to apply the rule
- * @return the rule application result
- */
- private Object applyTo(final StackFrame frame, final TraceLink trace) {
- Object result = null;
- for (Rule rule : getAllESuperRules()) {
- if (rule.getApplier() != null) {
- result = rule.applyFor(frame, trace);
- } else {
- rule.applyFor(frame, trace);
- }
- if (rule.getPostApply() != null) {
- result = rule.postApplyFor(frame, trace);
- } else {
- rule.postApplyFor(frame, trace);
- }
- }
- if (getApplier() != null) {
- result = applierCbState.applyFor(frame, trace);
- } else {
- applierCbState.applyFor(frame, trace);
- }
- if (getPostApply() != null) {
- result = applierCbState.postApplyFor(frame, trace);
- } else {
- applierCbState.postApplyFor(frame, trace);
- }
- return result;
- }
-
- /**
* Creates applier invocation arguments for this rule from <code>trace</code>.
* @param trace the trace element with source and target values
* @return applier invocation arguments for <code>rule</code>
@@ -3592,11 +3577,11 @@ public class RuleImpl extends NamedElementImpl implements Rule {
final Object[] args = new Object[1 + input.size() + output.size()];
args[0] = trace;
int i = 1;
- for (InputRuleElement ire : input) {
+ for (final InputRuleElement ire : input) {
args[i++] = trace.getSourceElement(ire.getName(), false).getRuntimeObject();
assert args[i - 1] != null;
}
- for (OutputRuleElement ore : output) {
+ for (final OutputRuleElement ore : output) {
args[i++] = trace.getTargetElement(ore.getName()).getObject();
assert args[i - 1] != null;
}
@@ -3610,7 +3595,7 @@ public class RuleImpl extends NamedElementImpl implements Rule {
* @param trace the trace element with source values
*/
private void createAllUniqueMappings(final TraceLink trace) {
- for (Rule rule : getAllESuperRules()) {
+ for (final Rule rule : getAllESuperRules()) {
rule.createUniqueMapping(trace);
}
uniqueState.createUniqueMapping(trace);
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java
index 8b9402fc..52a40d7d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Set;
* An implementation of the model object '<em><b>Set</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java
index 36324959..90edab13 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SetStaticImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.SetStatic;
* An implementation of the model object '<em><b>Set static</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java
index c1875ce8..d642db01 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/StoreImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Store;
* An implementation of the model object '<em><b>Store</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java
index 25124427..27f426f2 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Swap;
* An implementation of the model object '<em><b>Swap</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java
index 0aaf0778..370bdf7d 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/SwapX1Impl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.SwapX1;
* An implementation of the model object '<em><b>Swap x1</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java
index ae1f8fb8..ada09bd8 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/TypedElementImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.TypedElementImpl#getEType <em>EType</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.TypedElementImpl#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.impl.TypedElementImpl#getTypeModel <em>Type Model</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java
index f0fb25b4..de15cc81 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/impl/XorImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.m2m.atl.emftvm.Xor;
* An implementation of the model object '<em><b>Xor</b></em>'.
* @author <a href="mailto:dennis.wagelaar@vub.ac.be">Dennis Wagelaar</a>
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java
index 4fe9431a..ef9235f8 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/RuleTest.java
@@ -11,11 +11,11 @@
*******************************************************************************/
package org.eclipse.m2m.atl.emftvm.tests;
-import junit.textui.TestRunner;
-
import org.eclipse.m2m.atl.emftvm.EmftvmFactory;
import org.eclipse.m2m.atl.emftvm.Rule;
+import junit.textui.TestRunner;
+
/**
* <!-- begin-user-doc -->
* A test case for the model object '<em><b>Rule</b></em>'.
@@ -48,7 +48,7 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#apply(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Apply</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#postApply(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Post Apply</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#applyFirst(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Apply First</em>}</li>
- * <li>{@link org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink) <em>Apply One</em>}</li>
+ * <li>{@link org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map) <em>Apply One</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#applyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink) <em>Apply For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#postApplyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink) <em>Post Apply For</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#getAllESuperRules() <em>Get All ESuper Rules</em>}</li>
@@ -58,6 +58,7 @@ import org.eclipse.m2m.atl.emftvm.Rule;
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#compileIterables(org.eclipse.m2m.atl.emftvm.ExecEnv) <em>Compile Iterables</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#clearFields() <em>Clear Fields</em>}</li>
* <li>{@link org.eclipse.m2m.atl.emftvm.Rule#findInputElement(java.lang.String) <em>Find Input Element</em>}</li>
+ * <li>{@link org.eclipse.m2m.atl.emftvm.Rule#getUniqueTrace(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.lang.Object[]) <em>Get Unique Trace</em>}</li>
* </ul>
* </p>
* @generated
@@ -119,7 +120,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#getESuperRules() <em>ESuper Rules</em>}' feature getter. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#getESuperRules()
* @generated NOT
*/
@@ -132,7 +133,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#getESubRules() <em>ESub Rules</em>}' feature getter. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#getESubRules()
* @generated NOT
*/
@@ -145,7 +146,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#isLeaf() <em>Leaf</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc
* -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#isLeaf()
* @generated NOT
*/
@@ -158,7 +159,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#isWithLeaves() <em>With Leaves</em>}' feature getter. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#isWithLeaves()
* @generated NOT
*/
@@ -171,7 +172,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#findField(java.lang.Object, java.lang.String) <em>Find Field</em>}' operation. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#findField(java.lang.Object, java.lang.String)
* @generated NOT
*/
@@ -184,7 +185,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#hasField(java.lang.String) <em>Has Field</em>}' operation. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#hasField(java.lang.String)
* @generated NOT
*/
@@ -197,7 +198,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#findStaticField(java.lang.Object, java.lang.String) <em>Find Static Field</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#findStaticField(java.lang.Object, java.lang.String)
* @generated NOT
*/
@@ -210,7 +211,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#hasStaticField(java.lang.String) <em>Has Static Field</em>}' operation. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#hasStaticField(java.lang.String)
* @generated NOT
*/
@@ -223,7 +224,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#registerField(org.eclipse.m2m.atl.emftvm.Field) <em>Register Field</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#registerField(org.eclipse.m2m.atl.emftvm.Field)
* @generated NOT
*/
@@ -236,7 +237,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#matchSingle(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Match Single</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#matchSingle(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -249,7 +250,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#matchRecursive(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* <em>Match Recursive</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#matchRecursive(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -269,13 +270,13 @@ public class RuleTest extends NamedElementTest {
public void testMatchManual__StackFrame_Object() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
-
+
}
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#matchOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map)
* <em>Match One</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#matchOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map)
* @generated NOT
*/
@@ -290,18 +291,18 @@ public class RuleTest extends NamedElementTest {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.m2m.atl.emftvm.Rule#matchOneOnly(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map)
- * @generated
+ * @generated NOT
*/
public void testMatchOneOnly__StackFrame_Map() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
- fail();
+
}
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#createTraces(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Create Traces</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#createTraces(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -315,7 +316,7 @@ public class RuleTest extends NamedElementTest {
* Tests the '
* {@link org.eclipse.m2m.atl.emftvm.Rule#completeTraceFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* <em>Complete Trace For</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#completeTraceFor(org.eclipse.m2m.atl.emftvm.util.StackFrame,
* org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* @generated NOT
@@ -329,7 +330,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#apply(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Apply</em>}' operation. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#apply(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -342,7 +343,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#postApply(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Post Apply</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#postApply(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -355,7 +356,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#applyFirst(org.eclipse.m2m.atl.emftvm.util.StackFrame) <em>Apply First</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#applyFirst(org.eclipse.m2m.atl.emftvm.util.StackFrame)
* @generated NOT
*/
@@ -366,23 +367,36 @@ public class RuleTest extends NamedElementTest {
}
/**
+ * Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map) <em>Apply One</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.util.Map)
+ * @generated
+ */
+ public void testApplyOne__StackFrame_Map() {
+ // TODO: implement this operation test method
+ // Ensure that you remove @generated or mark it @generated NOT
+
+ }
+
+ /**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink) <em>Apply One</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.m2m.atl.emftvm.Rule#applyOne(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink)
- * @generated
+ * @generated NOT
*/
public void testApplyOne__StackFrame_TraceLink() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
- fail();
+
}
/**
* Tests the '
* {@link org.eclipse.m2m.atl.emftvm.Rule#applyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* <em>Apply For</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#applyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* @generated NOT
*/
@@ -396,7 +410,7 @@ public class RuleTest extends NamedElementTest {
* Tests the '
* {@link org.eclipse.m2m.atl.emftvm.Rule#postApplyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame, org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* <em>Post Apply For</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#postApplyFor(org.eclipse.m2m.atl.emftvm.util.StackFrame,
* org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* @generated NOT
@@ -410,7 +424,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#getAllESuperRules() <em>Get All ESuper Rules</em>}' operation. <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#getAllESuperRules()
* @generated NOT
*/
@@ -423,7 +437,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#createUniqueMapping(org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* <em>Create Unique Mapping</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#createUniqueMapping(org.eclipse.m2m.atl.emftvm.trace.TraceLink)
* @generated NOT
*/
@@ -436,7 +450,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#compileState(org.eclipse.m2m.atl.emftvm.ExecEnv) <em>Compile State</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#compileState(org.eclipse.m2m.atl.emftvm.ExecEnv)
* @generated NOT
*/
@@ -449,7 +463,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#resetState() <em>Reset State</em>}' operation. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#resetState()
* @generated NOT
*/
@@ -462,7 +476,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#compileIterables(org.eclipse.m2m.atl.emftvm.ExecEnv) <em>Compile Iterables</em>}'
* operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#compileIterables(org.eclipse.m2m.atl.emftvm.ExecEnv)
* @generated NOT
*/
@@ -475,7 +489,7 @@ public class RuleTest extends NamedElementTest {
/**
* Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#clearFields() <em>Clear Fields</em>}' operation. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @see org.eclipse.m2m.atl.emftvm.Rule#clearFields()
* @generated NOT
*/
@@ -497,4 +511,17 @@ public class RuleTest extends NamedElementTest {
// Ensure that you remove @generated or mark it @generated NOT
}
+ /**
+ * Tests the '{@link org.eclipse.m2m.atl.emftvm.Rule#getUniqueTrace(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.lang.Object[]) <em>Get Unique Trace</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.m2m.atl.emftvm.Rule#getUniqueTrace(org.eclipse.m2m.atl.emftvm.util.StackFrame, java.lang.Object[])
+ * @generated
+ */
+ public void testGetUniqueTrace__StackFrame_Object() {
+ // TODO: implement this operation test method
+ // Ensure that you remove @generated or mark it @generated NOT
+
+ }
+
} //RuleTest
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java
index 906cfa67..1244d9b8 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/integration/IntegrationTest.java
@@ -12,7 +12,6 @@
package org.eclipse.m2m.atl.emftvm.tests.integration;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
@@ -24,7 +23,6 @@ import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.m2m.atl.common.ATLLogger;
-import org.eclipse.m2m.atl.core.ATLCoreException;
import org.eclipse.m2m.atl.core.IModel;
import org.eclipse.m2m.atl.core.IReferenceModel;
import org.eclipse.m2m.atl.core.ModelFactory;
@@ -48,7 +46,7 @@ public class IntegrationTest extends EMFTVMTest {
/**
* Tests "PrimitiveTypeLazyRuleTest.atl".
*/
- public void testPrimitiveTypeLazyRule() {
+ public void testPrimitiveTypeLazyRule() throws Exception {
final ResourceSet rs = new ResourceSetImpl();
final ExecEnv env = EmftvmFactory.eINSTANCE.createExecEnv();
final TimingData td = new TimingData();
@@ -177,7 +175,7 @@ public class IntegrationTest extends EMFTVMTest {
final Model refOut = loadTestModel(refRs, "/test-data/Regression/Bug413110Inheritance-out.ecore");
assertEquals(refOut.getResource(), model.getResource());
}
-
+
/**
* Tests regression of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=421718">Bug # 421718</a>.
*/
@@ -365,7 +363,7 @@ public class IntegrationTest extends EMFTVMTest {
assertTrue(
String.format(
"Expected Regression::Bug454382 to complete in < 1 sec. but was %f sec.",
- td.getFinished() / ((double) 1E9)),
+ td.getFinished() / (1E9)),
td.getFinished() < 1E9);
}
@@ -383,20 +381,24 @@ public class IntegrationTest extends EMFTVMTest {
assertEquals("value", result);
}
- public void testATLAPI() throws ATLCoreException, IOException {
-
- ModelFactory mf = AtlParser.getDefault().getModelFactory();
- IReferenceModel atlMM = AtlParser.getDefault().getAtlMetamodel();
- IModel atlM = mf.newModel(atlMM);
-
- EObject module = (EObject) atlM.newElement(atlMM.getMetaElementByName("Module"));
+ /**
+ * Tests the ATL metamodel API.
+ */
+ public void testATLAPI() throws Exception {
+ final ModelFactory mf = AtlParser.getDefault().getModelFactory();
+ final IReferenceModel atlMM = AtlParser.getDefault().getAtlMetamodel();
+ final IModel atlM = mf.newModel(atlMM);
+
+ final EObject module = (EObject) atlM.newElement(atlMM.getMetaElementByName("Module"));
module.eSet(module.eClass().getEStructuralFeature("name"), "testmodule");
- EObject rule = (EObject) atlM.newElement(atlMM.getMetaElementByName("MatchedRule"));
+ final EObject rule = (EObject) atlM.newElement(atlMM.getMetaElementByName("MatchedRule"));
rule.eSet(rule.eClass().getEStructuralFeature("name"), "Test");
+ @SuppressWarnings("unchecked")
+ final
EList<EObject> moduleElements = (EList<EObject>) module.eGet(module.eClass().getEStructuralFeature("elements"));
moduleElements.add(rule);
-
- FileOutputStream fos = new FileOutputStream("testmodule.atl");
+
+ final FileOutputStream fos = new FileOutputStream("testmodule.atl");
try {
AtlParser.getDefault().extract(atlM, fos, Collections.emptyMap());
} finally {
@@ -404,7 +406,6 @@ public class IntegrationTest extends EMFTVMTest {
fos.close();
}
}
-
}
/**
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest-trace.xmi b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest-trace.xmi
index 4c00804a..923527ef 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest-trace.xmi
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest-trace.xmi
@@ -32,4 +32,8 @@
<uniqueSourceElementLists sourceElements="//@rules.1/@links.0/@sourceElements.0 //@rules.1/@links.0/@sourceElements.1"/>
<uniqueSourceElementLists sourceElements="//@rules.1/@links.1/@sourceElements.0 //@rules.1/@links.1/@sourceElements.1"/>
</rules>
+ <rules rule="CartesianEClassifier">
+ <uniqueSourceElementLists sourceElements="//@rules.1/@links.0/@sourceElements.0 //@rules.1/@links.0/@sourceElements.1"/>
+ <uniqueSourceElementLists sourceElements="//@rules.1/@links.1/@sourceElements.0 //@rules.1/@links.1/@sourceElements.1"/>
+ </rules>
</trace:TraceLinkSet>
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.atl b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.atl
index f8aee241..34b6eef8 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.atl
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.atl
@@ -13,7 +13,7 @@ rule EPackage {
eClassifiers <- s.eClassifiers
->select(c | c.oclIsKindOf(ECORE!EClass))
->collect(c | c.eStructuralFeatures
- ->collect(f | thisModule.CartesianEClass(c, f.name)))
+ ->collect(f | thisModule.CartesianEClassifier(c, f.name)))
->flatten())
do {
s.eClassifiers
@@ -21,19 +21,22 @@ rule EPackage {
->collect(c |
c.eStructuralFeatures->collect(f |
thisModule.assertNotOclUndefined(
- thisModule.resolveTemp(Sequence{c, f.name}, 'CartesianEClass', 't')
+ thisModule.resolveTemp(Sequence{c, f.name}, 'CartesianEClassifier', 't')
)
)
);
}
}
-unique lazy rule CartesianEClass {
- from s : ECORE!EClass,
+unique lazy abstract rule CartesianEClassifier {
+ from s : ECORE!EClassifier,
name : String
- to t : ECORE!EClass (
+ to t : ECORE!EClassifier (
name <- s.name + '_' + name)
- do {
- t;
- }
-} \ No newline at end of file
+}
+
+unique lazy rule CartesianEClass extends CartesianEClassifier {
+ from s : ECORE!EClass,
+ name : String
+ to t : ECORE!EClass
+}
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.emftvm b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.emftvm
index dc624e71..9046bbb6 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.emftvm
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/test-data/PrimitiveTypeLazyRuleTest.emftvm
Binary files differ

Back to the top