Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-21 15:16:54 +0000
committercletavernie2011-12-21 15:16:54 +0000
commitd4cb3602d7e3ce74262f86d596503e3a8a568f50 (patch)
treee242d0fdf2a7f81be6f38d886aa4ef1c415e64dd
parent220236e6675aa7a729026b39b7853dd2cea9241c (diff)
downloadorg.eclipse.papyrus-d4cb3602d7e3ce74262f86d596503e3a8a568f50.tar.gz
org.eclipse.papyrus-d4cb3602d7e3ce74262f86d596503e3a8a568f50.tar.xz
org.eclipse.papyrus-d4cb3602d7e3ce74262f86d596503e3a8a568f50.zip
Sandbox commit
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/.project2
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF20
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/Model/Constraints.genmodel13
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/plugin.xml4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/CompositeConstraint.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConfigProperty.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintDescriptor.java)32
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsFactory.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsPackage.java)254
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/DisplayUnit.java)20
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ReferenceProperty.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/SimpleConstraint.java)18
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ValueProperty.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintEnvironment.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintType.java)16
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentFactory.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentPackage.java)50
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintEnvironmentImpl.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintTypeImpl.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentFactoryImpl.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentPackageImpl.java)27
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentAdapterFactory.java)14
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentSwitch.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/CompositeConstraintImpl.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConfigPropertyImpl.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintDescriptorImpl.java)18
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsFactoryImpl.java)50
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsPackageImpl.java)26
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/DisplayUnitImpl.java)12
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ReferencePropertyImpl.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/SimpleConstraintImpl.java)14
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ValuePropertyImpl.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsAdapterFactory.java)34
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java (renamed from sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsSwitch.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/AbstractConstraint.java)16
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/CompoundConstraint.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/Constraint.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFInstanceOfConstraint.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFQueryConstraint.java)12
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaInstanceOf.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQuery.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQueryConstraint.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/TrueConstraint.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintEngine.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintFactory.java)14
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/DefaultConstraintEngine.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java (renamed from sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/util/ClassLoader.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF2
-rw-r--r--sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/ActionBarContributor.java2
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/SandboxDialog.java2
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/editor/ActionBarContributor.java2
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/.classpath7
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/.project28
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF16
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/build.properties14
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gifbin0 -> 223 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gifbin0 -> 129 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.properties48
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.xml37
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java173
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java187
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java227
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java160
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java150
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java197
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java93
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java275
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java194
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java139
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java189
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java147
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/.classpath7
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/.project28
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF19
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/build.properties14
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gifbin0 -> 346 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gifbin0 -> 346 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gifbin0 -> 2462 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gifbin0 -> 2462 bytes
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.properties66
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.xml65
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java429
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java1821
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java633
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java427
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java1819
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java95
-rw-r--r--sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java631
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/.project2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF14
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel15
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/plugin.xml4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/CustomFiller.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/CustomFiller.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Menu.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Menu.java)16
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuAction.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuContainer.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuContainer.java)11
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuGroup.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuGroup.java)28
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuItem.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuItem.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuPosition.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuPosition.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuRoot.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuRoot.java)19
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildConfiguration.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java)26
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildFactory.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildFactory.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildPackage.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildPackage.java)222
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Separator.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Separator.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/CustomFillerImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/CustomFillerImpl.java)11
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuActionImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java)11
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuContainerImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuContainerImpl.java)15
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuGroupImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuGroupImpl.java)17
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuImpl.java)17
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuItemImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuItemImpl.java)11
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuRootImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuRootImpl.java)28
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildConfigurationImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java)21
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildFactoryImpl.java)16
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildPackageImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java)39
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/SeparatorImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/SeparatorImpl.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CreateIn.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CreateIn.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CustomPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CustomPolicy.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/FilterPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/FilterPolicy.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/Layout.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/Layout.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyFactory.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyFactory.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyPackage.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyPackage.java)180
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicy.java)19
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicySet.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicySet.java)19
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewEMFChildMenu.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java)39
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/ReplacePolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/ReplacePolicy.java)13
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/CustomPolicyImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/CustomPolicyImpl.java)11
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/FilterPolicyImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/FilterPolicyImpl.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java)15
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyPackageImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java)35
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicyImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java)17
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicySetImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicySetImpl.java)20
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java)25
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/ReplacePolicyImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/ReplacePolicyImpl.java)14
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyAdapterFactory.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyAdapterFactory.java)64
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceImpl.java)5
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicySwitch.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicySwitch.java)23
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyXMLProcessor.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyXMLProcessor.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildAdapterFactory.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildAdapterFactory.java)61
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceFactoryImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceFactoryImpl.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceImpl.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceImpl.java)5
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildSwitch.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildSwitch.java)20
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildXMLProcessor.java (renamed from sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildXMLProcessor.java)7
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/Activator.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/CreateChildAction.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/CreateChildAction.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/AbstractCustomFillElement.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/AbstractCustomFillElement.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/CustomFillElement.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/CustomFillElement.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillElement.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillElement.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenu.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenu.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuAction.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuAction.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuContainer.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuContainer.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuGroup.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuGroup.java)8
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuRoot.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuRoot.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillNewChild.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillNewChild.java)32
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillSeparator.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillSeparator.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillerFactory.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java)22
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/MyCustomFiller.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/MyCustomFiller.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/AbstractFillPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/AbstractFillPolicy.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/FilterFillPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/FilterFillPolicy.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/NewChildFillPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/NewChildFillPolicy.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyManager.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyManager.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyMatcher.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyMatcher.java)6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/ReplaceFillPolicy.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/ReplaceFillPolicy.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/DisabledContributionItem.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/DisabledContributionItem.java)2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/MenuConstraintEngine.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/MenuConstraintEngine.java)10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/NewchildManager.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/NewchildManager.java)16
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/MenuHelper.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/MenuHelper.java)4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/Util.java (renamed from sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/Util.java)6
183 files changed, 9411 insertions, 1236 deletions
diff --git a/sandbox/org.eclipse.papyrus.constraints/.project b/sandbox/org.eclipse.papyrus.constraints/.project
index 5722ec977ae..dd9eb68f4f8 100644
--- a/sandbox/org.eclipse.papyrus.constraints/.project
+++ b/sandbox/org.eclipse.papyrus.constraints/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.constraints</name>
+ <name>org.eclipse.papyrus.infra.constraints</name>
<comment></comment>
<projects>
</projects>
diff --git a/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
index d4d7459150b..9c3de1a0cd1 100644
--- a/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.constraints;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints;singleton:=true
Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.constraints.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.papyrus.constraints,
- org.eclipse.papyrus.constraints.constraints,
- org.eclipse.papyrus.constraints.environment,
- org.eclipse.papyrus.constraints.environment.impl,
- org.eclipse.papyrus.constraints.environment.util,
- org.eclipse.papyrus.constraints.impl,
- org.eclipse.papyrus.constraints.runtime,
- org.eclipse.papyrus.constraints.util
+Export-Package: org.eclipse.papyrus.infra.constraints,
+ org.eclipse.papyrus.infra.constraints.constraints,
+ org.eclipse.papyrus.infra.constraints.environment,
+ org.eclipse.papyrus.infra.constraints.environment.impl,
+ org.eclipse.papyrus.infra.constraints.environment.util,
+ org.eclipse.papyrus.infra.constraints.impl,
+ org.eclipse.papyrus.infra.constraints.runtime,
+ org.eclipse.papyrus.infra.constraints.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
diff --git a/sandbox/org.eclipse.papyrus.constraints/Model/Constraints.genmodel b/sandbox/org.eclipse.papyrus.constraints/Model/Constraints.genmodel
index 34bb71e53d6..bed1d9e77e2 100644
--- a/sandbox/org.eclipse.papyrus.constraints/Model/Constraints.genmodel
+++ b/sandbox/org.eclipse.papyrus.constraints/Model/Constraints.genmodel
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.constraints/src-gen" editDirectory="/org.eclipse.papyrus.constraints.edit/src-gen"
- editorDirectory="/org.eclipse.papyrus.constraints.editor/src-gen" modelPluginID="org.eclipse.papyrus.constraints"
- modelName="Constraints" testsDirectory="/org.eclipse.papyrus.constraints.tests/src-gen"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.constraints/src-gen"
+ editDirectory="/org.eclipse.papyrus.infra.constraints.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.constraints.editor/src-gen"
+ modelPluginID="org.eclipse.papyrus.infra.constraints" modelName="Constraints"
+ testsDirectory="/org.eclipse.papyrus.infra.constraints.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false">
<foreignModel>Constraints.ecore</foreignModel>
- <genPackages prefix="Constraints" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"
+ <genPackages prefix="Constraints" basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true"
ecorePackage="Constraints.ecore#/">
<genClasses image="false" ecoreClass="Constraints.ecore#//DisplayUnit">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//DisplayUnit/constraints"/>
@@ -33,7 +34,7 @@
<genClasses ecoreClass="Constraints.ecore#//ReferenceProperty">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ReferenceProperty/value"/>
</genClasses>
- <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.constraints"
+ <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.infra.constraints"
disposableProviderFactory="true" ecorePackage="Constraints.ecore#//environment">
<genClasses ecoreClass="Constraints.ecore#//environment/ConstraintEnvironment">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//environment/ConstraintEnvironment/constraintTypes"/>
diff --git a/sandbox/org.eclipse.papyrus.constraints/plugin.xml b/sandbox/org.eclipse.papyrus.constraints/plugin.xml
index 51faee854a8..0dd0dc5b91c 100644
--- a/sandbox/org.eclipse.papyrus.constraints/plugin.xml
+++ b/sandbox/org.eclipse.papyrus.constraints/plugin.xml
@@ -10,11 +10,11 @@
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
- <package class="org.eclipse.papyrus.constraints.ConstraintsPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>
+ <package class="org.eclipse.papyrus.infra.constraints.ConstraintsPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
- <package class="org.eclipse.papyrus.constraints.environment.EnvironmentPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"/>
+ <package class="org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"/>
</extension>
<extension
point="org.eclipse.emf.facet.infra.browser.custom.core.registration">
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/CompositeConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java
index 8e427f1f8f4..f608517dba2 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/CompositeConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.common.util.EList;
@@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getCompositeConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint()
* @model
* @generated
*/
public interface CompositeConstraint extends ConstraintDescriptor {
/**
* Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.constraints.SimpleConstraint}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Constraints</em>' containment reference list isn't clear,
@@ -35,7 +35,7 @@ public interface CompositeConstraint extends ConstraintDescriptor {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Constraints</em>' containment reference list.
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getCompositeConstraint_Constraints()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint_Constraints()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConfigProperty.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java
index 7b50895802c..6bfacf16af6 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConfigProperty.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.ecore.EObject;
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.ConfigProperty#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConfigProperty()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConfigProperty()
* @model abstract="true"
* @generated
*/
@@ -35,14 +35,14 @@ public interface ConfigProperty extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConfigProperty_Name()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConfigProperty_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ConfigProperty#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintDescriptor.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java
index cfeedc3a6ed..f9f16cae5cc 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintDescriptor.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.common.util.EList;
@@ -18,14 +18,14 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConstraintDescriptor()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor()
* @model abstract="true"
* @generated
*/
@@ -40,14 +40,14 @@ public interface ConstraintDescriptor extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConstraintDescriptor_Name()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -58,7 +58,7 @@ public interface ConstraintDescriptor extends EObject {
/**
* Returns the value of the '<em><b>Display</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Display</em>' container reference isn't clear,
@@ -67,15 +67,15 @@ public interface ConstraintDescriptor extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Display</em>' container reference.
* @see #setDisplay(DisplayUnit)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConstraintDescriptor_Display()
- * @see org.eclipse.papyrus.constraints.DisplayUnit#getConstraints
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Display()
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints
* @model opposite="constraints" transient="false"
* @generated
*/
DisplayUnit getDisplay();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Display</em>' container reference.
@@ -95,14 +95,14 @@ public interface ConstraintDescriptor extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Overrideable</em>' attribute.
* @see #setOverrideable(boolean)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConstraintDescriptor_Overrideable()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Overrideable()
* @model default="true" required="true"
* @generated
*/
boolean isOverrideable();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Overrideable</em>' attribute.
@@ -113,7 +113,7 @@ public interface ConstraintDescriptor extends EObject {
/**
* Returns the value of the '<em><b>Overridden Constraints</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.papyrus.constraints.SimpleConstraint}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Overridden Constraints</em>' reference list isn't clear,
@@ -121,7 +121,7 @@ public interface ConstraintDescriptor extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Overridden Constraints</em>' reference list.
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getConstraintDescriptor_OverriddenConstraints()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_OverriddenConstraints()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsFactory.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java
index 9ec675e5f8e..310c73ab4e5 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsFactory.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage
* @generated
*/
public interface ConstraintsFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface ConstraintsFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- ConstraintsFactory eINSTANCE = org.eclipse.papyrus.constraints.impl.ConstraintsFactoryImpl.init();
+ ConstraintsFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsFactoryImpl.init();
/**
* Returns a new object of class '<em>Simple Constraint</em>'.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsPackage.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java
index dfe923f8e68..739f8d2a7ae 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ConstraintsPackage.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.ConstraintsFactory
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsFactory
* @model kind="package"
* @generated
*/
@@ -33,7 +32,6 @@ public interface ConstraintsPackage extends EPackage {
* The package name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNAME = "constraints";
@@ -42,7 +40,6 @@ public interface ConstraintsPackage extends EPackage {
* The package namespace URI.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNS_URI = "http://www.eclipse.org/papyrus/constraints/0.9";
@@ -51,7 +48,6 @@ public interface ConstraintsPackage extends EPackage {
* The package namespace name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNS_PREFIX = "constraints";
@@ -60,18 +56,16 @@ public interface ConstraintsPackage extends EPackage {
* The singleton instance of the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- ConstraintsPackage eINSTANCE = org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl.init();
+ ConstraintsPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.DisplayUnitImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
+ * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
* @generated
*/
int DISPLAY_UNIT = 0;
@@ -80,7 +74,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Constraints</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -90,7 +83,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Element Multiplicity</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -100,19 +92,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Display Unit</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int DISPLAY_UNIT_FEATURE_COUNT = 2;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
* @generated
*/
int CONSTRAINT_DESCRIPTOR = 1;
@@ -121,7 +111,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -131,7 +120,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Display</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -141,7 +129,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overrideable</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -151,7 +138,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -161,19 +147,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Constraint Descriptor</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int CONSTRAINT_DESCRIPTOR_FEATURE_COUNT = 4;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
* @generated
*/
int SIMPLE_CONSTRAINT = 2;
@@ -182,7 +166,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -192,7 +175,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Display</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -202,7 +184,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overrideable</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -212,7 +193,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -222,7 +202,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Constraint Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -232,7 +211,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Properties</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -242,19 +220,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Simple Constraint</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int SIMPLE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.CompositeConstraintImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
* @generated
*/
int COMPOSITE_CONSTRAINT = 3;
@@ -263,7 +239,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -273,7 +248,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Display</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -283,7 +257,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overrideable</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -293,7 +266,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -303,7 +275,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Constraints</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -313,19 +284,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Composite Constraint</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int COMPOSITE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ConfigPropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
* @generated
*/
int CONFIG_PROPERTY = 4;
@@ -334,7 +303,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -344,19 +312,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Config Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int CONFIG_PROPERTY_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ValuePropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getValueProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()
* @generated
*/
int VALUE_PROPERTY = 5;
@@ -365,7 +331,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -375,7 +340,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Value</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -385,19 +349,17 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Value Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int VALUE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ReferencePropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
* @generated
*/
int REFERENCE_PROPERTY = 6;
@@ -406,7 +368,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -416,7 +377,6 @@ public interface ConstraintsPackage extends EPackage {
* The feature id for the '<em><b>Value</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -426,7 +386,6 @@ public interface ConstraintsPackage extends EPackage {
* The number of structural features of the '<em>Reference Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -434,227 +393,202 @@ public interface ConstraintsPackage extends EPackage {
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Display Unit</em>'.
- * @see org.eclipse.papyrus.constraints.DisplayUnit
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
* @generated
*/
EClass getDisplayUnit();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.constraints.DisplayUnit#getConstraints
- * <em>Constraints</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Constraints</em>'.
- * @see org.eclipse.papyrus.constraints.DisplayUnit#getConstraints()
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints()
* @see #getDisplayUnit()
* @generated
*/
EReference getDisplayUnit_Constraints();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.DisplayUnit#getElementMultiplicity
- * <em>Element Multiplicity</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Element Multiplicity</em>'.
- * @see org.eclipse.papyrus.constraints.DisplayUnit#getElementMultiplicity()
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity()
* @see #getDisplayUnit()
* @generated
*/
EAttribute getDisplayUnit_ElementMultiplicity();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Constraint Descriptor</em>'.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor
* @generated
*/
EClass getConstraintDescriptor();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor#getName()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName()
* @see #getConstraintDescriptor()
* @generated
*/
EAttribute getConstraintDescriptor_Name();
/**
- * Returns the meta object for the container reference '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+ * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the container reference '<em>Display</em>'.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay()
* @see #getConstraintDescriptor()
* @generated
*/
EReference getConstraintDescriptor_Display();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Overrideable</em>'.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor#isOverrideable()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable()
* @see #getConstraintDescriptor()
* @generated
*/
EAttribute getConstraintDescriptor_Overrideable();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getOverriddenConstraints
- * <em>Overridden Constraints</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the reference list '<em>Overridden Constraints</em>'.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor#getOverriddenConstraints()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints()
* @see #getConstraintDescriptor()
* @generated
*/
EReference getConstraintDescriptor_OverriddenConstraints();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.SimpleConstraint <em>Simple Constraint</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Simple Constraint</em>'.
- * @see org.eclipse.papyrus.constraints.SimpleConstraint
+ * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint
* @generated
*/
EClass getSimpleConstraint();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}
- * '.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the reference '<em>Constraint Type</em>'.
- * @see org.eclipse.papyrus.constraints.SimpleConstraint#getConstraintType()
+ * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType()
* @see #getSimpleConstraint()
* @generated
*/
EReference getSimpleConstraint_ConstraintType();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.constraints.SimpleConstraint#getProperties
- * <em>Properties</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getProperties <em>Properties</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Properties</em>'.
- * @see org.eclipse.papyrus.constraints.SimpleConstraint#getProperties()
+ * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint#getProperties()
* @see #getSimpleConstraint()
* @generated
*/
EReference getSimpleConstraint_Properties();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.CompositeConstraint <em>Composite Constraint</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Composite Constraint</em>'.
- * @see org.eclipse.papyrus.constraints.CompositeConstraint
+ * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint
* @generated
*/
EClass getCompositeConstraint();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.constraints.CompositeConstraint#getConstraints
- * <em>Constraints</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Constraints</em>'.
- * @see org.eclipse.papyrus.constraints.CompositeConstraint#getConstraints()
+ * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints()
* @see #getCompositeConstraint()
* @generated
*/
EReference getCompositeConstraint_Constraints();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.ConfigProperty <em>Config Property</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Config Property</em>'.
- * @see org.eclipse.papyrus.constraints.ConfigProperty
+ * @see org.eclipse.papyrus.infra.constraints.ConfigProperty
* @generated
*/
EClass getConfigProperty();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.ConfigProperty#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.constraints.ConfigProperty#getName()
+ * @see org.eclipse.papyrus.infra.constraints.ConfigProperty#getName()
* @see #getConfigProperty()
* @generated
*/
EAttribute getConfigProperty_Name();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.ValueProperty <em>Value Property</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Value Property</em>'.
- * @see org.eclipse.papyrus.constraints.ValueProperty
+ * @see org.eclipse.papyrus.infra.constraints.ValueProperty
* @generated
*/
EClass getValueProperty();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.ValueProperty#getValue <em>Value</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.papyrus.constraints.ValueProperty#getValue()
+ * @see org.eclipse.papyrus.infra.constraints.ValueProperty#getValue()
* @see #getValueProperty()
* @generated
*/
EAttribute getValueProperty_Value();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.ReferenceProperty <em>Reference Property</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>Reference Property</em>'.
- * @see org.eclipse.papyrus.constraints.ReferenceProperty
+ * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty
* @generated
*/
EClass getReferenceProperty();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.constraints.ReferenceProperty#getValue <em>Value</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the reference '<em>Value</em>'.
- * @see org.eclipse.papyrus.constraints.ReferenceProperty#getValue()
+ * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue()
* @see #getReferenceProperty()
* @generated
*/
@@ -664,7 +598,6 @@ public interface ConstraintsPackage extends EPackage {
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -680,18 +613,16 @@ public interface ConstraintsPackage extends EPackage {
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @generated
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.DisplayUnitImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
+ * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
* @generated
*/
EClass DISPLAY_UNIT = eINSTANCE.getDisplayUnit();
@@ -700,7 +631,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference DISPLAY_UNIT__CONSTRAINTS = eINSTANCE.getDisplayUnit_Constraints();
@@ -709,19 +639,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Element Multiplicity</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute DISPLAY_UNIT__ELEMENT_MULTIPLICITY = eINSTANCE.getDisplayUnit_ElementMultiplicity();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}'
- * class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
* @generated
*/
EClass CONSTRAINT_DESCRIPTOR = eINSTANCE.getConstraintDescriptor();
@@ -730,7 +657,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute CONSTRAINT_DESCRIPTOR__NAME = eINSTANCE.getConstraintDescriptor_Name();
@@ -739,7 +665,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Display</b></em>' container reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference CONSTRAINT_DESCRIPTOR__DISPLAY = eINSTANCE.getConstraintDescriptor_Display();
@@ -748,7 +673,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Overrideable</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = eINSTANCE.getConstraintDescriptor_Overrideable();
@@ -757,18 +681,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Overridden Constraints</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = eINSTANCE.getConstraintDescriptor_OverriddenConstraints();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
* @generated
*/
EClass SIMPLE_CONSTRAINT = eINSTANCE.getSimpleConstraint();
@@ -777,7 +699,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Constraint Type</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference SIMPLE_CONSTRAINT__CONSTRAINT_TYPE = eINSTANCE.getSimpleConstraint_ConstraintType();
@@ -786,18 +707,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference SIMPLE_CONSTRAINT__PROPERTIES = eINSTANCE.getSimpleConstraint_Properties();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.CompositeConstraintImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
* @generated
*/
EClass COMPOSITE_CONSTRAINT = eINSTANCE.getCompositeConstraint();
@@ -806,18 +725,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference COMPOSITE_CONSTRAINT__CONSTRAINTS = eINSTANCE.getCompositeConstraint_Constraints();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ConfigPropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
* @generated
*/
EClass CONFIG_PROPERTY = eINSTANCE.getConfigProperty();
@@ -826,18 +743,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute CONFIG_PROPERTY__NAME = eINSTANCE.getConfigProperty_Name();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ValuePropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getValueProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()
* @generated
*/
EClass VALUE_PROPERTY = eINSTANCE.getValueProperty();
@@ -846,18 +761,16 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Value</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute VALUE_PROPERTY__VALUE = eINSTANCE.getValueProperty_Value();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.constraints.impl.ReferencePropertyImpl
- * @see org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
+ * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl
+ * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
* @generated
*/
EClass REFERENCE_PROPERTY = eINSTANCE.getReferenceProperty();
@@ -866,7 +779,6 @@ public interface ConstraintsPackage extends EPackage {
* The meta object literal for the '<em><b>Value</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference REFERENCE_PROPERTY__VALUE = eINSTANCE.getReferenceProperty_Value();
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/DisplayUnit.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java
index 4793eff1ba1..c4a47414ce0 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/DisplayUnit.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.common.util.EList;
@@ -18,20 +18,20 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.DisplayUnit#getConstraints <em>Constraints</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getDisplayUnit()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit()
* @model abstract="true"
* @generated
*/
public interface DisplayUnit extends EObject {
/**
* Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.constraints.ConstraintDescriptor}.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Constraints</em>' containment reference list isn't clear,
@@ -39,8 +39,8 @@ public interface DisplayUnit extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Constraints</em>' containment reference list.
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getDisplayUnit_Constraints()
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor#getDisplay
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_Constraints()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay
* @model opposite="display" containment="true"
* @generated
*/
@@ -57,14 +57,14 @@ public interface DisplayUnit extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Element Multiplicity</em>' attribute.
* @see #setElementMultiplicity(int)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getDisplayUnit_ElementMultiplicity()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_ElementMultiplicity()
* @model default="1"
* @generated
*/
int getElementMultiplicity();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Element Multiplicity</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ReferenceProperty.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java
index a1926f36e0a..b2fe6c604a9 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ReferenceProperty.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.ecore.EObject;
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.ReferenceProperty#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getReferenceProperty()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty()
* @model
* @generated
*/
@@ -35,14 +35,14 @@ public interface ReferenceProperty extends ConfigProperty {
* <!-- end-user-doc -->
* @return the value of the '<em>Value</em>' reference.
* @see #setValue(EObject)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getReferenceProperty_Value()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty_Value()
* @model required="true"
* @generated
*/
EObject getValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ReferenceProperty#getValue <em>Value</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Value</em>' reference.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/SimpleConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java
index 308f3b927b8..490ac7efcf9 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/SimpleConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java
@@ -4,11 +4,11 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
/**
* <!-- begin-user-doc -->
@@ -18,12 +18,12 @@ import org.eclipse.papyrus.constraints.environment.ConstraintType;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.SimpleConstraint#getProperties <em>Properties</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getProperties <em>Properties</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getSimpleConstraint()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint()
* @model
* @generated
*/
@@ -38,14 +38,14 @@ public interface SimpleConstraint extends ConstraintDescriptor {
* <!-- end-user-doc -->
* @return the value of the '<em>Constraint Type</em>' reference.
* @see #setConstraintType(ConstraintType)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getSimpleConstraint_ConstraintType()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint_ConstraintType()
* @model required="true"
* @generated
*/
ConstraintType getConstraintType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Constraint Type</em>' reference.
@@ -56,7 +56,7 @@ public interface SimpleConstraint extends ConstraintDescriptor {
/**
* Returns the value of the '<em><b>Properties</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.constraints.ConfigProperty}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConfigProperty}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
@@ -64,7 +64,7 @@ public interface SimpleConstraint extends ConstraintDescriptor {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Properties</em>' containment reference list.
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getSimpleConstraint_Properties()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint_Properties()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ValueProperty.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java
index 154b4a42734..61aa1c9766f 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/ValueProperty.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
/**
@@ -15,11 +15,11 @@ package org.eclipse.papyrus.constraints;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.ValueProperty#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getValueProperty()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getValueProperty()
* @model
* @generated
*/
@@ -34,14 +34,14 @@ public interface ValueProperty extends ConfigProperty {
* <!-- end-user-doc -->
* @return the value of the '<em>Value</em>' attribute.
* @see #setValue(String)
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#getValueProperty_Value()
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getValueProperty_Value()
* @model required="true"
* @generated
*/
String getValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.ValueProperty#getValue <em>Value</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Value</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintEnvironment.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java
index 64c59acf890..61008946584 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintEnvironment.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment;
+package org.eclipse.papyrus.infra.constraints.environment;
import org.eclipse.emf.common.util.EList;
@@ -18,18 +18,18 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#getConstraintEnvironment()
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment()
* @model
* @generated
*/
public interface ConstraintEnvironment extends EObject {
/**
* Returns the value of the '<em><b>Constraint Types</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.constraints.environment.ConstraintType}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Constraint Types</em>' containment reference list isn't clear,
@@ -37,7 +37,7 @@ public interface ConstraintEnvironment extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Constraint Types</em>' containment reference list.
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#getConstraintEnvironment_ConstraintTypes()
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment_ConstraintTypes()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintType.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java
index 8fd72db88f2..0984050fbc8 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/ConstraintType.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment;
+package org.eclipse.papyrus.infra.constraints.environment;
import org.eclipse.emf.ecore.EObject;
@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getLabel <em>Label</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#getConstraintType()
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType()
* @model
* @generated
*/
@@ -36,14 +36,14 @@ public interface ConstraintType extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Label</em>' attribute.
* @see #setLabel(String)
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#getConstraintType_Label()
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType_Label()
* @model required="true"
* @generated
*/
String getLabel();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getLabel <em>Label</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel <em>Label</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Label</em>' attribute.
@@ -62,14 +62,14 @@ public interface ConstraintType extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Constraint Class</em>' attribute.
* @see #setConstraintClass(String)
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#getConstraintType_ConstraintClass()
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType_ConstraintClass()
* @model required="true"
* @generated
*/
String getConstraintClass();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Constraint Class</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentFactory.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java
index 1b09e777849..8a156e7b7cc 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentFactory.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment;
+package org.eclipse.papyrus.infra.constraints.environment;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage
* @generated
*/
public interface EnvironmentFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface EnvironmentFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- EnvironmentFactory eINSTANCE = org.eclipse.papyrus.constraints.environment.impl.EnvironmentFactoryImpl.init();
+ EnvironmentFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentFactoryImpl.init();
/**
* Returns a new object of class '<em>Constraint Environment</em>'.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentPackage.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java
index 53e0ce2d713..5110cd7d42c 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/EnvironmentPackage.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment;
+package org.eclipse.papyrus.infra.constraints.environment;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentFactory
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory
* @model kind="package"
* @generated
*/
@@ -57,14 +57,14 @@ public interface EnvironmentPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EnvironmentPackage eINSTANCE = org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl.init();
+ EnvironmentPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.impl.ConstraintEnvironmentImpl
- * @see org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
* @generated
*/
int CONSTRAINT_ENVIRONMENT = 0;
@@ -88,11 +88,11 @@ public interface EnvironmentPackage extends EPackage {
int CONSTRAINT_ENVIRONMENT_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl
- * @see org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
* @generated
*/
int CONSTRAINT_TYPE = 1;
@@ -126,53 +126,53 @@ public interface EnvironmentPackage extends EPackage {
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Constraint Environment</em>'.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintEnvironment
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment
* @generated
*/
EClass getConstraintEnvironment();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Constraint Types</em>'.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintEnvironment#getConstraintTypes()
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes()
* @see #getConstraintEnvironment()
* @generated
*/
EReference getConstraintEnvironment_ConstraintTypes();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.constraints.environment.ConstraintType <em>Constraint Type</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Constraint Type</em>'.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintType
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType
* @generated
*/
EClass getConstraintType();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getLabel <em>Label</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel <em>Label</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Label</em>'.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintType#getLabel()
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel()
* @see #getConstraintType()
* @generated
*/
EAttribute getConstraintType_Label();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Constraint Class</em>'.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintType#getConstraintClass()
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass()
* @see #getConstraintType()
* @generated
*/
@@ -201,11 +201,11 @@ public interface EnvironmentPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.impl.ConstraintEnvironmentImpl
- * @see org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
* @generated
*/
EClass CONSTRAINT_ENVIRONMENT = eINSTANCE.getConstraintEnvironment();
@@ -219,11 +219,11 @@ public interface EnvironmentPackage extends EPackage {
EReference CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES = eINSTANCE.getConstraintEnvironment_ConstraintTypes();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl
- * @see org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl
+ * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
* @generated
*/
EClass CONSTRAINT_TYPE = eINSTANCE.getConstraintType();
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintEnvironmentImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java
index 70363bb370e..d58244c5c4b 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintEnvironmentImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.impl;
+package org.eclipse.papyrus.infra.constraints.environment.impl;
import java.util.Collection;
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.constraints.environment.ConstraintEnvironment;
-import org.eclipse.papyrus.constraints.environment.ConstraintType;
-import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
/**
* <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintEnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintTypeImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java
index 9b94bde01ff..696fdee75f0 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/ConstraintTypeImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.impl;
+package org.eclipse.papyrus.infra.constraints.environment.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.constraints.environment.ConstraintType;
-import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
/**
* <!-- begin-user-doc -->
@@ -23,8 +23,8 @@ import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentFactoryImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java
index b717640425f..51c805a0ab1 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.impl;
+package org.eclipse.papyrus.infra.constraints.environment.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.constraints.environment.*;
+import org.eclipse.papyrus.infra.constraints.environment.*;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentPackageImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java
index f46e888174f..9dd6a169d4c 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/impl/EnvironmentPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java
@@ -4,23 +4,19 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.impl;
+package org.eclipse.papyrus.infra.constraints.environment.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
-import org.eclipse.papyrus.constraints.environment.ConstraintEnvironment;
-import org.eclipse.papyrus.constraints.environment.ConstraintType;
-import org.eclipse.papyrus.constraints.environment.EnvironmentFactory;
-import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
-
-import org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl;
/**
* <!-- begin-user-doc -->
@@ -29,6 +25,7 @@ import org.eclipse.papyrus.constraints.impl.ConstraintsPackageImpl;
* @generated
*/
public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -51,10 +48,9 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
* factory method {@link #init init()}, which also performs
* initialization of the package, or returns the registered package,
* if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -74,8 +70,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
*
* <p>This method is used to initialize {@link EnvironmentPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentAdapterFactory.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java
index 7be9c40ad7b..94e48c8693b 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.util;
+package org.eclipse.papyrus.infra.constraints.environment.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.constraints.environment.*;
+import org.eclipse.papyrus.infra.constraints.environment.*;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage
* @generated
*/
public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
@@ -100,13 +100,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintEnvironment
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment
* @generated
*/
public Adapter createConstraintEnvironmentAdapter() {
@@ -114,13 +114,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.environment.ConstraintType <em>Constraint Type</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.environment.ConstraintType
+ * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType
* @generated
*/
public Adapter createConstraintTypeAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentSwitch.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java
index c7667305672..e30ea8096fb 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/environment/util/EnvironmentSwitch.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java
@@ -4,14 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.environment.util;
+package org.eclipse.papyrus.infra.constraints.environment.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.constraints.environment.*;
+import org.eclipse.papyrus.infra.constraints.environment.*;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.constraints.environment.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage
* @generated
*/
public class EnvironmentSwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/CompositeConstraintImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java
index e95630c9acb..540afcb642b 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/CompositeConstraintImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import java.util.Collection;
@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.constraints.CompositeConstraint;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
/**
* <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.constraints.SimpleConstraint;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConfigPropertyImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java
index af223199397..5b41685cc67 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConfigPropertyImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.constraints.ConfigProperty;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.constraints.ConstraintsPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintDescriptorImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java
index 8fea3971162..cb0300e79aa 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintDescriptorImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import java.util.Collection;
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
/**
* <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.papyrus.constraints.SimpleConstraint;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsFactoryImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java
index 7f4f99c6813..32828316ad0 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java
@@ -4,25 +4,25 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.constraints.CompositeConstraint;
-import org.eclipse.papyrus.constraints.ConstraintsFactory;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.ReferenceProperty;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.*;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- *
* @generated
*/
public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsFactory {
@@ -31,16 +31,16 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
* Creates the default factory implementation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static ConstraintsFactory init() {
try {
- ConstraintsFactory theConstraintsFactory = (ConstraintsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/0.9");
- if(theConstraintsFactory != null) {
+ ConstraintsFactory theConstraintsFactory = (ConstraintsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/0.9");
+ if (theConstraintsFactory != null) {
return theConstraintsFactory;
}
- } catch (Exception exception) {
+ }
+ catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new ConstraintsFactoryImpl();
@@ -50,7 +50,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
* Creates an instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public ConstraintsFactoryImpl() {
@@ -60,29 +59,23 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public EObject create(EClass eClass) {
- switch(eClass.getClassifierID()) {
- case ConstraintsPackage.SIMPLE_CONSTRAINT:
- return createSimpleConstraint();
- case ConstraintsPackage.COMPOSITE_CONSTRAINT:
- return createCompositeConstraint();
- case ConstraintsPackage.VALUE_PROPERTY:
- return createValueProperty();
- case ConstraintsPackage.REFERENCE_PROPERTY:
- return createReferenceProperty();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ switch (eClass.getClassifierID()) {
+ case ConstraintsPackage.SIMPLE_CONSTRAINT: return createSimpleConstraint();
+ case ConstraintsPackage.COMPOSITE_CONSTRAINT: return createCompositeConstraint();
+ case ConstraintsPackage.VALUE_PROPERTY: return createValueProperty();
+ case ConstraintsPackage.REFERENCE_PROPERTY: return createReferenceProperty();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public SimpleConstraint createSimpleConstraint() {
@@ -93,7 +86,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public CompositeConstraint createCompositeConstraint() {
@@ -104,7 +96,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public ValueProperty createValueProperty() {
@@ -115,7 +106,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public ReferenceProperty createReferenceProperty() {
@@ -126,7 +116,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public ConstraintsPackage getConstraintsPackage() {
@@ -136,7 +125,6 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsPackageImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java
index 2b7f9c28b76..a06ac845c22 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ConstraintsPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -13,19 +13,19 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.constraints.CompositeConstraint;
-import org.eclipse.papyrus.constraints.ConfigProperty;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.ConstraintsFactory;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-import org.eclipse.papyrus.constraints.ReferenceProperty;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.ValueProperty;
-import org.eclipse.papyrus.constraints.environment.EnvironmentPackage;
-import org.eclipse.papyrus.constraints.environment.impl.EnvironmentPackageImpl;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl;
/**
* <!-- begin-user-doc -->
@@ -94,7 +94,7 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/DisplayUnitImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java
index 32dd7f4f436..d84bb265ce0 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/DisplayUnitImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import java.util.Collection;
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
/**
* <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.constraints.DisplayUnit;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.impl.DisplayUnitImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ReferencePropertyImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java
index d5dbec0ed71..1d5db1f0f87 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ReferencePropertyImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
/**
* <!-- begin-user-doc -->
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.constraints.ReferenceProperty;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/SimpleConstraintImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java
index 5997499faf4..7afca6d320f 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/SimpleConstraintImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import java.util.Collection;
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.constraints.ConfigProperty;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
/**
* <!-- begin-user-doc -->
@@ -34,8 +34,8 @@ import org.eclipse.papyrus.constraints.environment.ConstraintType;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.constraints.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ValuePropertyImpl.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java
index e9129c1aa6a..1418a9bd31d 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/impl/ValuePropertyImpl.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.impl;
+package org.eclipse.papyrus.infra.constraints.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
/**
* <!-- begin-user-doc -->
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.constraints.ValueProperty;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.constraints.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsAdapterFactory.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java
index 7f79811ac08..144d853f7a5 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.util;
+package org.eclipse.papyrus.infra.constraints.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.constraints.*;
+import org.eclipse.papyrus.infra.constraints.*;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage
* @generated
*/
public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
@@ -120,13 +120,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.DisplayUnit
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
* @generated
*/
public Adapter createDisplayUnitAdapter() {
@@ -134,13 +134,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.ConstraintDescriptor
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor
* @generated
*/
public Adapter createConstraintDescriptorAdapter() {
@@ -148,13 +148,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.SimpleConstraint <em>Simple Constraint</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.SimpleConstraint
+ * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint
* @generated
*/
public Adapter createSimpleConstraintAdapter() {
@@ -162,13 +162,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.CompositeConstraint <em>Composite Constraint</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.CompositeConstraint
+ * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint
* @generated
*/
public Adapter createCompositeConstraintAdapter() {
@@ -176,13 +176,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.ConfigProperty <em>Config Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config Property</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.ConfigProperty
+ * @see org.eclipse.papyrus.infra.constraints.ConfigProperty
* @generated
*/
public Adapter createConfigPropertyAdapter() {
@@ -190,13 +190,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.ValueProperty <em>Value Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value Property</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.ValueProperty
+ * @see org.eclipse.papyrus.infra.constraints.ValueProperty
* @generated
*/
public Adapter createValuePropertyAdapter() {
@@ -204,13 +204,13 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.ReferenceProperty <em>Reference Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference Property</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.ReferenceProperty
+ * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty
* @generated
*/
public Adapter createReferencePropertyAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsSwitch.java b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java
index 6b2d0a2d77e..115c1397e0b 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/constraints/util/ConstraintsSwitch.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java
@@ -4,14 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.constraints.util;
+package org.eclipse.papyrus.infra.constraints.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.constraints.*;
+import org.eclipse.papyrus.infra.constraints.*;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.constraints.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.constraints.ConstraintsPackage
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage
* @generated
*/
public class ConstraintsSwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java
index d45e0e6688c..6177d774a07 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints;
+package org.eclipse.papyrus.infra.constraints;
import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.constraints"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.constraints"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/AbstractConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java
index 190aee45dd4..10a29f39841 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/AbstractConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java
@@ -9,18 +9,18 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.constraints.Activator;
-import org.eclipse.papyrus.constraints.ConfigProperty;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-import org.eclipse.papyrus.constraints.ReferenceProperty;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
/**
* An abstract implementation for the Constraint interface.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/CompoundConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java
index e3710349d4d..119292ae471 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/CompoundConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
import java.util.LinkedList;
import java.util.List;
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/Constraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java
index bedd9e15e42..3907b5eac04 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/Constraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java
@@ -9,11 +9,11 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
/**
* An interface representing a Constraint. A Constraint is used to test if a selection
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFInstanceOfConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java
index 8fb578d375c..cf6308bf1db 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFInstanceOfConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java
@@ -9,13 +9,13 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.constraints.Activator;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
/**
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFQueryConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java
index 16d07efc33c..22c247ba550 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/EMFQueryConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
@@ -18,11 +18,11 @@ import org.eclipse.emf.facet.infra.query.QueryFactory;
import org.eclipse.emf.facet.infra.query.core.AbstractModelQuery;
import org.eclipse.emf.facet.infra.query.core.ModelQuerySetCatalog;
import org.eclipse.emf.facet.infra.query.runtime.ModelQueryResult;
-import org.eclipse.papyrus.constraints.Activator;
-import org.eclipse.papyrus.constraints.ConfigProperty;
-import org.eclipse.papyrus.constraints.ReferenceProperty;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
/**
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaInstanceOf.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java
index d95d1b32fe5..8cea6b70933 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaInstanceOf.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java
@@ -9,9 +9,9 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
/**
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQuery.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java
index 7ab4a8594dd..45496ffce81 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQuery.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
public interface JavaQuery {
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQueryConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java
index b0109af1814..f8a602c6dff 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/JavaQueryConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
-import org.eclipse.papyrus.constraints.Activator;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.constraints.JavaQuery.FalseQuery;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery.FalseQuery;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
/**
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/TrueConstraint.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java
index ade476dca26..2d9e4401a15 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/constraints/TrueConstraint.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.constraints;
+package org.eclipse.papyrus.infra.constraints.constraints;
/**
* A Constraint always returning true.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintEngine.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java
index 1ac5dd47b79..8b8b756d515 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintEngine.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java
@@ -9,13 +9,13 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.runtime;
+package org.eclipse.papyrus.infra.constraints.runtime;
import java.util.Set;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
/**
* An interface representing a Constraint Engine.
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintFactory.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java
index 78ef566bade..e8facbf03d6 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/ConstraintFactory.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java
@@ -9,14 +9,14 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.runtime;
+package org.eclipse.papyrus.infra.constraints.runtime;
-import org.eclipse.papyrus.constraints.Activator;
-import org.eclipse.papyrus.constraints.CompositeConstraint;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.SimpleConstraint;
-import org.eclipse.papyrus.constraints.constraints.CompoundConstraint;
-import org.eclipse.papyrus.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.CompoundConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/DefaultConstraintEngine.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
index eb2e5efeb3c..9edbb8a8e13 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/runtime/DefaultConstraintEngine.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.runtime;
+package org.eclipse.papyrus.infra.constraints.runtime;
import java.util.HashSet;
import java.util.Iterator;
@@ -18,9 +18,9 @@ import java.util.Set;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-import org.eclipse.papyrus.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
/**
* The default implementation for ConstraintEngine
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/util/ClassLoader.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java
index 2b3350d9968..23d2ea8f990 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/util/ClassLoader.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java
@@ -9,9 +9,9 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.constraints.util;
+package org.eclipse.papyrus.infra.constraints.util;
-import org.eclipse.papyrus.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.Activator;
/**
* A Helper class for Class Loading.
diff --git a/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
index de4c7316c65..2f8f79371fa 100644
--- a/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore.editor;bundle-version="2.7.0",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.newchild;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.emf.newchild;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",
diff --git a/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/ActionBarContributor.java b/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/ActionBarContributor.java
index fe8ec054539..fd96e5b918a 100644
--- a/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/ActionBarContributor.java
+++ b/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/ActionBarContributor.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.emf.editor.actions.MoDiscoDeleteAction;
import org.eclipse.papyrus.infra.emf.editor.actions.MoDiscoPasteAction;
import org.eclipse.papyrus.infra.emf.editor.actions.ValidationAction;
import org.eclipse.papyrus.infra.emf.editor.util.ActionUtil;
-import org.eclipse.papyrus.newchild.runtime.NewchildManager;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.NewchildManager;
/**
* The Action bar contributor for the Context Editor
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
index 168a811d13d..a9217d71f1b 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
@@ -20,11 +20,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="0.8.0",
- org.eclipse.papyrus.newchild;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.emf.newchild;bundle-version="0.9.0",
org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",
org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
- org.eclipse.papyrus.constraints;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.constraints;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.infra.emf.embeddededitor,
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/SandboxDialog.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/SandboxDialog.java
index b4f1a3442c4..62b3111c66f 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/SandboxDialog.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/SandboxDialog.java
@@ -216,7 +216,7 @@ public class SandboxDialog extends TrayDialog {
ResourceSet resourceSet = new ResourceSetImpl();
//Simple editor
- // resourceSet.getResource(URI.createPlatformResourceURI("org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi", true), true);
+ // resourceSet.getResource(URI.createPlatformResourceURI("org.eclipse.papyrus.infra.emf.newchild/Model/NewchildConfiguration.xmi", true), true);
//UML Editor with ExtendedType support
resourceSet.getResource(URI.createPlatformResourceURI("papyrus.test/model.uml", true), true);
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/editor/ActionBarContributor.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/editor/ActionBarContributor.java
index 04a40ea0670..0e51be75002 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/editor/ActionBarContributor.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/editor/ActionBarContributor.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.emf.embeddededitor.editor.actions.MoDiscoCutAct
import org.eclipse.papyrus.infra.emf.embeddededitor.editor.actions.MoDiscoDeleteAction;
import org.eclipse.papyrus.infra.emf.embeddededitor.editor.actions.MoDiscoPasteAction;
import org.eclipse.papyrus.infra.emf.embeddededitor.editor.actions.ValidationAction;
-import org.eclipse.papyrus.newchild.runtime.NewchildManager;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.NewchildManager;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/.classpath b/sandbox/org.eclipse.papyrus.infra.constraints.edit/.classpath
new file mode 100644
index 00000000000..361578420b1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/.project b/sandbox/org.eclipse.papyrus.infra.constraints.edit/.project
new file mode 100644
index 00000000000..0f922a23738
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.constraints.edit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4a1cc5277e9
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,
+ org.eclipse.papyrus.infra.constraints.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/build.properties b/sandbox/org.eclipse.papyrus.infra.constraints.edit/build.properties
new file mode 100644
index 00000000000..ec2e13c4729
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/build.properties
@@ -0,0 +1,14 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif
new file mode 100644
index 00000000000..7943912208c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif
new file mode 100644
index 00000000000..85a51d1b4a8
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif
new file mode 100644
index 00000000000..6243419e928
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif
new file mode 100644
index 00000000000..7943912208c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif
new file mode 100644
index 00000000000..efff0c9aa7b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif
new file mode 100644
index 00000000000..c78943ee9d6
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif
new file mode 100644
index 00000000000..05dc74ad5da
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif
new file mode 100644
index 00000000000..a26660ec28f
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif
new file mode 100644
index 00000000000..c8d381f0b32
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif
new file mode 100644
index 00000000000..98b351f1c44
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif
new file mode 100644
index 00000000000..d92f34c8aea
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif
new file mode 100644
index 00000000000..420eee17752
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.properties b/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.properties
new file mode 100644
index 00000000000..e95838aed4c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.properties
@@ -0,0 +1,48 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Constraints Edit Support
+providerName = www.example.org
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_DisplayUnit_type = Display Unit
+_UI_ConstraintDescriptor_type = Constraint Descriptor
+_UI_SimpleConstraint_type = Simple Constraint
+_UI_CompositeConstraint_type = Composite Constraint
+_UI_ConfigProperty_type = Config Property
+_UI_ValueProperty_type = Value Property
+_UI_ReferenceProperty_type = Reference Property
+_UI_ConstraintEnvironment_type = Constraint Environment
+_UI_ConstraintType_type = Constraint Type
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_DisplayUnit_constraints_feature = Constraints
+_UI_DisplayUnit_elementMultiplicity_feature = Element Multiplicity
+_UI_ConstraintDescriptor_name_feature = Name
+_UI_ConstraintDescriptor_display_feature = Display
+_UI_ConstraintDescriptor_overrideable_feature = Overrideable
+_UI_ConstraintDescriptor_overriddenConstraints_feature = Overridden Constraints
+_UI_SimpleConstraint_constraintType_feature = Constraint Type
+_UI_SimpleConstraint_properties_feature = Properties
+_UI_CompositeConstraint_constraints_feature = Constraints
+_UI_ConfigProperty_name_feature = Name
+_UI_ValueProperty_value_feature = Value
+_UI_ReferenceProperty_value_feature = Value
+_UI_ConstraintEnvironment_constraintTypes_feature = Constraint Types
+_UI_ConstraintType_label_feature = Label
+_UI_ConstraintType_constraintClass_feature = Constraint Class
+_UI_Unknown_feature = Unspecified
+
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.xml b/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.xml
new file mode 100644
index 00000000000..49240339f92
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/plugin.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <factory
+ uri="http://www.eclipse.org/papyrus/constraints/0.9"
+ class="org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <factory
+ uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"
+ class="org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+</plugin>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java
new file mode 100644
index 00000000000..095ef3a8dd1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java
@@ -0,0 +1,173 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+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.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintEnvironmentItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintEnvironmentItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns ConstraintEnvironment.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintEnvironment"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_ConstraintEnvironment_type");
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(ConstraintEnvironment.class)) {
+ case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES,
+ EnvironmentFactory.eINSTANCE.createConstraintType()));
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ConstraintsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java
new file mode 100644
index 00000000000..31d19c7e053
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java
@@ -0,0 +1,187 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+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.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintTypeItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintTypeItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addLabelPropertyDescriptor(object);
+ addConstraintClassPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Label feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addLabelPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConstraintType_label_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_label_feature", "_UI_ConstraintType_type"),
+ EnvironmentPackage.Literals.CONSTRAINT_TYPE__LABEL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Constraint Class feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addConstraintClassPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConstraintType_constraintClass_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_constraintClass_feature", "_UI_ConstraintType_type"),
+ EnvironmentPackage.Literals.CONSTRAINT_TYPE__CONSTRAINT_CLASS,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This returns ConstraintType.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintType"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((ConstraintType)object).getLabel();
+ return label == null || label.length() == 0 ?
+ getString("_UI_ConstraintType_type") :
+ getString("_UI_ConstraintType_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(ConstraintType.class)) {
+ case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+ case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ConstraintsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..59c6d7b2233
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java
@@ -0,0 +1,227 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.infra.constraints.environment.util.EnvironmentAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnvironmentItemProviderAdapterFactory extends EnvironmentAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+ /**
+ * This keeps track of the root adapter factory that delegates to this adapter factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ComposedAdapterFactory parentAdapterFactory;
+
+ /**
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+ /**
+ * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+ /**
+ * This constructs an instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnvironmentItemProviderAdapterFactory() {
+ supportedTypes.add(IEditingDomainItemProvider.class);
+ supportedTypes.add(IStructuredItemContentProvider.class);
+ supportedTypes.add(ITreeItemContentProvider.class);
+ supportedTypes.add(IItemLabelProvider.class);
+ supportedTypes.add(IItemPropertySource.class);
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintEnvironmentItemProvider constraintEnvironmentItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createConstraintEnvironmentAdapter() {
+ if (constraintEnvironmentItemProvider == null) {
+ constraintEnvironmentItemProvider = new ConstraintEnvironmentItemProvider(this);
+ }
+
+ return constraintEnvironmentItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintTypeItemProvider constraintTypeItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createConstraintTypeAdapter() {
+ if (constraintTypeItemProvider == null) {
+ constraintTypeItemProvider = new ConstraintTypeItemProvider(this);
+ }
+
+ return constraintTypeItemProvider;
+ }
+
+ /**
+ * This returns the root adapter factory that contains this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ComposeableAdapterFactory getRootAdapterFactory() {
+ return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+ }
+
+ /**
+ * This sets the composed adapter factory that contains this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+ this.parentAdapterFactory = parentAdapterFactory;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object type) {
+ return supportedTypes.contains(type) || super.isFactoryForType(type);
+ }
+
+ /**
+ * This implementation substitutes the factory itself as the key for the adapter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter adapt(Notifier notifier, Object type) {
+ return super.adapt(notifier, this);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object adapt(Object object, Object type) {
+ if (isFactoryForType(type)) {
+ Object adapter = super.adapt(object, type);
+ if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+ return adapter;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * This adds a listener.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void addListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.addListener(notifyChangedListener);
+ }
+
+ /**
+ * This removes a listener.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void removeListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.removeListener(notifyChangedListener);
+ }
+
+ /**
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void fireNotifyChanged(Notification notification) {
+ changeNotifier.fireNotifyChanged(notification);
+
+ if (parentAdapterFactory != null) {
+ parentAdapterFactory.fireNotifyChanged(notification);
+ }
+ }
+
+ /**
+ * This disposes all of the item providers created by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void dispose() {
+ if (constraintEnvironmentItemProvider != null) constraintEnvironmentItemProvider.dispose();
+ if (constraintTypeItemProvider != null) constraintTypeItemProvider.dispose();
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java
new file mode 100644
index 00000000000..8eee78c27f4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java
@@ -0,0 +1,160 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+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.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CompositeConstraintItemProvider
+ extends ConstraintDescriptorItemProvider
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeConstraintItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns CompositeConstraint.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeConstraint"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((CompositeConstraint)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_CompositeConstraint_type") :
+ getString("_UI_CompositeConstraint_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(CompositeConstraint.class)) {
+ case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS,
+ ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java
new file mode 100644
index 00000000000..6a6cba1dfce
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java
@@ -0,0 +1,150 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+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.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConfigProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConfigPropertyItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConfigPropertyItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addNamePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Name feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConfigProperty_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"),
+ ConstraintsPackage.Literals.CONFIG_PROPERTY__NAME,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((ConfigProperty)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_ConfigProperty_type") :
+ getString("_UI_ConfigProperty_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(ConfigProperty.class)) {
+ case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ConstraintsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java
new file mode 100644
index 00000000000..a0f546be8b1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java
@@ -0,0 +1,197 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+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.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintDescriptorItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintDescriptorItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addNamePropertyDescriptor(object);
+ addOverrideablePropertyDescriptor(object);
+ addOverriddenConstraintsPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Name feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConstraintDescriptor_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_name_feature", "_UI_ConstraintDescriptor_type"),
+ ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__NAME,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Overrideable feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addOverrideablePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConstraintDescriptor_overrideable_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overrideable_feature", "_UI_ConstraintDescriptor_type"),
+ ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Overridden Constraints feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addOverriddenConstraintsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ConstraintDescriptor_overriddenConstraints_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overriddenConstraints_feature", "_UI_ConstraintDescriptor_type"),
+ ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((ConstraintDescriptor)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_ConstraintDescriptor_type") :
+ getString("_UI_ConstraintDescriptor_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(ConstraintDescriptor.class)) {
+ case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+ case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ConstraintsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java
new file mode 100644
index 00000000000..829c377533c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java
@@ -0,0 +1,93 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Constraints edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class ConstraintsEditPlugin extends EMFPlugin {
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final ConstraintsEditPlugin INSTANCE = new ConstraintsEditPlugin();
+
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static Implementation plugin;
+
+ /**
+ * Create the instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsEditPlugin() {
+ super
+ (new ResourceLocator [] {
+ });
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ @Override
+ public ResourceLocator getPluginResourceLocator() {
+ return plugin;
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ public static Implementation getPlugin() {
+ return plugin;
+ }
+
+ /**
+ * The actual implementation of the Eclipse <b>Plugin</b>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static class Implementation extends EclipsePlugin {
+ /**
+ * Creates an instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Implementation() {
+ super();
+
+ // Remember the static instance.
+ //
+ plugin = this;
+ }
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..a3d21a371d1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java
@@ -0,0 +1,275 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.infra.constraints.util.ConstraintsAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+ /**
+ * This keeps track of the root adapter factory that delegates to this adapter factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ComposedAdapterFactory parentAdapterFactory;
+
+ /**
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+ /**
+ * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+ /**
+ * This constructs an instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsItemProviderAdapterFactory() {
+ supportedTypes.add(IEditingDomainItemProvider.class);
+ supportedTypes.add(IStructuredItemContentProvider.class);
+ supportedTypes.add(ITreeItemContentProvider.class);
+ supportedTypes.add(IItemLabelProvider.class);
+ supportedTypes.add(IItemPropertySource.class);
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SimpleConstraintItemProvider simpleConstraintItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createSimpleConstraintAdapter() {
+ if (simpleConstraintItemProvider == null) {
+ simpleConstraintItemProvider = new SimpleConstraintItemProvider(this);
+ }
+
+ return simpleConstraintItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected CompositeConstraintItemProvider compositeConstraintItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createCompositeConstraintAdapter() {
+ if (compositeConstraintItemProvider == null) {
+ compositeConstraintItemProvider = new CompositeConstraintItemProvider(this);
+ }
+
+ return compositeConstraintItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ValueProperty} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ValuePropertyItemProvider valuePropertyItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createValuePropertyAdapter() {
+ if (valuePropertyItemProvider == null) {
+ valuePropertyItemProvider = new ValuePropertyItemProvider(this);
+ }
+
+ return valuePropertyItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ReferencePropertyItemProvider referencePropertyItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createReferencePropertyAdapter() {
+ if (referencePropertyItemProvider == null) {
+ referencePropertyItemProvider = new ReferencePropertyItemProvider(this);
+ }
+
+ return referencePropertyItemProvider;
+ }
+
+ /**
+ * This returns the root adapter factory that contains this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ComposeableAdapterFactory getRootAdapterFactory() {
+ return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+ }
+
+ /**
+ * This sets the composed adapter factory that contains this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+ this.parentAdapterFactory = parentAdapterFactory;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object type) {
+ return supportedTypes.contains(type) || super.isFactoryForType(type);
+ }
+
+ /**
+ * This implementation substitutes the factory itself as the key for the adapter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter adapt(Notifier notifier, Object type) {
+ return super.adapt(notifier, this);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object adapt(Object object, Object type) {
+ if (isFactoryForType(type)) {
+ Object adapter = super.adapt(object, type);
+ if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+ return adapter;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * This adds a listener.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void addListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.addListener(notifyChangedListener);
+ }
+
+ /**
+ * This removes a listener.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void removeListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.removeListener(notifyChangedListener);
+ }
+
+ /**
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void fireNotifyChanged(Notification notification) {
+ changeNotifier.fireNotifyChanged(notification);
+
+ if (parentAdapterFactory != null) {
+ parentAdapterFactory.fireNotifyChanged(notification);
+ }
+ }
+
+ /**
+ * This disposes all of the item providers created by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void dispose() {
+ if (simpleConstraintItemProvider != null) simpleConstraintItemProvider.dispose();
+ if (compositeConstraintItemProvider != null) compositeConstraintItemProvider.dispose();
+ if (valuePropertyItemProvider != null) valuePropertyItemProvider.dispose();
+ if (referencePropertyItemProvider != null) referencePropertyItemProvider.dispose();
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java
new file mode 100644
index 00000000000..644fb2a001d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java
@@ -0,0 +1,194 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.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.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.DisplayUnit} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DisplayUnitItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public DisplayUnitItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addElementMultiplicityPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Element Multiplicity feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addElementMultiplicityPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_DisplayUnit_elementMultiplicity_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_DisplayUnit_elementMultiplicity_feature", "_UI_DisplayUnit_type"),
+ ConstraintsPackage.Literals.DISPLAY_UNIT__ELEMENT_MULTIPLICITY,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ DisplayUnit displayUnit = (DisplayUnit)object;
+ return getString("_UI_DisplayUnit_type") + " " + displayUnit.getElementMultiplicity();
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(DisplayUnit.class)) {
+ case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+ ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+ ConstraintsFactory.eINSTANCE.createCompositeConstraint()));
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ConstraintsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java
new file mode 100644
index 00000000000..fa430a92c0f
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java
@@ -0,0 +1,139 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.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.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ReferencePropertyItemProvider
+ extends ConfigPropertyItemProvider
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ReferencePropertyItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addValuePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Value feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addValuePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ReferenceProperty_value_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ReferenceProperty_value_feature", "_UI_ReferenceProperty_type"),
+ ConstraintsPackage.Literals.REFERENCE_PROPERTY__VALUE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns ReferenceProperty.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceProperty"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((ReferenceProperty)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_ReferenceProperty_type") :
+ getString("_UI_ReferenceProperty_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java
new file mode 100644
index 00000000000..229ac383149
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java
@@ -0,0 +1,189 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.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.ViewerNotification;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SimpleConstraintItemProvider
+ extends ConstraintDescriptorItemProvider
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SimpleConstraintItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addConstraintTypePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Constraint Type feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addConstraintTypePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_SimpleConstraint_constraintType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_SimpleConstraint_constraintType_feature", "_UI_SimpleConstraint_type"),
+ ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns SimpleConstraint.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/SimpleConstraint"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((SimpleConstraint)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_SimpleConstraint_type") :
+ getString("_UI_SimpleConstraint_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(SimpleConstraint.class)) {
+ case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,
+ ConstraintsFactory.eINSTANCE.createValueProperty()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,
+ ConstraintsFactory.eINSTANCE.createReferenceProperty()));
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java
new file mode 100644
index 00000000000..343835bebf7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java
@@ -0,0 +1,147 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.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.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ValuePropertyItemProvider
+ extends ConfigPropertyItemProvider
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ValuePropertyItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addValuePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Value feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addValuePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValueProperty_value_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_ValueProperty_value_feature", "_UI_ValueProperty_type"),
+ ConstraintsPackage.Literals.VALUE_PROPERTY__VALUE,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This returns ValueProperty.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueProperty"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((ValueProperty)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_ValueProperty_type") :
+ getString("_UI_ValueProperty_type") + " " + label;
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(ValueProperty.class)) {
+ case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/.classpath b/sandbox/org.eclipse.papyrus.infra.constraints.editor/.classpath
new file mode 100644
index 00000000000..361578420b1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/.project b/sandbox/org.eclipse.papyrus.infra.constraints.editor/.project
new file mode 100644
index 00000000000..a685f2a76ed
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.constraints.editor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..88ea1e15d39
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,
+ org.eclipse.papyrus.infra.constraints.presentation
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/build.properties b/sandbox/org.eclipse.papyrus.infra.constraints.editor/build.properties
new file mode 100644
index 00000000000..b6140429855
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/build.properties
@@ -0,0 +1,14 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif
new file mode 100644
index 00000000000..4ef24bd30dc
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif
new file mode 100644
index 00000000000..7cd31fe01e0
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif
new file mode 100644
index 00000000000..440f3695c73
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif
new file mode 100644
index 00000000000..1c827789db0
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif
Binary files differ
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.properties b/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.properties
new file mode 100644
index 00000000000..24ae3d60522
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.properties
@@ -0,0 +1,66 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Constraints Editor
+providerName = www.example.org
+
+_UI_ConstraintsEditor_menu = &Constraints Editor
+_UI_EnvironmentEditor_menu = &Environment Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_Wizard_category = Example EMF Model Creation Wizards
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_ConstraintsModelWizard_label = Constraints Model
+_UI_ConstraintsModelWizard_description = Create a new Constraints model
+
+_UI_ConstraintsEditor_label = Constraints Model Editor
+
+_UI_ConstraintsEditorFilenameDefaultBase = My
+_UI_ConstraintsEditorFilenameExtensions = constraints
+
+_UI_EnvironmentModelWizard_label = Environment Model
+_UI_EnvironmentModelWizard_description = Create a new Environment model
+
+_UI_EnvironmentEditor_label = Environment Model Editor
+
+_UI_EnvironmentEditorFilenameDefaultBase = My
+_UI_EnvironmentEditorFilenameExtensions = environment
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
+
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.xml b/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.xml
new file mode 100644
index 00000000000..7ffa8637924
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/plugin.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ id="org.eclipse.emf.ecore.Wizard.category.ID"
+ name="%_UI_Wizard_category"/>
+ <wizard
+ id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizardID"
+ name="%_UI_ConstraintsModelWizard_label"
+ class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizard"
+ category="org.eclipse.emf.ecore.Wizard.category.ID"
+ icon="icons/full/obj16/ConstraintsModelFile.gif">
+ <description>%_UI_ConstraintsModelWizard_description</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorID"
+ name="%_UI_ConstraintsEditor_label"
+ icon="icons/full/obj16/ConstraintsModelFile.gif"
+ extensions="constraints"
+ class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditor"
+ contributorClass="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsActionBarContributor">
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ id="org.eclipse.emf.ecore.Wizard.category.ID"
+ name="%_UI_Wizard_category"/>
+ <wizard
+ id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizardID"
+ name="%_UI_EnvironmentModelWizard_label"
+ class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizard"
+ category="org.eclipse.emf.ecore.Wizard.category.ID"
+ icon="icons/full/obj16/EnvironmentModelFile.gif">
+ <description>%_UI_EnvironmentModelWizard_description</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditorID"
+ name="%_UI_EnvironmentEditor_label"
+ icon="icons/full/obj16/EnvironmentModelFile.gif"
+ extensions="environment"
+ class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditor"
+ contributorClass="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentActionBarContributor">
+ </editor>
+ </extension>
+
+</plugin>
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java
new file mode 100644
index 00000000000..1c549494887
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java
@@ -0,0 +1,429 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Environment model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnvironmentActionBarContributor
+ extends EditingDomainActionBarContributor
+ implements ISelectionChangedListener {
+ /**
+ * This keeps track of the active editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IEditorPart activeEditorPart;
+
+ /**
+ * This keeps track of the current selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelectionProvider selectionProvider;
+
+ /**
+ * This action opens the Properties view.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction showPropertiesViewAction =
+ new Action(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+ @Override
+ public void run() {
+ try {
+ getPage().showView("org.eclipse.ui.views.PropertySheet");
+ }
+ catch (PartInitException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
+
+ /**
+ * This action refreshes the viewer of the current editor if the editor
+ * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction refreshViewerAction =
+ new Action(ConstraintsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+ @Override
+ public boolean isEnabled() {
+ return activeEditorPart instanceof IViewerProvider;
+ }
+
+ @Override
+ public void run() {
+ if (activeEditorPart instanceof IViewerProvider) {
+ Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+ if (viewer != null) {
+ viewer.refresh();
+ }
+ }
+ }
+ };
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createChildActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createChildMenuManager;
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createSiblingActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createSiblingMenuManager;
+
+ /**
+ * This creates an instance of the contributor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnvironmentActionBarContributor() {
+ super(ADDITIONS_LAST_STYLE);
+ loadResourceAction = new LoadResourceAction();
+ validateAction = new ValidateAction();
+ controlAction = new ControlAction();
+ }
+
+ /**
+ * This adds Separators for editor additions to the tool bar.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToToolBar(IToolBarManager toolBarManager) {
+ toolBarManager.add(new Separator("environment-settings"));
+ toolBarManager.add(new Separator("environment-additions"));
+ }
+
+ /**
+ * This adds to the menu bar a menu and some separators for editor additions,
+ * as well as the sub-menus for object creation items.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToMenu(IMenuManager menuManager) {
+ super.contributeToMenu(menuManager);
+
+ IMenuManager submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditor_menu"), "org.eclipse.papyrus.infra.constraints.environmentMenuID");
+ menuManager.insertAfter("additions", submenuManager);
+ submenuManager.add(new Separator("settings"));
+ submenuManager.add(new Separator("actions"));
+ submenuManager.add(new Separator("additions"));
+ submenuManager.add(new Separator("additions-end"));
+
+ // Prepare for CreateChild item addition or removal.
+ //
+ createChildMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ submenuManager.insertBefore("additions", createChildMenuManager);
+
+ // Prepare for CreateSibling item addition or removal.
+ //
+ createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+ // Force an update because Eclipse hides empty menus now.
+ //
+ submenuManager.addMenuListener
+ (new IMenuListener() {
+ public void menuAboutToShow(IMenuManager menuManager) {
+ menuManager.updateAll(true);
+ }
+ });
+
+ addGlobalActions(submenuManager);
+ }
+
+ /**
+ * When the active editor changes, this remembers the change and registers with it as a selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setActiveEditor(IEditorPart part) {
+ super.setActiveEditor(part);
+ activeEditorPart = part;
+
+ // Switch to the new selection provider.
+ //
+ if (selectionProvider != null) {
+ selectionProvider.removeSelectionChangedListener(this);
+ }
+ if (part == null) {
+ selectionProvider = null;
+ }
+ else {
+ selectionProvider = part.getSite().getSelectionProvider();
+ selectionProvider.addSelectionChangedListener(this);
+
+ // Fake a selection changed event to update the menus.
+ //
+ if (selectionProvider.getSelection() != null) {
+ selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+ }
+ }
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+ * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+ * that can be added to the selected object and updating the menus accordingly.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void selectionChanged(SelectionChangedEvent event) {
+ // Remove any menu items for old selection.
+ //
+ if (createChildMenuManager != null) {
+ depopulateManager(createChildMenuManager, createChildActions);
+ }
+ if (createSiblingMenuManager != null) {
+ depopulateManager(createSiblingMenuManager, createSiblingActions);
+ }
+
+ // Query the new selection for appropriate new child/sibling descriptors
+ //
+ Collection<?> newChildDescriptors = null;
+ Collection<?> newSiblingDescriptors = null;
+
+ ISelection selection = event.getSelection();
+ if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+
+ EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+ newChildDescriptors = domain.getNewChildDescriptors(object, null);
+ newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+ }
+
+ // Generate actions for selection; populate and redraw the menus.
+ //
+ createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+ createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+ if (createChildMenuManager != null) {
+ populateManager(createChildMenuManager, createChildActions, null);
+ createChildMenuManager.update(true);
+ }
+ if (createSiblingMenuManager != null) {
+ populateManager(createSiblingMenuManager, createSiblingActions, null);
+ createSiblingMenuManager.update(true);
+ }
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+ * by inserting them before the specified contribution item <code>contributionID</code>.
+ * If <code>contributionID</code> is <code>null</code>, they are simply added.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+ if (actions != null) {
+ for (IAction action : actions) {
+ if (contributionID != null) {
+ manager.insertBefore(contributionID, action);
+ }
+ else {
+ manager.add(action);
+ }
+ }
+ }
+ }
+
+ /**
+ * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+ if (actions != null) {
+ IContributionItem[] items = manager.getItems();
+ for (int i = 0; i < items.length; i++) {
+ // Look into SubContributionItems
+ //
+ IContributionItem contributionItem = items[i];
+ while (contributionItem instanceof SubContributionItem) {
+ contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+ }
+
+ // Delete the ActionContributionItems with matching action.
+ //
+ if (contributionItem instanceof ActionContributionItem) {
+ IAction action = ((ActionContributionItem)contributionItem).getAction();
+ if (actions.contains(action)) {
+ manager.remove(contributionItem);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This populates the pop-up menu before it appears.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void menuAboutToShow(IMenuManager menuManager) {
+ super.menuAboutToShow(menuManager);
+ MenuManager submenuManager = null;
+
+ submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ populateManager(submenuManager, createChildActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+
+ submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ populateManager(submenuManager, createSiblingActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+ }
+
+ /**
+ * This inserts global actions before the "additions-end" separator.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void addGlobalActions(IMenuManager menuManager) {
+ menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+ menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+ refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+ super.addGlobalActions(menuManager);
+ }
+
+ /**
+ * This ensures that a delete action will clean up all references to deleted objects.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean removeAllReferencesOnDelete() {
+ return true;
+ }
+
+} \ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java
new file mode 100644
index 00000000000..082b1268293
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java
@@ -0,0 +1,1821 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.custom.CTabFolder;
+
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+
+import org.eclipse.swt.graphics.Point;
+
+import org.eclipse.swt.layout.FillLayout;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+
+import org.eclipse.ui.dialogs.SaveAsDialog;
+
+import org.eclipse.ui.ide.IGotoMarker;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
+import org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;
+
+import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;
+
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+
+/**
+ * This is an example of a Environment model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnvironmentEditor
+ 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 -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected AdapterFactoryEditingDomain editingDomain;
+
+ /**
+ * This is the one adapter factory used for providing views of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ComposedAdapterFactory adapterFactory;
+
+ /**
+ * This is the content outline page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IContentOutlinePage contentOutlinePage;
+
+ /**
+ * This is a kludge...
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IStatusLineManager contentOutlineStatusLineManager;
+
+ /**
+ * This is the content outline page's viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer contentOutlineViewer;
+
+ /**
+ * This is the property sheet page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected PropertySheetPage propertySheetPage;
+
+ /**
+ * This is the viewer that shadows the selection in the content outline.
+ * The parent relation must be correctly defined for this to work.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer selectionViewer;
+
+ /**
+ * This inverts the roll of parent and child in the content provider and show parents as a tree.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer parentViewer;
+
+ /**
+ * This shows how a tree view works.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer treeViewer;
+
+ /**
+ * This shows how a list view works.
+ * A list viewer doesn't support icons.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ListViewer listViewer;
+
+ /**
+ * This shows how a table view works.
+ * A table can be used as a list with icons.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TableViewer tableViewer;
+
+ /**
+ * This shows how a tree view with columns works.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer treeViewerWithColumns;
+
+ /**
+ * This keeps track of the active viewer pane, in the book.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ViewerPane currentViewerPane;
+
+ /**
+ * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Viewer currentViewer;
+
+ /**
+ * This listens to which ever viewer is active.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelectionChangedListener selectionChangedListener;
+
+ /**
+ * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+ /**
+ * This keeps track of the selection of the editor as a whole.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+ /**
+ * The MarkerHelper is responsible for creating workspace resource markers presented
+ * in Eclipse's Problems View.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+ /**
+ * This listens for when the outline becomes active
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IPartListener partListener =
+ new IPartListener() {
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(EnvironmentEditor.this);
+
+ setCurrentViewer(contentOutlineViewer);
+ }
+ }
+ else if (p instanceof PropertySheet) {
+ if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
+ getActionBarContributor().setActiveEditor(EnvironmentEditor.this);
+ handleActivate();
+ }
+ }
+ else if (p == EnvironmentEditor.this) {
+ handleActivate();
+ }
+ }
+ 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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+ /**
+ * Resources that have been changed since last activation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+ /**
+ * Resources that have been saved.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+ /**
+ * Map to store the diagnostic associated with a resource.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+ /**
+ * Controls whether the problem indication should be updated.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean updateProblemIndication = true;
+
+ /**
+ * Adapter used to update the problem indication when resources are demanded loaded.
+ * <!-- begin-user-doc -->
+ * <!-- 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);
+ }
+
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
+ }
+ break;
+ }
+ }
+ }
+ else {
+ super.notifyChanged(notification);
+ }
+ }
+
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
+
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ }
+ };
+
+ /**
+ * This listens for workspace changes.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @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);
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
+ }
+
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
+ }
+ }
+
+ 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(EnvironmentEditor.this, false);
+ }
+ }
+ });
+ }
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == EnvironmentEditor.this) {
+ handleActivate();
+ }
+ }
+ });
+ }
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
+
+ /**
+ * Handles activation of the editor or it's associated views.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void handleActivate() {
+ // Recompute the read only state.
+ //
+ if (editingDomain.getResourceToReadOnlyMap() != null) {
+ editingDomain.getResourceToReadOnlyMap().clear();
+
+ // Refresh any actions that may become enabled or disabled.
+ //
+ setSelection(getSelection());
+ }
+
+ if (!removedResources.isEmpty()) {
+ if (handleDirtyConflict()) {
+ getSite().getPage().closeEditor(EnvironmentEditor.this, false);
+ }
+ else {
+ removedResources.clear();
+ changedResources.clear();
+ savedResources.clear();
+ }
+ }
+ else if (!changedResources.isEmpty()) {
+ changedResources.removeAll(savedResources);
+ handleChangedResources();
+ changedResources.clear();
+ savedResources.clear();
+ }
+ }
+
+ /**
+ * Handles what to do with changed resources on activation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void handleChangedResources() {
+ if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+ if (isDirty()) {
+ changedResources.addAll(editingDomain.getResourceSet().getResources());
+ }
+ editingDomain.getCommandStack().flush();
+
+ updateProblemIndication = false;
+ for (Resource resource : changedResources) {
+ if (resource.isLoaded()) {
+ resource.unload();
+ try {
+ resource.load(Collections.EMPTY_MAP);
+ }
+ catch (IOException exception) {
+ if (!resourceToDiagnosticMap.containsKey(resource)) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ }
+ }
+ }
+
+ if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+ setSelection(StructuredSelection.EMPTY);
+ }
+
+ updateProblemIndication = true;
+ updateProblemIndication();
+ }
+ }
+
+ /**
+ * Updates the problems indication with the information described in the specified diagnostic.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void updateProblemIndication() {
+ if (updateProblemIndication) {
+ BasicDiagnostic diagnostic =
+ new BasicDiagnostic
+ (Diagnostic.OK,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ null,
+ new Object [] { editingDomain.getResourceSet() });
+ for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+ if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+ diagnostic.add(childDiagnostic);
+ }
+ }
+
+ int lastEditorPage = getPageCount() - 1;
+ if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+ ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ setActivePage(lastEditorPage);
+ }
+ }
+ else if (diagnostic.getSeverity() != Diagnostic.OK) {
+ ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+ problemEditorPart.setDiagnostic(diagnostic);
+ problemEditorPart.setMarkerHelper(markerHelper);
+ try {
+ addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+ setPageText(lastEditorPage, problemEditorPart.getPartName());
+ setActivePage(lastEditorPage);
+ showTabs();
+ }
+ catch (PartInitException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+
+ if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+ markerHelper.deleteMarkers(editingDomain.getResourceSet());
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ try {
+ markerHelper.createMarkers(diagnostic);
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Shows a dialog that asks if conflicting changes should be discarded.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean handleDirtyConflict() {
+ return
+ MessageDialog.openQuestion
+ (getSite().getShell(),
+ getString("_UI_FileConflict_label"),
+ getString("_WARN_FileConflict"));
+ }
+
+ /**
+ * This creates a model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnvironmentEditor() {
+ super();
+ initializeEditingDomain();
+ }
+
+ /**
+ * This sets up the editing domain for the model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void initializeEditingDomain() {
+ // Create an adapter factory that yields item providers.
+ //
+ adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+ // Create the command stack that will notify this editor as commands are executed.
+ //
+ BasicCommandStack commandStack = new BasicCommandStack();
+
+ // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+ //
+ commandStack.addCommandStackListener
+ (new CommandStackListener() {
+ 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());
+ }
+ if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+ propertySheetPage.refresh();
+ }
+ }
+ });
+ }
+ });
+
+ // Create the editing domain with a special command stack.
+ //
+ editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+ }
+
+ /**
+ * This is here for the listener to be able to call it.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void firePropertyChange(int action) {
+ super.firePropertyChange(action);
+ }
+
+ /**
+ * This sets the selection into whichever viewer is active.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSelectionToViewer(Collection<?> collection) {
+ final Collection<?> theSelection = collection;
+ // 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);
+ }
+ }
+ };
+ getSite().getShell().getDisplay().asyncExec(runnable);
+ }
+ }
+
+ /**
+ * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+ * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+ * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object [] getElements(Object object) {
+ Object parent = super.getParent(object);
+ return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object [] getChildren(Object object) {
+ Object parent = super.getParent(object);
+ return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean hasChildren(Object object) {
+ Object parent = super.getParent(object);
+ return parent != null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getParent(Object object) {
+ return null;
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCurrentViewerPane(ViewerPane viewerPane) {
+ if (currentViewerPane != viewerPane) {
+ if (currentViewerPane != null) {
+ currentViewerPane.showFocus(false);
+ }
+ currentViewerPane = viewerPane;
+ }
+ setCurrentViewer(currentViewerPane.getViewer());
+ }
+
+ /**
+ * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+ * is the current one.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCurrentViewer(Viewer viewer) {
+ // If it is changing...
+ //
+ if (currentViewer != viewer) {
+ if (selectionChangedListener == null) {
+ // Create the listener on demand.
+ //
+ selectionChangedListener =
+ new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
+ }
+
+ // Stop listening to the old one.
+ //
+ if (currentViewer != null) {
+ currentViewer.removeSelectionChangedListener(selectionChangedListener);
+ }
+
+ // Start listening to the new one.
+ //
+ if (viewer != null) {
+ viewer.addSelectionChangedListener(selectionChangedListener);
+ }
+
+ // Remember it.
+ //
+ currentViewer = viewer;
+
+ // Set the editors selection based on the current viewer's selection.
+ //
+ setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+ }
+ }
+
+ /**
+ * This returns the viewer as required by the {@link IViewerProvider} interface.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Viewer getViewer() {
+ return currentViewer;
+ }
+
+ /**
+ * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void createContextMenuFor(StructuredViewer viewer) {
+ MenuManager contextMenu = new MenuManager("#PopUp");
+ contextMenu.add(new Separator("additions"));
+ contextMenu.setRemoveAllWhenShown(true);
+ contextMenu.addMenuListener(this);
+ Menu menu= contextMenu.createContextMenu(viewer.getControl());
+ viewer.getControl().setMenu(menu);
+ getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+ int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+ viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+ viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+ }
+
+ /**
+ * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createModel() {
+ URI resourceURI = EditUIUtil.getURI(getEditorInput());
+ Exception exception = null;
+ Resource resource = null;
+ try {
+ // Load the resource through the editing domain.
+ //
+ resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+ }
+ catch (Exception e) {
+ exception = e;
+ resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+ }
+
+ Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+ }
+
+ /**
+ * Returns a diagnostic describing the errors and warnings listed in the resource
+ * and the specified exception (if any).
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+ if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+ BasicDiagnostic basicDiagnostic =
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object [] { exception == null ? (Object)resource : exception });
+ basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+ return basicDiagnostic;
+ }
+ else if (exception != null) {
+ return
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object[] { exception });
+ }
+ else {
+ return Diagnostic.OK_INSTANCE;
+ }
+ }
+
+ /**
+ * This is the method used by the framework to install your own controls.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void createPages() {
+ // Creates the model from the editor input
+ //
+ createModel();
+
+ // Only creates the other pages if there is something that can be edited
+ //
+ if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+ // Create a page for the selection tree view.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ selectionViewer = (TreeViewer)viewerPane.getViewer();
+ selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+
+ selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ selectionViewer.setInput(editingDomain.getResourceSet());
+ selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ viewerPane.setTitle(editingDomain.getResourceSet());
+
+ new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+ createContextMenuFor(selectionViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+ }
+
+ // Create a page for the parent tree view.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ parentViewer = (TreeViewer)viewerPane.getViewer();
+ parentViewer.setAutoExpandLevel(30);
+ parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+ parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(parentViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_ParentPage_label"));
+ }
+
+ // This is the page for the list viewer
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new ListViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ listViewer = (ListViewer)viewerPane.getViewer();
+ listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(listViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_ListPage_label"));
+ }
+
+ // This is the page for the tree viewer
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ treeViewer = (TreeViewer)viewerPane.getViewer();
+ treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+ createContextMenuFor(treeViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TreePage_label"));
+ }
+
+ // This is the page for the table viewer.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TableViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ tableViewer = (TableViewer)viewerPane.getViewer();
+
+ Table table = tableViewer.getTable();
+ TableLayout layout = new TableLayout();
+ table.setLayout(layout);
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+
+ TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+ layout.addColumnData(new ColumnWeightData(3, 100, true));
+ objectColumn.setText(getString("_UI_ObjectColumn_label"));
+ objectColumn.setResizable(true);
+
+ TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+ layout.addColumnData(new ColumnWeightData(2, 100, true));
+ selfColumn.setText(getString("_UI_SelfColumn_label"));
+ selfColumn.setResizable(true);
+
+ tableViewer.setColumnProperties(new String [] {"a", "b"});
+ tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(tableViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TablePage_label"));
+ }
+
+ // This is the page for the table tree viewer.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), EnvironmentEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+ Tree tree = treeViewerWithColumns.getTree();
+ tree.setLayoutData(new FillLayout());
+ tree.setHeaderVisible(true);
+ tree.setLinesVisible(true);
+
+ TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+ objectColumn.setText(getString("_UI_ObjectColumn_label"));
+ objectColumn.setResizable(true);
+ objectColumn.setWidth(250);
+
+ TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+ selfColumn.setText(getString("_UI_SelfColumn_label"));
+ selfColumn.setResizable(true);
+ selfColumn.setWidth(200);
+
+ treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
+ treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(treeViewerWithColumns);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
+ }
+
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ 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;
+ }
+ }
+ });
+
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
+ }
+
+ /**
+ * If there is just one page in the multi-page editor part,
+ * this hides the single tab at the bottom.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void hideTabs() {
+ if (getPageCount() <= 1) {
+ setPageText(0, "");
+ if (getContainer() instanceof CTabFolder) {
+ ((CTabFolder)getContainer()).setTabHeight(1);
+ Point point = getContainer().getSize();
+ getContainer().setSize(point.x, point.y + 6);
+ }
+ }
+ }
+
+ /**
+ * If there is more than one page in the multi-page editor part,
+ * this shows the tabs at the bottom.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void showTabs() {
+ if (getPageCount() > 1) {
+ setPageText(0, getString("_UI_SelectionPage_label"));
+ if (getContainer() instanceof CTabFolder) {
+ ((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+ Point point = getContainer().getSize();
+ getContainer().setSize(point.x, point.y - 6);
+ }
+ }
+ }
+
+ /**
+ * This is used to track the active viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void pageChange(int pageIndex) {
+ super.pageChange(pageIndex);
+
+ if (contentOutlinePage != null) {
+ handleContentOutlineSelection(contentOutlinePage.getSelection());
+ }
+ }
+
+ /**
+ * This is how the framework determines which interfaces we implement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
+ public Object getAdapter(Class key) {
+ if (key.equals(IContentOutlinePage.class)) {
+ return showOutlineView() ? getContentOutlinePage() : null;
+ }
+ else if (key.equals(IPropertySheetPage.class)) {
+ return getPropertySheetPage();
+ }
+ else if (key.equals(IGotoMarker.class)) {
+ return this;
+ }
+ else {
+ return super.getAdapter(key);
+ }
+ }
+
+ /**
+ * This accesses a cached version of the content outliner.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IContentOutlinePage getContentOutlinePage() {
+ if (contentOutlinePage == null) {
+ // The content outline is just a tree.
+ //
+ class MyContentOutlinePage extends ContentOutlinePage {
+ @Override
+ public void createControl(Composite parent) {
+ super.createControl(parent);
+ contentOutlineViewer = getTreeViewer();
+ contentOutlineViewer.addSelectionChangedListener(this);
+
+ // Set up the tree viewer.
+ //
+ contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+ // Make sure our popups work.
+ //
+ createContextMenuFor(contentOutlineViewer);
+
+ if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ }
+ }
+
+ @Override
+ public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+ super.makeContributions(menuManager, toolBarManager, statusLineManager);
+ contentOutlineStatusLineManager = statusLineManager;
+ }
+
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ }
+
+ contentOutlinePage = new MyContentOutlinePage();
+
+ // Listen to selection so that we can handle it is a special way.
+ //
+ contentOutlinePage.addSelectionChangedListener
+ (new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
+ }
+
+ return contentOutlinePage;
+ }
+
+ /**
+ * This accesses a cached version of the property sheet.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IPropertySheetPage getPropertySheetPage() {
+ if (propertySheetPage == null) {
+ propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ EnvironmentEditor.this.setSelectionToViewer(selection);
+ EnvironmentEditor.this.setFocus();
+ }
+
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
+ propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+ }
+
+ return propertySheetPage;
+ }
+
+ /**
+ * This deals with how we want selection in the outliner to affect the other views.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void handleContentOutlineSelection(ISelection selection) {
+ if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+ Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+ if (selectedElements.hasNext()) {
+ // Get the first selected element.
+ //
+ Object selectedElement = selectedElements.next();
+
+ // If it's the selection viewer, then we want it to select the same selection as this selection.
+ //
+ if (currentViewerPane.getViewer() == selectionViewer) {
+ ArrayList<Object> selectionList = new ArrayList<Object>();
+ selectionList.add(selectedElement);
+ while (selectedElements.hasNext()) {
+ selectionList.add(selectedElements.next());
+ }
+
+ // Set the selection to the widget.
+ //
+ selectionViewer.setSelection(new StructuredSelection(selectionList));
+ }
+ else {
+ // Set the input to the widget.
+ //
+ if (currentViewerPane.getViewer().getInput() != selectedElement) {
+ currentViewerPane.getViewer().setInput(selectedElement);
+ currentViewerPane.setTitle(selectedElement);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This is for implementing {@link IEditorPart} and simply tests the command stack.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isDirty() {
+ return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+ }
+
+ /**
+ * This is for implementing {@link IEditorPart} and simply saves the model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void doSave(IProgressMonitor progressMonitor) {
+ // Save only resources that have actually changed.
+ //
+ final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+
+ // Do the work within an operation because this is a long running activity that modifies the workbench.
+ //
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ // This is the method that gets invoked when the operation runs.
+ //
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
+ //
+ boolean first = true;
+ 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);
+ }
+ }
+ catch (Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ first = false;
+ }
+ }
+ }
+ };
+
+ updateProblemIndication = false;
+ try {
+ // This runs the options, and shows progress.
+ //
+ new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+ // Refresh the necessary state.
+ //
+ ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+ firePropertyChange(IEditorPart.PROP_DIRTY);
+ }
+ catch (Exception exception) {
+ // Something went wrong that shouldn't.
+ //
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ updateProblemIndication = true;
+ updateProblemIndication();
+ }
+
+ /**
+ * This returns whether something has been persisted to the URI of the specified resource.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean isPersisted(Resource resource) {
+ boolean result = false;
+ try {
+ InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+ if (stream != null) {
+ result = true;
+ stream.close();
+ }
+ }
+ catch (IOException e) {
+ // Ignore
+ }
+ return result;
+ }
+
+ /**
+ * This always returns true because it is not currently supported.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isSaveAsAllowed() {
+ return true;
+ }
+
+ /**
+ * This also changes the editor's input.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void doSaveAs() {
+ SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+ saveAsDialog.open();
+ IPath path = saveAsDialog.getResult();
+ if (path != null) {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (file != null) {
+ doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void doSaveAs(URI uri, IEditorInput editorInput) {
+ (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+ setInputWithNotify(editorInput);
+ setPartName(editorInput.getName());
+ IProgressMonitor progressMonitor =
+ getActionBars().getStatusLineManager() != null ?
+ getActionBars().getStatusLineManager().getProgressMonitor() :
+ new NullProgressMonitor();
+ doSave(progressMonitor);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void gotoMarker(IMarker marker) {
+ try {
+ if (marker.getType().equals(EValidator.MARKER)) {
+ String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+ if (uriAttribute != null) {
+ URI uri = URI.createURI(uriAttribute);
+ EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+ if (eObject != null) {
+ setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+ }
+ }
+ }
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+
+ /**
+ * This is called during startup.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void init(IEditorSite site, IEditorInput editorInput) {
+ setSite(site);
+ setInputWithNotify(editorInput);
+ setPartName(editorInput.getName());
+ site.setSelectionProvider(this);
+ site.getPage().addPartListener(partListener);
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setFocus() {
+ if (currentViewerPane != null) {
+ currentViewerPane.setFocus();
+ }
+ else {
+ getControl(getActivePage()).setFocus();
+ }
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.add(listener);
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.remove(listener);
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ISelection getSelection() {
+ return editorSelection;
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+ * Calling this result will notify the listeners.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSelection(ISelection selection) {
+ editorSelection = selection;
+
+ for (ISelectionChangedListener listener : selectionChangedListeners) {
+ listener.selectionChanged(new SelectionChangedEvent(this, selection));
+ }
+ setStatusLineManager(selection);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setStatusLineManager(ISelection selection) {
+ IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+ contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+ if (statusLineManager != null) {
+ if (selection instanceof IStructuredSelection) {
+ Collection<?> collection = ((IStructuredSelection)selection).toList();
+ switch (collection.size()) {
+ case 0: {
+ statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+ break;
+ }
+ case 1: {
+ String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+ statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+ break;
+ }
+ default: {
+ statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+ break;
+ }
+ }
+ }
+ else {
+ statusLineManager.setMessage("");
+ }
+ }
+ }
+
+ /**
+ * This looks up a string in the plugin's plugin.properties file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static String getString(String key) {
+ return ConstraintsEditorPlugin.INSTANCE.getString(key);
+ }
+
+ /**
+ * This looks up a string in plugin.properties, making a substitution.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static String getString(String key, Object s1) {
+ return ConstraintsEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void menuAboutToShow(IMenuManager menuManager) {
+ ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EditingDomainActionBarContributor getActionBarContributor() {
+ return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IActionBars getActionBars() {
+ return getActionBarContributor().getActionBars();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public AdapterFactory getAdapterFactory() {
+ return adapterFactory;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void dispose() {
+ updateProblemIndication = false;
+
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+ getSite().getPage().removePartListener(partListener);
+
+ adapterFactory.dispose();
+
+ if (getActionBarContributor().getActiveEditor() == this) {
+ getActionBarContributor().setActiveEditor(null);
+ }
+
+ if (propertySheetPage != null) {
+ propertySheetPage.dispose();
+ }
+
+ if (contentOutlinePage != null) {
+ contentOutlinePage.dispose();
+ }
+
+ super.dispose();
+ }
+
+ /**
+ * Returns whether the outline view should be presented to the user.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean showOutlineView() {
+ return true;
+ }
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java
new file mode 100644
index 00000000000..833da205668
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java
@@ -0,0 +1,633 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.CommonPlugin;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnvironmentModelWizard extends Wizard implements INewWizard {
+ /**
+ * The supported extensions for created files.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final List<String> FILE_EXTENSIONS =
+ Collections.unmodifiableList(Arrays.asList(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").split("\\s*,\\s*")));
+
+ /**
+ * A formatted list of supported file extensions, suitable for display.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String FORMATTED_FILE_EXTENSIONS =
+ ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+ /**
+ * This caches an instance of the model package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EnvironmentPackage environmentPackage = EnvironmentPackage.eINSTANCE;
+
+ /**
+ * This caches an instance of the model factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EnvironmentFactory environmentFactory = environmentPackage.getEnvironmentFactory();
+
+ /**
+ * This is the file creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EnvironmentModelWizardNewFileCreationPage newFileCreationPage;
+
+ /**
+ * This is the initial object creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EnvironmentModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+ /**
+ * Remember the selection during initialization for populating the default container.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IStructuredSelection selection;
+
+ /**
+ * Remember the workbench during initialization.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IWorkbench workbench;
+
+ /**
+ * Caches the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected List<String> initialObjectNames;
+
+ /**
+ * This just records the information.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ this.workbench = workbench;
+ this.selection = selection;
+ setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+ setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewEnvironment")));
+ }
+
+ /**
+ * Returns the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getInitialObjectNames() {
+ if (initialObjectNames == null) {
+ initialObjectNames = new ArrayList<String>();
+ for (EClassifier eClassifier : environmentPackage.getEClassifiers()) {
+ if (eClassifier instanceof EClass) {
+ EClass eClass = (EClass)eClassifier;
+ if (!eClass.isAbstract()) {
+ initialObjectNames.add(eClass.getName());
+ }
+ }
+ }
+ Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+ }
+ return initialObjectNames;
+ }
+
+ /**
+ * Create a new model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EObject createInitialModel() {
+ EClass eClass = (EClass)environmentPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+ EObject rootObject = environmentFactory.create(eClass);
+ return rootObject;
+ }
+
+ /**
+ * Do the work after everything is specified.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean performFinish() {
+ try {
+ // Remember the file.
+ //
+ final IFile modelFile = getModelFile();
+
+ // Do the work within an operation.
+ //
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor) {
+ try {
+ // Create a resource set
+ //
+ ResourceSet resourceSet = new ResourceSetImpl();
+
+ // Get the URI of the model file.
+ //
+ URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+ // Create a resource for this file.
+ //
+ Resource resource = resourceSet.createResource(fileURI);
+
+ // Add the initial model object to the contents.
+ //
+ EObject rootObject = createInitialModel();
+ if (rootObject != null) {
+ resource.getContents().add(rootObject);
+ }
+
+ // Save the contents of the resource to the file system.
+ //
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+ resource.save(options);
+ }
+ catch (Exception exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ finally {
+ progressMonitor.done();
+ }
+ }
+ };
+
+ getContainer().run(false, false, operation);
+
+ // Select the new file resource in the current view.
+ //
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ IWorkbenchPage page = workbenchWindow.getActivePage();
+ final IWorkbenchPart activePart = page.getActivePart();
+ if (activePart instanceof ISetSelectionTarget) {
+ final ISelection targetSelection = new StructuredSelection(modelFile);
+ getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+ }
+ });
+ }
+
+ // Open an editor on the new file.
+ //
+ try {
+ page.openEditor
+ (new FileEditorInput(modelFile),
+ workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ }
+ catch (PartInitException exception) {
+ MessageDialog.openError(workbenchWindow.getShell(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ return false;
+ }
+ }
+
+ /**
+ * This is the one page of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class EnvironmentModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnvironmentModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+ super(pageId, selection);
+ }
+
+ /**
+ * The framework calls this to see if the file is correct.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean validatePage() {
+ if (super.validatePage()) {
+ String extension = new Path(getFileName()).getFileExtension();
+ if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+ String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+ setErrorMessage(ConstraintsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+ return false;
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+ }
+ }
+
+ /**
+ * This is the page where the type of object to create is selected.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class EnvironmentModelWizardInitialObjectCreationPage extends WizardPage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo initialObjectField;
+
+ /**
+ * @generated
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ */
+ protected List<String> encodings;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo encodingField;
+
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnvironmentModelWizardInitialObjectCreationPage(String pageId) {
+ super(pageId);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE); {
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ layout.verticalSpacing = 12;
+ composite.setLayout(layout);
+
+ GridData data = new GridData();
+ data.verticalAlignment = GridData.FILL;
+ data.grabExcessVerticalSpace = true;
+ data.horizontalAlignment = GridData.FILL;
+ composite.setLayoutData(data);
+ }
+
+ Label containerLabel = new Label(composite, SWT.LEFT);
+ {
+ containerLabel.setText(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ containerLabel.setLayoutData(data);
+ }
+
+ initialObjectField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ initialObjectField.setLayoutData(data);
+ }
+
+ for (String objectName : getInitialObjectNames()) {
+ initialObjectField.add(getLabel(objectName));
+ }
+
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.select(0);
+ }
+ initialObjectField.addModifyListener(validator);
+
+ Label encodingLabel = new Label(composite, SWT.LEFT);
+ {
+ encodingLabel.setText(ConstraintsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ encodingLabel.setLayoutData(data);
+ }
+ encodingField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ encodingField.setLayoutData(data);
+ }
+
+ for (String encoding : getEncodings()) {
+ encodingField.add(encoding);
+ }
+
+ encodingField.select(0);
+ encodingField.addModifyListener(validator);
+
+ setPageComplete(validatePage());
+ setControl(composite);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ModifyListener validator =
+ new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ setPageComplete(validatePage());
+ }
+ };
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean validatePage() {
+ return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setVisible(boolean visible) {
+ super.setVisible(visible);
+ if (visible) {
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.clearSelection();
+ encodingField.setFocus();
+ }
+ else {
+ encodingField.clearSelection();
+ initialObjectField.setFocus();
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getInitialObjectName() {
+ String label = initialObjectField.getText();
+
+ for (String name : getInitialObjectNames()) {
+ if (getLabel(name).equals(label)) {
+ return name;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getEncoding() {
+ return encodingField.getText();
+ }
+
+ /**
+ * Returns the label for the specified type name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected String getLabel(String typeName) {
+ try {
+ return ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+ }
+ catch(MissingResourceException mre) {
+ ConstraintsEditorPlugin.INSTANCE.log(mre);
+ }
+ return typeName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getEncodings() {
+ if (encodings == null) {
+ encodings = new ArrayList<String>();
+ for (StringTokenizer stringTokenizer = new StringTokenizer(ConstraintsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+ encodings.add(stringTokenizer.nextToken());
+ }
+ }
+ return encodings;
+ }
+ }
+
+ /**
+ * The framework calls this to create the contents of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void addPages() {
+ // Create a page, set the title, and the initial model file name.
+ //
+ newFileCreationPage = new EnvironmentModelWizardNewFileCreationPage("Whatever", selection);
+ newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));
+ newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_description"));
+ newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+ addPage(newFileCreationPage);
+
+ // Try and get the resource selection to determine a current directory for the file dialog.
+ //
+ if (selection != null && !selection.isEmpty()) {
+ // Get the resource...
+ //
+ Object selectedElement = selection.iterator().next();
+ if (selectedElement instanceof IResource) {
+ // Get the resource parent, if its a file.
+ //
+ IResource selectedResource = (IResource)selectedElement;
+ if (selectedResource.getType() == IResource.FILE) {
+ selectedResource = selectedResource.getParent();
+ }
+
+ // This gives us a directory...
+ //
+ if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+ // Set this for the container.
+ //
+ newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+ // Make up a unique new name here.
+ //
+ String defaultModelBaseFilename = ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase");
+ String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+ String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+ for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+ modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+ }
+ newFileCreationPage.setFileName(modelFilename);
+ }
+ }
+ }
+ initialObjectCreationPage = new EnvironmentModelWizardInitialObjectCreationPage("Whatever2");
+ initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));
+ initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+ addPage(initialObjectCreationPage);
+ }
+
+ /**
+ * Get the file from the page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return newFileCreationPage.getModelFile();
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java
new file mode 100644
index 00000000000..a20d3eca98e
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java
@@ -0,0 +1,427 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Constraints model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintsActionBarContributor
+ extends EditingDomainActionBarContributor
+ implements ISelectionChangedListener {
+ /**
+ * This keeps track of the active editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IEditorPart activeEditorPart;
+
+ /**
+ * This keeps track of the current selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelectionProvider selectionProvider;
+
+ /**
+ * This action opens the Properties view.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction showPropertiesViewAction =
+ new Action(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+ @Override
+ public void run() {
+ try {
+ getPage().showView("org.eclipse.ui.views.PropertySheet");
+ }
+ catch (PartInitException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
+
+ /**
+ * This action refreshes the viewer of the current editor if the editor
+ * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction refreshViewerAction =
+ new Action(ConstraintsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+ @Override
+ public boolean isEnabled() {
+ return activeEditorPart instanceof IViewerProvider;
+ }
+
+ @Override
+ public void run() {
+ if (activeEditorPart instanceof IViewerProvider) {
+ Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+ if (viewer != null) {
+ viewer.refresh();
+ }
+ }
+ }
+ };
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createChildActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createChildMenuManager;
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createSiblingActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createSiblingMenuManager;
+
+ /**
+ * This creates an instance of the contributor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsActionBarContributor() {
+ super(ADDITIONS_LAST_STYLE);
+ loadResourceAction = new LoadResourceAction();
+ validateAction = new ValidateAction();
+ controlAction = new ControlAction();
+ }
+
+ /**
+ * This adds Separators for editor additions to the tool bar.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToToolBar(IToolBarManager toolBarManager) {
+ toolBarManager.add(new Separator("constraints-settings"));
+ toolBarManager.add(new Separator("constraints-additions"));
+ }
+
+ /**
+ * This adds to the menu bar a menu and some separators for editor additions,
+ * as well as the sub-menus for object creation items.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToMenu(IMenuManager menuManager) {
+ super.contributeToMenu(menuManager);
+
+ IMenuManager submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditor_menu"), "org.eclipse.papyrus.infra.constraintsMenuID");
+ menuManager.insertAfter("additions", submenuManager);
+ submenuManager.add(new Separator("settings"));
+ submenuManager.add(new Separator("actions"));
+ submenuManager.add(new Separator("additions"));
+ submenuManager.add(new Separator("additions-end"));
+
+ // Prepare for CreateChild item addition or removal.
+ //
+ createChildMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ submenuManager.insertBefore("additions", createChildMenuManager);
+
+ // Prepare for CreateSibling item addition or removal.
+ //
+ createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+ // Force an update because Eclipse hides empty menus now.
+ //
+ submenuManager.addMenuListener
+ (new IMenuListener() {
+ public void menuAboutToShow(IMenuManager menuManager) {
+ menuManager.updateAll(true);
+ }
+ });
+
+ addGlobalActions(submenuManager);
+ }
+
+ /**
+ * When the active editor changes, this remembers the change and registers with it as a selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setActiveEditor(IEditorPart part) {
+ super.setActiveEditor(part);
+ activeEditorPart = part;
+
+ // Switch to the new selection provider.
+ //
+ if (selectionProvider != null) {
+ selectionProvider.removeSelectionChangedListener(this);
+ }
+ if (part == null) {
+ selectionProvider = null;
+ }
+ else {
+ selectionProvider = part.getSite().getSelectionProvider();
+ selectionProvider.addSelectionChangedListener(this);
+
+ // Fake a selection changed event to update the menus.
+ //
+ if (selectionProvider.getSelection() != null) {
+ selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+ }
+ }
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+ * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+ * that can be added to the selected object and updating the menus accordingly.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void selectionChanged(SelectionChangedEvent event) {
+ // Remove any menu items for old selection.
+ //
+ if (createChildMenuManager != null) {
+ depopulateManager(createChildMenuManager, createChildActions);
+ }
+ if (createSiblingMenuManager != null) {
+ depopulateManager(createSiblingMenuManager, createSiblingActions);
+ }
+
+ // Query the new selection for appropriate new child/sibling descriptors
+ //
+ Collection<?> newChildDescriptors = null;
+ Collection<?> newSiblingDescriptors = null;
+
+ ISelection selection = event.getSelection();
+ if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+
+ EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+ newChildDescriptors = domain.getNewChildDescriptors(object, null);
+ newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+ }
+
+ // Generate actions for selection; populate and redraw the menus.
+ //
+ createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+ createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+ if (createChildMenuManager != null) {
+ populateManager(createChildMenuManager, createChildActions, null);
+ createChildMenuManager.update(true);
+ }
+ if (createSiblingMenuManager != null) {
+ populateManager(createSiblingMenuManager, createSiblingActions, null);
+ createSiblingMenuManager.update(true);
+ }
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+ * by inserting them before the specified contribution item <code>contributionID</code>.
+ * If <code>contributionID</code> is <code>null</code>, they are simply added.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+ if (actions != null) {
+ for (IAction action : actions) {
+ if (contributionID != null) {
+ manager.insertBefore(contributionID, action);
+ }
+ else {
+ manager.add(action);
+ }
+ }
+ }
+ }
+
+ /**
+ * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+ if (actions != null) {
+ IContributionItem[] items = manager.getItems();
+ for (int i = 0; i < items.length; i++) {
+ // Look into SubContributionItems
+ //
+ IContributionItem contributionItem = items[i];
+ while (contributionItem instanceof SubContributionItem) {
+ contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+ }
+
+ // Delete the ActionContributionItems with matching action.
+ //
+ if (contributionItem instanceof ActionContributionItem) {
+ IAction action = ((ActionContributionItem)contributionItem).getAction();
+ if (actions.contains(action)) {
+ manager.remove(contributionItem);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This populates the pop-up menu before it appears.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void menuAboutToShow(IMenuManager menuManager) {
+ super.menuAboutToShow(menuManager);
+ MenuManager submenuManager = null;
+
+ submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ populateManager(submenuManager, createChildActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+
+ submenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ populateManager(submenuManager, createSiblingActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+ }
+
+ /**
+ * This inserts global actions before the "additions-end" separator.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void addGlobalActions(IMenuManager menuManager) {
+ menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+ menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+ refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+ super.addGlobalActions(menuManager);
+ }
+
+ /**
+ * This ensures that a delete action will clean up all references to deleted objects.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean removeAllReferencesOnDelete() {
+ return true;
+ }
+
+} \ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java
new file mode 100644
index 00000000000..847da98f605
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java
@@ -0,0 +1,1819 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.custom.CTabFolder;
+
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+
+import org.eclipse.swt.graphics.Point;
+
+import org.eclipse.swt.layout.FillLayout;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+
+import org.eclipse.ui.dialogs.SaveAsDialog;
+
+import org.eclipse.ui.ide.IGotoMarker;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;
+
+import org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+
+/**
+ * This is an example of a Constraints model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintsEditor
+ 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 -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected AdapterFactoryEditingDomain editingDomain;
+
+ /**
+ * This is the one adapter factory used for providing views of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ComposedAdapterFactory adapterFactory;
+
+ /**
+ * This is the content outline page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IContentOutlinePage contentOutlinePage;
+
+ /**
+ * This is a kludge...
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IStatusLineManager contentOutlineStatusLineManager;
+
+ /**
+ * This is the content outline page's viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer contentOutlineViewer;
+
+ /**
+ * This is the property sheet page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected PropertySheetPage propertySheetPage;
+
+ /**
+ * This is the viewer that shadows the selection in the content outline.
+ * The parent relation must be correctly defined for this to work.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer selectionViewer;
+
+ /**
+ * This inverts the roll of parent and child in the content provider and show parents as a tree.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer parentViewer;
+
+ /**
+ * This shows how a tree view works.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer treeViewer;
+
+ /**
+ * This shows how a list view works.
+ * A list viewer doesn't support icons.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ListViewer listViewer;
+
+ /**
+ * This shows how a table view works.
+ * A table can be used as a list with icons.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TableViewer tableViewer;
+
+ /**
+ * This shows how a tree view with columns works.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TreeViewer treeViewerWithColumns;
+
+ /**
+ * This keeps track of the active viewer pane, in the book.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ViewerPane currentViewerPane;
+
+ /**
+ * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Viewer currentViewer;
+
+ /**
+ * This listens to which ever viewer is active.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelectionChangedListener selectionChangedListener;
+
+ /**
+ * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+ /**
+ * This keeps track of the selection of the editor as a whole.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+ /**
+ * The MarkerHelper is responsible for creating workspace resource markers presented
+ * in Eclipse's Problems View.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+ /**
+ * This listens for when the outline becomes active
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IPartListener partListener =
+ new IPartListener() {
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(ConstraintsEditor.this);
+
+ setCurrentViewer(contentOutlineViewer);
+ }
+ }
+ else if (p instanceof PropertySheet) {
+ if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
+ getActionBarContributor().setActiveEditor(ConstraintsEditor.this);
+ handleActivate();
+ }
+ }
+ else if (p == ConstraintsEditor.this) {
+ handleActivate();
+ }
+ }
+ 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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+ /**
+ * Resources that have been changed since last activation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+ /**
+ * Resources that have been saved.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+ /**
+ * Map to store the diagnostic associated with a resource.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+ /**
+ * Controls whether the problem indication should be updated.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean updateProblemIndication = true;
+
+ /**
+ * Adapter used to update the problem indication when resources are demanded loaded.
+ * <!-- begin-user-doc -->
+ * <!-- 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);
+ }
+
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
+ }
+ break;
+ }
+ }
+ }
+ else {
+ super.notifyChanged(notification);
+ }
+ }
+
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
+
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ }
+ };
+
+ /**
+ * This listens for workspace changes.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @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);
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
+ }
+
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
+ }
+ }
+
+ 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(ConstraintsEditor.this, false);
+ }
+ }
+ });
+ }
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == ConstraintsEditor.this) {
+ handleActivate();
+ }
+ }
+ });
+ }
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
+
+ /**
+ * Handles activation of the editor or it's associated views.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void handleActivate() {
+ // Recompute the read only state.
+ //
+ if (editingDomain.getResourceToReadOnlyMap() != null) {
+ editingDomain.getResourceToReadOnlyMap().clear();
+
+ // Refresh any actions that may become enabled or disabled.
+ //
+ setSelection(getSelection());
+ }
+
+ if (!removedResources.isEmpty()) {
+ if (handleDirtyConflict()) {
+ getSite().getPage().closeEditor(ConstraintsEditor.this, false);
+ }
+ else {
+ removedResources.clear();
+ changedResources.clear();
+ savedResources.clear();
+ }
+ }
+ else if (!changedResources.isEmpty()) {
+ changedResources.removeAll(savedResources);
+ handleChangedResources();
+ changedResources.clear();
+ savedResources.clear();
+ }
+ }
+
+ /**
+ * Handles what to do with changed resources on activation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void handleChangedResources() {
+ if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+ if (isDirty()) {
+ changedResources.addAll(editingDomain.getResourceSet().getResources());
+ }
+ editingDomain.getCommandStack().flush();
+
+ updateProblemIndication = false;
+ for (Resource resource : changedResources) {
+ if (resource.isLoaded()) {
+ resource.unload();
+ try {
+ resource.load(Collections.EMPTY_MAP);
+ }
+ catch (IOException exception) {
+ if (!resourceToDiagnosticMap.containsKey(resource)) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ }
+ }
+ }
+
+ if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+ setSelection(StructuredSelection.EMPTY);
+ }
+
+ updateProblemIndication = true;
+ updateProblemIndication();
+ }
+ }
+
+ /**
+ * Updates the problems indication with the information described in the specified diagnostic.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void updateProblemIndication() {
+ if (updateProblemIndication) {
+ BasicDiagnostic diagnostic =
+ new BasicDiagnostic
+ (Diagnostic.OK,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ null,
+ new Object [] { editingDomain.getResourceSet() });
+ for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+ if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+ diagnostic.add(childDiagnostic);
+ }
+ }
+
+ int lastEditorPage = getPageCount() - 1;
+ if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+ ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ setActivePage(lastEditorPage);
+ }
+ }
+ else if (diagnostic.getSeverity() != Diagnostic.OK) {
+ ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+ problemEditorPart.setDiagnostic(diagnostic);
+ problemEditorPart.setMarkerHelper(markerHelper);
+ try {
+ addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+ setPageText(lastEditorPage, problemEditorPart.getPartName());
+ setActivePage(lastEditorPage);
+ showTabs();
+ }
+ catch (PartInitException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+
+ if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+ markerHelper.deleteMarkers(editingDomain.getResourceSet());
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ try {
+ markerHelper.createMarkers(diagnostic);
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Shows a dialog that asks if conflicting changes should be discarded.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean handleDirtyConflict() {
+ return
+ MessageDialog.openQuestion
+ (getSite().getShell(),
+ getString("_UI_FileConflict_label"),
+ getString("_WARN_FileConflict"));
+ }
+
+ /**
+ * This creates a model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsEditor() {
+ super();
+ initializeEditingDomain();
+ }
+
+ /**
+ * This sets up the editing domain for the model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void initializeEditingDomain() {
+ // Create an adapter factory that yields item providers.
+ //
+ adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+ // Create the command stack that will notify this editor as commands are executed.
+ //
+ BasicCommandStack commandStack = new BasicCommandStack();
+
+ // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+ //
+ commandStack.addCommandStackListener
+ (new CommandStackListener() {
+ 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());
+ }
+ if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+ propertySheetPage.refresh();
+ }
+ }
+ });
+ }
+ });
+
+ // Create the editing domain with a special command stack.
+ //
+ editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+ }
+
+ /**
+ * This is here for the listener to be able to call it.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void firePropertyChange(int action) {
+ super.firePropertyChange(action);
+ }
+
+ /**
+ * This sets the selection into whichever viewer is active.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSelectionToViewer(Collection<?> collection) {
+ final Collection<?> theSelection = collection;
+ // 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);
+ }
+ }
+ };
+ getSite().getShell().getDisplay().asyncExec(runnable);
+ }
+ }
+
+ /**
+ * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+ * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+ * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object [] getElements(Object object) {
+ Object parent = super.getParent(object);
+ return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object [] getChildren(Object object) {
+ Object parent = super.getParent(object);
+ return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean hasChildren(Object object) {
+ Object parent = super.getParent(object);
+ return parent != null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getParent(Object object) {
+ return null;
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCurrentViewerPane(ViewerPane viewerPane) {
+ if (currentViewerPane != viewerPane) {
+ if (currentViewerPane != null) {
+ currentViewerPane.showFocus(false);
+ }
+ currentViewerPane = viewerPane;
+ }
+ setCurrentViewer(currentViewerPane.getViewer());
+ }
+
+ /**
+ * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+ * is the current one.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCurrentViewer(Viewer viewer) {
+ // If it is changing...
+ //
+ if (currentViewer != viewer) {
+ if (selectionChangedListener == null) {
+ // Create the listener on demand.
+ //
+ selectionChangedListener =
+ new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
+ }
+
+ // Stop listening to the old one.
+ //
+ if (currentViewer != null) {
+ currentViewer.removeSelectionChangedListener(selectionChangedListener);
+ }
+
+ // Start listening to the new one.
+ //
+ if (viewer != null) {
+ viewer.addSelectionChangedListener(selectionChangedListener);
+ }
+
+ // Remember it.
+ //
+ currentViewer = viewer;
+
+ // Set the editors selection based on the current viewer's selection.
+ //
+ setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+ }
+ }
+
+ /**
+ * This returns the viewer as required by the {@link IViewerProvider} interface.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Viewer getViewer() {
+ return currentViewer;
+ }
+
+ /**
+ * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void createContextMenuFor(StructuredViewer viewer) {
+ MenuManager contextMenu = new MenuManager("#PopUp");
+ contextMenu.add(new Separator("additions"));
+ contextMenu.setRemoveAllWhenShown(true);
+ contextMenu.addMenuListener(this);
+ Menu menu= contextMenu.createContextMenu(viewer.getControl());
+ viewer.getControl().setMenu(menu);
+ getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+ int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+ viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+ viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+ }
+
+ /**
+ * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createModel() {
+ URI resourceURI = EditUIUtil.getURI(getEditorInput());
+ Exception exception = null;
+ Resource resource = null;
+ try {
+ // Load the resource through the editing domain.
+ //
+ resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+ }
+ catch (Exception e) {
+ exception = e;
+ resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+ }
+
+ Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+ }
+
+ /**
+ * Returns a diagnostic describing the errors and warnings listed in the resource
+ * and the specified exception (if any).
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+ if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+ BasicDiagnostic basicDiagnostic =
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object [] { exception == null ? (Object)resource : exception });
+ basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+ return basicDiagnostic;
+ }
+ else if (exception != null) {
+ return
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.constraints.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object[] { exception });
+ }
+ else {
+ return Diagnostic.OK_INSTANCE;
+ }
+ }
+
+ /**
+ * This is the method used by the framework to install your own controls.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void createPages() {
+ // Creates the model from the editor input
+ //
+ createModel();
+
+ // Only creates the other pages if there is something that can be edited
+ //
+ if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+ // Create a page for the selection tree view.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ selectionViewer = (TreeViewer)viewerPane.getViewer();
+ selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+
+ selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ selectionViewer.setInput(editingDomain.getResourceSet());
+ selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ viewerPane.setTitle(editingDomain.getResourceSet());
+
+ new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+ createContextMenuFor(selectionViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+ }
+
+ // Create a page for the parent tree view.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ parentViewer = (TreeViewer)viewerPane.getViewer();
+ parentViewer.setAutoExpandLevel(30);
+ parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+ parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(parentViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_ParentPage_label"));
+ }
+
+ // This is the page for the list viewer
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new ListViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ listViewer = (ListViewer)viewerPane.getViewer();
+ listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(listViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_ListPage_label"));
+ }
+
+ // This is the page for the tree viewer
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ treeViewer = (TreeViewer)viewerPane.getViewer();
+ treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+ createContextMenuFor(treeViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TreePage_label"));
+ }
+
+ // This is the page for the table viewer.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TableViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+ tableViewer = (TableViewer)viewerPane.getViewer();
+
+ Table table = tableViewer.getTable();
+ TableLayout layout = new TableLayout();
+ table.setLayout(layout);
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+
+ TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+ layout.addColumnData(new ColumnWeightData(3, 100, true));
+ objectColumn.setText(getString("_UI_ObjectColumn_label"));
+ objectColumn.setResizable(true);
+
+ TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+ layout.addColumnData(new ColumnWeightData(2, 100, true));
+ selfColumn.setText(getString("_UI_SelfColumn_label"));
+ selfColumn.setResizable(true);
+
+ tableViewer.setColumnProperties(new String [] {"a", "b"});
+ tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(tableViewer);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TablePage_label"));
+ }
+
+ // This is the page for the table tree viewer.
+ //
+ {
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), ConstraintsEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
+ viewerPane.createControl(getContainer());
+
+ treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+ Tree tree = treeViewerWithColumns.getTree();
+ tree.setLayoutData(new FillLayout());
+ tree.setHeaderVisible(true);
+ tree.setLinesVisible(true);
+
+ TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+ objectColumn.setText(getString("_UI_ObjectColumn_label"));
+ objectColumn.setResizable(true);
+ objectColumn.setWidth(250);
+
+ TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+ selfColumn.setText(getString("_UI_SelfColumn_label"));
+ selfColumn.setResizable(true);
+ selfColumn.setWidth(200);
+
+ treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
+ treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+ createContextMenuFor(treeViewerWithColumns);
+ int pageIndex = addPage(viewerPane.getControl());
+ setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
+ }
+
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ 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;
+ }
+ }
+ });
+
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
+ }
+
+ /**
+ * If there is just one page in the multi-page editor part,
+ * this hides the single tab at the bottom.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void hideTabs() {
+ if (getPageCount() <= 1) {
+ setPageText(0, "");
+ if (getContainer() instanceof CTabFolder) {
+ ((CTabFolder)getContainer()).setTabHeight(1);
+ Point point = getContainer().getSize();
+ getContainer().setSize(point.x, point.y + 6);
+ }
+ }
+ }
+
+ /**
+ * If there is more than one page in the multi-page editor part,
+ * this shows the tabs at the bottom.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void showTabs() {
+ if (getPageCount() > 1) {
+ setPageText(0, getString("_UI_SelectionPage_label"));
+ if (getContainer() instanceof CTabFolder) {
+ ((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+ Point point = getContainer().getSize();
+ getContainer().setSize(point.x, point.y - 6);
+ }
+ }
+ }
+
+ /**
+ * This is used to track the active viewer.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void pageChange(int pageIndex) {
+ super.pageChange(pageIndex);
+
+ if (contentOutlinePage != null) {
+ handleContentOutlineSelection(contentOutlinePage.getSelection());
+ }
+ }
+
+ /**
+ * This is how the framework determines which interfaces we implement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
+ public Object getAdapter(Class key) {
+ if (key.equals(IContentOutlinePage.class)) {
+ return showOutlineView() ? getContentOutlinePage() : null;
+ }
+ else if (key.equals(IPropertySheetPage.class)) {
+ return getPropertySheetPage();
+ }
+ else if (key.equals(IGotoMarker.class)) {
+ return this;
+ }
+ else {
+ return super.getAdapter(key);
+ }
+ }
+
+ /**
+ * This accesses a cached version of the content outliner.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IContentOutlinePage getContentOutlinePage() {
+ if (contentOutlinePage == null) {
+ // The content outline is just a tree.
+ //
+ class MyContentOutlinePage extends ContentOutlinePage {
+ @Override
+ public void createControl(Composite parent) {
+ super.createControl(parent);
+ contentOutlineViewer = getTreeViewer();
+ contentOutlineViewer.addSelectionChangedListener(this);
+
+ // Set up the tree viewer.
+ //
+ contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+ // Make sure our popups work.
+ //
+ createContextMenuFor(contentOutlineViewer);
+
+ if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ }
+ }
+
+ @Override
+ public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+ super.makeContributions(menuManager, toolBarManager, statusLineManager);
+ contentOutlineStatusLineManager = statusLineManager;
+ }
+
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ }
+
+ contentOutlinePage = new MyContentOutlinePage();
+
+ // Listen to selection so that we can handle it is a special way.
+ //
+ contentOutlinePage.addSelectionChangedListener
+ (new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
+ }
+
+ return contentOutlinePage;
+ }
+
+ /**
+ * This accesses a cached version of the property sheet.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IPropertySheetPage getPropertySheetPage() {
+ if (propertySheetPage == null) {
+ propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ ConstraintsEditor.this.setSelectionToViewer(selection);
+ ConstraintsEditor.this.setFocus();
+ }
+
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
+ propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+ }
+
+ return propertySheetPage;
+ }
+
+ /**
+ * This deals with how we want selection in the outliner to affect the other views.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void handleContentOutlineSelection(ISelection selection) {
+ if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+ Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+ if (selectedElements.hasNext()) {
+ // Get the first selected element.
+ //
+ Object selectedElement = selectedElements.next();
+
+ // If it's the selection viewer, then we want it to select the same selection as this selection.
+ //
+ if (currentViewerPane.getViewer() == selectionViewer) {
+ ArrayList<Object> selectionList = new ArrayList<Object>();
+ selectionList.add(selectedElement);
+ while (selectedElements.hasNext()) {
+ selectionList.add(selectedElements.next());
+ }
+
+ // Set the selection to the widget.
+ //
+ selectionViewer.setSelection(new StructuredSelection(selectionList));
+ }
+ else {
+ // Set the input to the widget.
+ //
+ if (currentViewerPane.getViewer().getInput() != selectedElement) {
+ currentViewerPane.getViewer().setInput(selectedElement);
+ currentViewerPane.setTitle(selectedElement);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This is for implementing {@link IEditorPart} and simply tests the command stack.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isDirty() {
+ return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+ }
+
+ /**
+ * This is for implementing {@link IEditorPart} and simply saves the model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void doSave(IProgressMonitor progressMonitor) {
+ // Save only resources that have actually changed.
+ //
+ final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+
+ // Do the work within an operation because this is a long running activity that modifies the workbench.
+ //
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ // This is the method that gets invoked when the operation runs.
+ //
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
+ //
+ boolean first = true;
+ 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);
+ }
+ }
+ catch (Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ first = false;
+ }
+ }
+ }
+ };
+
+ updateProblemIndication = false;
+ try {
+ // This runs the options, and shows progress.
+ //
+ new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+ // Refresh the necessary state.
+ //
+ ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+ firePropertyChange(IEditorPart.PROP_DIRTY);
+ }
+ catch (Exception exception) {
+ // Something went wrong that shouldn't.
+ //
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ updateProblemIndication = true;
+ updateProblemIndication();
+ }
+
+ /**
+ * This returns whether something has been persisted to the URI of the specified resource.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean isPersisted(Resource resource) {
+ boolean result = false;
+ try {
+ InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+ if (stream != null) {
+ result = true;
+ stream.close();
+ }
+ }
+ catch (IOException e) {
+ // Ignore
+ }
+ return result;
+ }
+
+ /**
+ * This always returns true because it is not currently supported.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean isSaveAsAllowed() {
+ return true;
+ }
+
+ /**
+ * This also changes the editor's input.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void doSaveAs() {
+ SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+ saveAsDialog.open();
+ IPath path = saveAsDialog.getResult();
+ if (path != null) {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (file != null) {
+ doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void doSaveAs(URI uri, IEditorInput editorInput) {
+ (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+ setInputWithNotify(editorInput);
+ setPartName(editorInput.getName());
+ IProgressMonitor progressMonitor =
+ getActionBars().getStatusLineManager() != null ?
+ getActionBars().getStatusLineManager().getProgressMonitor() :
+ new NullProgressMonitor();
+ doSave(progressMonitor);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void gotoMarker(IMarker marker) {
+ try {
+ if (marker.getType().equals(EValidator.MARKER)) {
+ String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+ if (uriAttribute != null) {
+ URI uri = URI.createURI(uriAttribute);
+ EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+ if (eObject != null) {
+ setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+ }
+ }
+ }
+ }
+ catch (CoreException exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+
+ /**
+ * This is called during startup.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void init(IEditorSite site, IEditorInput editorInput) {
+ setSite(site);
+ setInputWithNotify(editorInput);
+ setPartName(editorInput.getName());
+ site.setSelectionProvider(this);
+ site.getPage().addPartListener(partListener);
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setFocus() {
+ if (currentViewerPane != null) {
+ currentViewerPane.setFocus();
+ }
+ else {
+ getControl(getActivePage()).setFocus();
+ }
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.add(listener);
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.remove(listener);
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ISelection getSelection() {
+ return editorSelection;
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+ * Calling this result will notify the listeners.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSelection(ISelection selection) {
+ editorSelection = selection;
+
+ for (ISelectionChangedListener listener : selectionChangedListeners) {
+ listener.selectionChanged(new SelectionChangedEvent(this, selection));
+ }
+ setStatusLineManager(selection);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setStatusLineManager(ISelection selection) {
+ IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+ contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+ if (statusLineManager != null) {
+ if (selection instanceof IStructuredSelection) {
+ Collection<?> collection = ((IStructuredSelection)selection).toList();
+ switch (collection.size()) {
+ case 0: {
+ statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+ break;
+ }
+ case 1: {
+ String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+ statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+ break;
+ }
+ default: {
+ statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+ break;
+ }
+ }
+ }
+ else {
+ statusLineManager.setMessage("");
+ }
+ }
+ }
+
+ /**
+ * This looks up a string in the plugin's plugin.properties file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static String getString(String key) {
+ return ConstraintsEditorPlugin.INSTANCE.getString(key);
+ }
+
+ /**
+ * This looks up a string in plugin.properties, making a substitution.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static String getString(String key, Object s1) {
+ return ConstraintsEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void menuAboutToShow(IMenuManager menuManager) {
+ ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EditingDomainActionBarContributor getActionBarContributor() {
+ return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IActionBars getActionBars() {
+ return getActionBarContributor().getActionBars();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public AdapterFactory getAdapterFactory() {
+ return adapterFactory;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void dispose() {
+ updateProblemIndication = false;
+
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+ getSite().getPage().removePartListener(partListener);
+
+ adapterFactory.dispose();
+
+ if (getActionBarContributor().getActiveEditor() == this) {
+ getActionBarContributor().setActiveEditor(null);
+ }
+
+ if (propertySheetPage != null) {
+ propertySheetPage.dispose();
+ }
+
+ if (contentOutlinePage != null) {
+ contentOutlinePage.dispose();
+ }
+
+ super.dispose();
+ }
+
+ /**
+ * Returns whether the outline view should be presented to the user.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean showOutlineView() {
+ return true;
+ }
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java
new file mode 100644
index 00000000000..27f88b80960
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java
@@ -0,0 +1,95 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.presentation;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Constraints editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class ConstraintsEditorPlugin extends EMFPlugin {
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final ConstraintsEditorPlugin INSTANCE = new ConstraintsEditorPlugin();
+
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static Implementation plugin;
+
+ /**
+ * Create the instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsEditorPlugin() {
+ super
+ (new ResourceLocator [] {
+ });
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ @Override
+ public ResourceLocator getPluginResourceLocator() {
+ return plugin;
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ public static Implementation getPlugin() {
+ return plugin;
+ }
+
+ /**
+ * The actual implementation of the Eclipse <b>Plugin</b>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static class Implementation extends EclipseUIPlugin {
+ /**
+ * Creates an instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Implementation() {
+ super();
+
+ // Remember the static instance.
+ //
+ plugin = this;
+ }
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java
new file mode 100644
index 00000000000..c5af0dbf32b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java
@@ -0,0 +1,631 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.CommonPlugin;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstraintsModelWizard extends Wizard implements INewWizard {
+ /**
+ * The supported extensions for created files.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final List<String> FILE_EXTENSIONS =
+ Collections.unmodifiableList(Arrays.asList(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").split("\\s*,\\s*")));
+
+ /**
+ * A formatted list of supported file extensions, suitable for display.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String FORMATTED_FILE_EXTENSIONS =
+ ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+ /**
+ * This caches an instance of the model package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintsPackage constraintsPackage = ConstraintsPackage.eINSTANCE;
+
+ /**
+ * This caches an instance of the model factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintsFactory constraintsFactory = constraintsPackage.getConstraintsFactory();
+
+ /**
+ * This is the file creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintsModelWizardNewFileCreationPage newFileCreationPage;
+
+ /**
+ * This is the initial object creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstraintsModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+ /**
+ * Remember the selection during initialization for populating the default container.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IStructuredSelection selection;
+
+ /**
+ * Remember the workbench during initialization.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IWorkbench workbench;
+
+ /**
+ * Caches the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected List<String> initialObjectNames;
+
+ /**
+ * This just records the information.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ this.workbench = workbench;
+ this.selection = selection;
+ setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+ setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewConstraints")));
+ }
+
+ /**
+ * Returns the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getInitialObjectNames() {
+ if (initialObjectNames == null) {
+ initialObjectNames = new ArrayList<String>();
+ for (EClassifier eClassifier : constraintsPackage.getEClassifiers()) {
+ if (eClassifier instanceof EClass) {
+ EClass eClass = (EClass)eClassifier;
+ if (!eClass.isAbstract()) {
+ initialObjectNames.add(eClass.getName());
+ }
+ }
+ }
+ Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+ }
+ return initialObjectNames;
+ }
+
+ /**
+ * Create a new model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EObject createInitialModel() {
+ EClass eClass = (EClass)constraintsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+ EObject rootObject = constraintsFactory.create(eClass);
+ return rootObject;
+ }
+
+ /**
+ * Do the work after everything is specified.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean performFinish() {
+ try {
+ // Remember the file.
+ //
+ final IFile modelFile = getModelFile();
+
+ // Do the work within an operation.
+ //
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor) {
+ try {
+ // Create a resource set
+ //
+ ResourceSet resourceSet = new ResourceSetImpl();
+
+ // Get the URI of the model file.
+ //
+ URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+ // Create a resource for this file.
+ //
+ Resource resource = resourceSet.createResource(fileURI);
+
+ // Add the initial model object to the contents.
+ //
+ EObject rootObject = createInitialModel();
+ if (rootObject != null) {
+ resource.getContents().add(rootObject);
+ }
+
+ // Save the contents of the resource to the file system.
+ //
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+ resource.save(options);
+ }
+ catch (Exception exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ }
+ finally {
+ progressMonitor.done();
+ }
+ }
+ };
+
+ getContainer().run(false, false, operation);
+
+ // Select the new file resource in the current view.
+ //
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ IWorkbenchPage page = workbenchWindow.getActivePage();
+ final IWorkbenchPart activePart = page.getActivePart();
+ if (activePart instanceof ISetSelectionTarget) {
+ final ISelection targetSelection = new StructuredSelection(modelFile);
+ getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+ }
+ });
+ }
+
+ // Open an editor on the new file.
+ //
+ try {
+ page.openEditor
+ (new FileEditorInput(modelFile),
+ workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ }
+ catch (PartInitException exception) {
+ MessageDialog.openError(workbenchWindow.getShell(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception exception) {
+ ConstraintsEditorPlugin.INSTANCE.log(exception);
+ return false;
+ }
+ }
+
+ /**
+ * This is the one page of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ConstraintsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+ super(pageId, selection);
+ }
+
+ /**
+ * The framework calls this to see if the file is correct.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean validatePage() {
+ if (super.validatePage()) {
+ String extension = new Path(getFileName()).getFileExtension();
+ if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+ String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+ setErrorMessage(ConstraintsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+ return false;
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+ }
+ }
+
+ /**
+ * This is the page where the type of object to create is selected.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ConstraintsModelWizardInitialObjectCreationPage extends WizardPage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo initialObjectField;
+
+ /**
+ * @generated
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ */
+ protected List<String> encodings;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo encodingField;
+
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ConstraintsModelWizardInitialObjectCreationPage(String pageId) {
+ super(pageId);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE); {
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ layout.verticalSpacing = 12;
+ composite.setLayout(layout);
+
+ GridData data = new GridData();
+ data.verticalAlignment = GridData.FILL;
+ data.grabExcessVerticalSpace = true;
+ data.horizontalAlignment = GridData.FILL;
+ composite.setLayoutData(data);
+ }
+
+ Label containerLabel = new Label(composite, SWT.LEFT);
+ {
+ containerLabel.setText(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ containerLabel.setLayoutData(data);
+ }
+
+ initialObjectField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ initialObjectField.setLayoutData(data);
+ }
+
+ for (String objectName : getInitialObjectNames()) {
+ initialObjectField.add(getLabel(objectName));
+ }
+
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.select(0);
+ }
+ initialObjectField.addModifyListener(validator);
+
+ Label encodingLabel = new Label(composite, SWT.LEFT);
+ {
+ encodingLabel.setText(ConstraintsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ encodingLabel.setLayoutData(data);
+ }
+ encodingField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ encodingField.setLayoutData(data);
+ }
+
+ for (String encoding : getEncodings()) {
+ encodingField.add(encoding);
+ }
+
+ encodingField.select(0);
+ encodingField.addModifyListener(validator);
+
+ setPageComplete(validatePage());
+ setControl(composite);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ModifyListener validator =
+ new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ setPageComplete(validatePage());
+ }
+ };
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean validatePage() {
+ return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setVisible(boolean visible) {
+ super.setVisible(visible);
+ if (visible) {
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.clearSelection();
+ encodingField.setFocus();
+ }
+ else {
+ encodingField.clearSelection();
+ initialObjectField.setFocus();
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getInitialObjectName() {
+ String label = initialObjectField.getText();
+
+ for (String name : getInitialObjectNames()) {
+ if (getLabel(name).equals(label)) {
+ return name;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getEncoding() {
+ return encodingField.getText();
+ }
+
+ /**
+ * Returns the label for the specified type name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected String getLabel(String typeName) {
+ try {
+ return ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+ }
+ catch(MissingResourceException mre) {
+ ConstraintsEditorPlugin.INSTANCE.log(mre);
+ }
+ return typeName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getEncodings() {
+ if (encodings == null) {
+ encodings = new ArrayList<String>();
+ for (StringTokenizer stringTokenizer = new StringTokenizer(ConstraintsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+ encodings.add(stringTokenizer.nextToken());
+ }
+ }
+ return encodings;
+ }
+ }
+
+ /**
+ * The framework calls this to create the contents of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void addPages() {
+ // Create a page, set the title, and the initial model file name.
+ //
+ newFileCreationPage = new ConstraintsModelWizardNewFileCreationPage("Whatever", selection);
+ newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));
+ newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_description"));
+ newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+ addPage(newFileCreationPage);
+
+ // Try and get the resource selection to determine a current directory for the file dialog.
+ //
+ if (selection != null && !selection.isEmpty()) {
+ // Get the resource...
+ //
+ Object selectedElement = selection.iterator().next();
+ if (selectedElement instanceof IResource) {
+ // Get the resource parent, if its a file.
+ //
+ IResource selectedResource = (IResource)selectedElement;
+ if (selectedResource.getType() == IResource.FILE) {
+ selectedResource = selectedResource.getParent();
+ }
+
+ // This gives us a directory...
+ //
+ if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+ // Set this for the container.
+ //
+ newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+ // Make up a unique new name here.
+ //
+ String defaultModelBaseFilename = ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase");
+ String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+ String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+ for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+ modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+ }
+ newFileCreationPage.setFileName(modelFilename);
+ }
+ }
+ }
+ initialObjectCreationPage = new ConstraintsModelWizardInitialObjectCreationPage("Whatever2");
+ initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));
+ initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+ addPage(initialObjectCreationPage);
+ }
+
+ /**
+ * Get the file from the page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return newFileCreationPage.getModelFile();
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.newchild/.project b/sandbox/org.eclipse.papyrus.newchild/.project
index ea81bd95cde..b348764ce97 100644
--- a/sandbox/org.eclipse.papyrus.newchild/.project
+++ b/sandbox/org.eclipse.papyrus.newchild/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.newchild</name>
+ <name>org.eclipse.papyrus.infra.emf.newchild</name>
<comment></comment>
<projects>
</projects>
diff --git a/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
index 2c0dc059b07..04b22c95a1f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.newchild;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.newchild;singleton:=true
Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.newchild.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.emf.newchild.Activator
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.papyrus.newchild,
- org.eclipse.papyrus.newchild.impl,
- org.eclipse.papyrus.newchild.runtime,
- org.eclipse.papyrus.newchild.util
+Export-Package: org.eclipse.papyrus.infra.emf.newchild,
+ org.eclipse.papyrus.infra.emf.newchild.impl,
+ org.eclipse.papyrus.infra.emf.newchild.runtime,
+ org.eclipse.papyrus.infra.emf.newchild.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.uml2.uml;visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.emf.edit.ui;bundle-version="2.7.0",
- org.eclipse.papyrus.constraints;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.constraints;bundle-version="0.9.0",
org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0",
org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0",
org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
diff --git a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
index 447b925effd..493eff5c51c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
+++ b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
@@ -10,7 +10,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="newChildPolicies" upperBound="-1"
eType="#//ncpolicy/NewChildPolicySet" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MenuRoot" eSuperTypes="#//MenuContainer platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
+ <eClassifiers xsi:type="ecore:EClass" name="MenuRoot" eSuperTypes="#//MenuContainer platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
<eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
eType="#//MenuGroup" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
@@ -64,7 +64,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
eType="#//MenuGroup" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NewChildPolicySet" eSuperTypes="platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
+ <eClassifiers xsi:type="ecore:EClass" name="NewChildPolicySet" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="policies" upperBound="-1"
diff --git a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
index 8ab95dc141e..70359b9588a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
+++ b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.newchild/src-gen"
- editDirectory="/org.eclipse.papyrus.newchild.edit/src-gen" editorDirectory="/org.eclipse.papyrus.newchild.editor/src-gen"
- modelPluginID="org.eclipse.papyrus.newchild" modelName="NewChild" testsDirectory="/org.eclipse.papyrus.newchild.tests/src-gen"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.emf.newchild/src-gen"
+ editDirectory="/org.eclipse.papyrus.infra.emf.newchild.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.emf.newchild.editor/src-gen"
+ modelPluginID="org.eclipse.papyrus.infra.emf.newchild" modelName="NewChild" testsDirectory="/org.eclipse.papyrus.infra.emf.newchild.tests/src-gen"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+ usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//types">
<foreignModel>NewChild.ecore</foreignModel>
- <genPackages prefix="Newchild" basePackage="org.eclipse.papyrus" resource="XML"
+ <genPackages prefix="Newchild" basePackage="org.eclipse.papyrus.infra.emf" resource="XML"
disposableProviderFactory="true" ecorePackage="NewChild.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="NewChild.ecore#//MenuPosition">
<genEnumLiterals ecoreEnumLiteral="NewChild.ecore#//MenuPosition/top"/>
@@ -44,7 +43,7 @@
<genClasses ecoreClass="NewChild.ecore#//CustomFiller">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute NewChild.ecore#//CustomFiller/className"/>
</genClasses>
- <nestedGenPackages prefix="Ncpolicy" basePackage="org.eclipse.papyrus.newchild"
+ <nestedGenPackages prefix="Ncpolicy" basePackage="org.eclipse.papyrus.infra.emf.newchild"
resource="XML" disposableProviderFactory="true" ecorePackage="NewChild.ecore#//ncpolicy">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="NewChild.ecore#//ncpolicy/CreateIn">
<genEnumLiterals ecoreEnumLiteral="NewChild.ecore#//ncpolicy/CreateIn/self"/>
diff --git a/sandbox/org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi b/sandbox/org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi
index 8aed1ec2e85..0590c6f6003 100644
--- a/sandbox/org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi
+++ b/sandbox/org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi
@@ -64,7 +64,7 @@
xsi:type="ncpolicy:FilterPolicy"
name="removeConstraintDescriptors">
<eClasses
- href="platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.ecore#//ConstraintDescriptor"/>
+ href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//ConstraintDescriptor"/>
</policies>
</newChildPolicies>
</newchild:NewchildConfiguration>
diff --git a/sandbox/org.eclipse.papyrus.newchild/plugin.xml b/sandbox/org.eclipse.papyrus.newchild/plugin.xml
index 375c551f15a..597e6a6d8b2 100644
--- a/sandbox/org.eclipse.papyrus.newchild/plugin.xml
+++ b/sandbox/org.eclipse.papyrus.newchild/plugin.xml
@@ -4,14 +4,14 @@
<extension
point="org.eclipse.emf.ecore.generated_package">
<package
- class="org.eclipse.papyrus.newchild.NewchildPackage"
+ class="org.eclipse.papyrus.infra.emf.newchild.NewchildPackage"
uri="http://www.eclipse.org/papyrus/newchild">
</package>
</extension>
<extension
point="org.eclipse.emf.ecore.generated_package">
<package
- class="org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage"
+ class="org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage"
uri="http://www.eclipse.org/papyrus/newchild/ncpolicy">
</package>
</extension>
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/CustomFiller.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/CustomFiller.java
index d7874f7e66b..8b128b57ac5 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/CustomFiller.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/CustomFiller.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
/**
@@ -15,11 +15,11 @@ package org.eclipse.papyrus.newchild;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getCustomFiller()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getCustomFiller()
* @model
* @generated
*/
@@ -34,14 +34,14 @@ public interface CustomFiller extends MenuItem {
* <!-- end-user-doc -->
* @return the value of the '<em>Class Name</em>' attribute.
* @see #setClassName(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getCustomFiller_ClassName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getCustomFiller_ClassName()
* @model required="true"
* @generated
*/
String getClassName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Class Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Menu.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Menu.java
index 68c393477d5..bf32157b99a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Menu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Menu.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
/**
@@ -15,12 +15,12 @@ package org.eclipse.papyrus.newchild;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu()
* @model
* @generated
*/
@@ -35,14 +35,14 @@ public interface Menu extends MenuContainer, MenuItem {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu_Name()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -61,14 +61,14 @@ public interface Menu extends MenuContainer, MenuItem {
* <!-- end-user-doc -->
* @return the value of the '<em>Icon</em>' attribute.
* @see #setIcon(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu_Icon()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu_Icon()
* @model
* @generated
*/
String getIcon();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Icon</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuAction.java
index 45506ac3d95..60bc05ea88d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuAction.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
@@ -16,11 +16,11 @@ import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuAction()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuAction()
* @model
* @generated
*/
@@ -35,14 +35,14 @@ public interface MenuAction extends MenuItem {
* <!-- end-user-doc -->
* @return the value of the '<em>Element Type</em>' reference.
* @see #setElementType(ExtendedElementTypeConfiguration)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuAction_ElementType()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuAction_ElementType()
* @model required="true"
* @generated
*/
ExtendedElementTypeConfiguration getElementType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Element Type</em>' reference.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuContainer.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuContainer.java
index b1d201726cd..7426628457b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuContainer.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuContainer.java
@@ -4,10 +4,9 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
@@ -18,18 +17,18 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.MenuContainer#getSubmenus <em>Submenus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus <em>Submenus</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuContainer()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuContainer()
* @model abstract="true"
* @generated
*/
public interface MenuContainer extends EObject {
/**
* Returns the value of the '<em><b>Submenus</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuItem}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuItem}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Submenus</em>' containment reference list isn't clear,
@@ -37,7 +36,7 @@ public interface MenuContainer extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Submenus</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuContainer_Submenus()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuContainer_Submenus()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuGroup.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuGroup.java
index 68e64110aaa..6399e0cc69f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuGroup.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuGroup.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
/**
@@ -15,13 +15,13 @@ package org.eclipse.papyrus.newchild;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup()
* @model
* @generated
*/
@@ -36,14 +36,14 @@ public interface MenuGroup extends MenuContainer {
* <!-- end-user-doc -->
* @return the value of the '<em>Before</em>' attribute.
* @see #setBefore(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_Before()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_Before()
* @model
* @generated
*/
String getBefore();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Before</em>' attribute.
@@ -62,14 +62,14 @@ public interface MenuGroup extends MenuContainer {
* <!-- end-user-doc -->
* @return the value of the '<em>After</em>' attribute.
* @see #setAfter(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_After()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_After()
* @model
* @generated
*/
String getAfter();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>After</em>' attribute.
@@ -81,7 +81,7 @@ public interface MenuGroup extends MenuContainer {
/**
* Returns the value of the '<em><b>Absolute Position</b></em>' attribute.
* The default value is <code>"top"</code>.
- * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.MenuPosition}.
+ * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Absolute Position</em>' attribute isn't clear,
@@ -89,20 +89,20 @@ public interface MenuGroup extends MenuContainer {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Absolute Position</em>' attribute.
- * @see org.eclipse.papyrus.newchild.MenuPosition
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
* @see #setAbsolutePosition(MenuPosition)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_AbsolutePosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_AbsolutePosition()
* @model default="top"
* @generated
*/
MenuPosition getAbsolutePosition();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Absolute Position</em>' attribute.
- * @see org.eclipse.papyrus.newchild.MenuPosition
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
* @see #getAbsolutePosition()
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuItem.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuItem.java
index 4476eec4144..db237989dea 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuItem.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuItem.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.ecore.EObject;
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuItem()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuItem()
* @model abstract="true"
* @generated
*/
@@ -35,14 +35,14 @@ public interface MenuItem extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Id</em>' attribute.
* @see #setId(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuItem_Id()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuItem_Id()
* @model
* @generated
*/
String getId();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Id</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuPosition.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuPosition.java
index e90b8309c2e..9c91f068f05 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuPosition.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuPosition.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import java.util.Arrays;
import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Menu Position</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuPosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuPosition()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuRoot.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuRoot.java
index 570ba2c6ffd..d21d999481b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuRoot.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuRoot.java
@@ -4,11 +4,10 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
/**
* <!-- begin-user-doc -->
@@ -18,19 +17,19 @@ import org.eclipse.papyrus.constraints.DisplayUnit;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.MenuRoot#getGroups <em>Groups</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot()
* @model
* @generated
*/
public interface MenuRoot extends MenuContainer, DisplayUnit {
/**
* Returns the value of the '<em><b>Groups</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuGroup}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
@@ -38,7 +37,7 @@ public interface MenuRoot extends MenuContainer, DisplayUnit {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Groups</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot_Groups()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot_Groups()
* @model containment="true"
* @generated
*/
@@ -54,14 +53,14 @@ public interface MenuRoot extends MenuContainer, DisplayUnit {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot_Name()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildConfiguration.java
index a68783266b7..1edc8223792 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildConfiguration.java
@@ -4,13 +4,11 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
/**
* <!-- begin-user-doc -->
@@ -20,20 +18,20 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots <em>Roots</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots <em>Roots</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration()
* @model
* @generated
*/
public interface NewchildConfiguration extends EObject {
/**
* Returns the value of the '<em><b>Roots</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuRoot}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Roots</em>' containment reference list isn't clear,
@@ -41,7 +39,7 @@ public interface NewchildConfiguration extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Roots</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_Roots()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_Roots()
* @model containment="true"
* @generated
*/
@@ -57,14 +55,14 @@ public interface NewchildConfiguration extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_Name()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -75,7 +73,7 @@ public interface NewchildConfiguration extends EObject {
/**
* Returns the value of the '<em><b>New Child Policies</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>New Child Policies</em>' containment reference list isn't clear,
@@ -83,7 +81,7 @@ public interface NewchildConfiguration extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>New Child Policies</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_NewChildPolicies()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_NewChildPolicies()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildFactory.java
index 977459890bf..0cd266ee3f3 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
* @generated
*/
public interface NewchildFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface NewchildFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- NewchildFactory eINSTANCE = org.eclipse.papyrus.newchild.impl.NewchildFactoryImpl.init();
+ NewchildFactory eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.impl.NewchildFactoryImpl.init();
/**
* Returns a new object of class '<em>Configuration</em>'.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildPackage.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildPackage.java
index bea69675727..24bfbf1cc79 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildPackage.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildPackage.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildFactory
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildFactory
* @model kind="package"
* @generated
*/
@@ -58,14 +58,14 @@ public interface NewchildPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- NewchildPackage eINSTANCE = org.eclipse.papyrus.newchild.impl.NewchildPackageImpl.init();
+ NewchildPackage eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
* @generated
*/
int NEWCHILD_CONFIGURATION = 0;
@@ -107,11 +107,11 @@ public interface NewchildPackage extends EPackage {
int NEWCHILD_CONFIGURATION_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuContainerImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuContainer()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuContainer()
* @generated
*/
int MENU_CONTAINER = 3;
@@ -135,11 +135,11 @@ public interface NewchildPackage extends EPackage {
int MENU_CONTAINER_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuRootImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuRoot()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuRoot()
* @generated
*/
int MENU_ROOT = 1;
@@ -199,11 +199,11 @@ public interface NewchildPackage extends EPackage {
int MENU_ROOT_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 4;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuItemImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuItem()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuItem()
* @generated
*/
int MENU_ITEM = 2;
@@ -227,11 +227,11 @@ public interface NewchildPackage extends EPackage {
int MENU_ITEM_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuImpl <em>Menu</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl <em>Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenu()
* @generated
*/
int MENU = 4;
@@ -282,11 +282,11 @@ public interface NewchildPackage extends EPackage {
int MENU_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuActionImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuAction()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuAction()
* @generated
*/
int MENU_ACTION = 5;
@@ -319,11 +319,11 @@ public interface NewchildPackage extends EPackage {
int MENU_ACTION_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.SeparatorImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getSeparator()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getSeparator()
* @generated
*/
int SEPARATOR = 6;
@@ -347,11 +347,11 @@ public interface NewchildPackage extends EPackage {
int SEPARATOR_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuGroupImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuGroup()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuGroup()
* @generated
*/
int MENU_GROUP = 7;
@@ -402,11 +402,11 @@ public interface NewchildPackage extends EPackage {
int MENU_GROUP_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.CustomFillerImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getCustomFiller()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getCustomFiller()
* @generated
*/
int CUSTOM_FILLER = 8;
@@ -439,266 +439,266 @@ public interface NewchildPackage extends EPackage {
int CUSTOM_FILLER_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.MenuPosition
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuPosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuPosition()
* @generated
*/
int MENU_POSITION = 9;
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.NewchildConfiguration <em>Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration <em>Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Configuration</em>'.
- * @see org.eclipse.papyrus.newchild.NewchildConfiguration
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration
* @generated
*/
EClass getNewchildConfiguration();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots <em>Roots</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots <em>Roots</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Roots</em>'.
- * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots()
* @see #getNewchildConfiguration()
* @generated
*/
EReference getNewchildConfiguration_Roots();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName()
* @see #getNewchildConfiguration()
* @generated
*/
EAttribute getNewchildConfiguration_Name();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>New Child Policies</em>'.
- * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies()
* @see #getNewchildConfiguration()
* @generated
*/
EReference getNewchildConfiguration_NewChildPolicies();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuRoot <em>Menu Root</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot <em>Menu Root</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu Root</em>'.
- * @see org.eclipse.papyrus.newchild.MenuRoot
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot
* @generated
*/
EClass getMenuRoot();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.MenuRoot#getGroups <em>Groups</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups <em>Groups</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Groups</em>'.
- * @see org.eclipse.papyrus.newchild.MenuRoot#getGroups()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups()
* @see #getMenuRoot()
* @generated
*/
EReference getMenuRoot_Groups();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.newchild.MenuRoot#getName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName()
* @see #getMenuRoot()
* @generated
*/
EAttribute getMenuRoot_Name();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu Item</em>'.
- * @see org.eclipse.papyrus.newchild.MenuItem
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
* @generated
*/
EClass getMenuItem();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.papyrus.newchild.MenuItem#getId()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId()
* @see #getMenuItem()
* @generated
*/
EAttribute getMenuItem_Id();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu Container</em>'.
- * @see org.eclipse.papyrus.newchild.MenuContainer
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
* @generated
*/
EClass getMenuContainer();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.MenuContainer#getSubmenus <em>Submenus</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus <em>Submenus</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Submenus</em>'.
- * @see org.eclipse.papyrus.newchild.MenuContainer#getSubmenus()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus()
* @see #getMenuContainer()
* @generated
*/
EReference getMenuContainer_Submenus();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu</em>'.
- * @see org.eclipse.papyrus.newchild.Menu
+ * @see org.eclipse.papyrus.infra.emf.newchild.Menu
* @generated
*/
EClass getMenu();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.newchild.Menu#getName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.Menu#getName()
* @see #getMenu()
* @generated
*/
EAttribute getMenu_Name();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Icon</em>'.
- * @see org.eclipse.papyrus.newchild.Menu#getIcon()
+ * @see org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon()
* @see #getMenu()
* @generated
*/
EAttribute getMenu_Icon();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuAction <em>Menu Action</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction <em>Menu Action</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu Action</em>'.
- * @see org.eclipse.papyrus.newchild.MenuAction
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction
* @generated
*/
EClass getMenuAction();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Element Type</em>'.
- * @see org.eclipse.papyrus.newchild.MenuAction#getElementType()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType()
* @see #getMenuAction()
* @generated
*/
EReference getMenuAction_ElementType();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.Separator <em>Separator</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.Separator <em>Separator</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Separator</em>'.
- * @see org.eclipse.papyrus.newchild.Separator
+ * @see org.eclipse.papyrus.infra.emf.newchild.Separator
* @generated
*/
EClass getSeparator();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuGroup <em>Menu Group</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup <em>Menu Group</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu Group</em>'.
- * @see org.eclipse.papyrus.newchild.MenuGroup
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup
* @generated
*/
EClass getMenuGroup();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Before</em>'.
- * @see org.eclipse.papyrus.newchild.MenuGroup#getBefore()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore()
* @see #getMenuGroup()
* @generated
*/
EAttribute getMenuGroup_Before();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>After</em>'.
- * @see org.eclipse.papyrus.newchild.MenuGroup#getAfter()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter()
* @see #getMenuGroup()
* @generated
*/
EAttribute getMenuGroup_After();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Absolute Position</em>'.
- * @see org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition()
* @see #getMenuGroup()
* @generated
*/
EAttribute getMenuGroup_AbsolutePosition();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.CustomFiller <em>Custom Filler</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller <em>Custom Filler</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Custom Filler</em>'.
- * @see org.eclipse.papyrus.newchild.CustomFiller
+ * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller
* @generated
*/
EClass getCustomFiller();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Class Name</em>'.
- * @see org.eclipse.papyrus.newchild.CustomFiller#getClassName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName()
* @see #getCustomFiller()
* @generated
*/
EAttribute getCustomFiller_ClassName();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for enum '<em>Menu Position</em>'.
- * @see org.eclipse.papyrus.newchild.MenuPosition
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
* @generated
*/
EEnum getMenuPosition();
@@ -726,11 +726,11 @@ public interface NewchildPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
* @generated
*/
EClass NEWCHILD_CONFIGURATION = eINSTANCE.getNewchildConfiguration();
@@ -760,11 +760,11 @@ public interface NewchildPackage extends EPackage {
EReference NEWCHILD_CONFIGURATION__NEW_CHILD_POLICIES = eINSTANCE.getNewchildConfiguration_NewChildPolicies();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuRootImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuRoot()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuRoot()
* @generated
*/
EClass MENU_ROOT = eINSTANCE.getMenuRoot();
@@ -786,11 +786,11 @@ public interface NewchildPackage extends EPackage {
EAttribute MENU_ROOT__NAME = eINSTANCE.getMenuRoot_Name();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuItemImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuItem()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuItem()
* @generated
*/
EClass MENU_ITEM = eINSTANCE.getMenuItem();
@@ -804,11 +804,11 @@ public interface NewchildPackage extends EPackage {
EAttribute MENU_ITEM__ID = eINSTANCE.getMenuItem_Id();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuContainerImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuContainer()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuContainer()
* @generated
*/
EClass MENU_CONTAINER = eINSTANCE.getMenuContainer();
@@ -822,11 +822,11 @@ public interface NewchildPackage extends EPackage {
EReference MENU_CONTAINER__SUBMENUS = eINSTANCE.getMenuContainer_Submenus();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuImpl <em>Menu</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl <em>Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenu()
* @generated
*/
EClass MENU = eINSTANCE.getMenu();
@@ -848,11 +848,11 @@ public interface NewchildPackage extends EPackage {
EAttribute MENU__ICON = eINSTANCE.getMenu_Icon();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuActionImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuAction()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuAction()
* @generated
*/
EClass MENU_ACTION = eINSTANCE.getMenuAction();
@@ -866,21 +866,21 @@ public interface NewchildPackage extends EPackage {
EReference MENU_ACTION__ELEMENT_TYPE = eINSTANCE.getMenuAction_ElementType();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.SeparatorImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getSeparator()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getSeparator()
* @generated
*/
EClass SEPARATOR = eINSTANCE.getSeparator();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.MenuGroupImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuGroup()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuGroup()
* @generated
*/
EClass MENU_GROUP = eINSTANCE.getMenuGroup();
@@ -910,11 +910,11 @@ public interface NewchildPackage extends EPackage {
EAttribute MENU_GROUP__ABSOLUTE_POSITION = eINSTANCE.getMenuGroup_AbsolutePosition();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.impl.CustomFillerImpl
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getCustomFiller()
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getCustomFiller()
* @generated
*/
EClass CUSTOM_FILLER = eINSTANCE.getCustomFiller();
@@ -928,11 +928,11 @@ public interface NewchildPackage extends EPackage {
EAttribute CUSTOM_FILLER__CLASS_NAME = eINSTANCE.getCustomFiller_ClassName();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.MenuPosition
- * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuPosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
+ * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuPosition()
* @generated
*/
EEnum MENU_POSITION = eINSTANCE.getMenuPosition();
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Separator.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Separator.java
index 16daf1a5c7c..3f47ddf1dcb 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Separator.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Separator.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
/**
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.newchild;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getSeparator()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getSeparator()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/CustomFillerImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/CustomFillerImpl.java
index 3c4775aca7c..8cfc28c13e9 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/CustomFillerImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/CustomFillerImpl.java
@@ -4,16 +4,13 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.CustomFiller;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -22,7 +19,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl#getClassName <em>Class Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl#getClassName <em>Class Name</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuActionImpl.java
index e28f082fa17..a203aee2996 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuActionImpl.java
@@ -4,19 +4,16 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -25,7 +22,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl#getElementType <em>Element Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl#getElementType <em>Element Type</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuContainerImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuContainerImpl.java
index f522b62dd9f..16d5011d66f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuContainerImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuContainerImpl.java
@@ -4,25 +4,20 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -31,7 +26,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl#getSubmenus <em>Submenus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl#getSubmenus <em>Submenus</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuGroupImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuGroupImpl.java
index 20d852ca530..56e2846492b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuGroupImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuGroupImpl.java
@@ -4,17 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuPosition;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -23,9 +20,9 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getBefore <em>Before</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getAfter <em>After</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getAbsolutePosition <em>Absolute Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getBefore <em>Before</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getAfter <em>After</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getAbsolutePosition <em>Absolute Position</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuImpl.java
index e72d1ef268d..c92ceb2e4d7 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuImpl.java
@@ -4,17 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -23,9 +20,9 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getIcon <em>Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getIcon <em>Icon</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuItemImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuItemImpl.java
index 4294c6dfe47..c081acce712 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuItemImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuItemImpl.java
@@ -4,17 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -23,7 +20,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl#getId <em>Id</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuRootImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuRootImpl.java
index 7f299ab723f..753baf9d44b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuRootImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuRootImpl.java
@@ -4,31 +4,25 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -37,10 +31,10 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getConstraints <em>Constraints</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getGroups <em>Groups</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getName <em>Name</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildConfigurationImpl.java
index 8caa4e04d7e..bbe4f39a59e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildConfigurationImpl.java
@@ -4,29 +4,24 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.NewchildPackage;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
/**
* <!-- begin-user-doc -->
@@ -35,9 +30,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getRoots <em>Roots</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getNewChildPolicies <em>New Child Policies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getRoots <em>Roots</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getNewChildPolicies <em>New Child Policies</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildFactoryImpl.java
index 91aae0ae785..d2b1f8f6aae 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildFactoryImpl.java
@@ -4,18 +4,24 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildFactory;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildPackageImpl.java
index 461160ca1e8..0591570a678 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildPackageImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -12,29 +12,27 @@ import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildFactory;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl;
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.uml2.types.TypesPackage;
-import org.eclipse.papyrus.newchild.CustomFiller;
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.MenuPosition;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.NewchildFactory;
-import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.Separator;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl;
/**
* <!-- begin-user-doc -->
@@ -124,7 +122,7 @@ public class NewchildPackageImpl extends EPackageImpl implements NewchildPackage
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.newchild.NewchildPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -162,6 +160,7 @@ public class NewchildPackageImpl extends EPackageImpl implements NewchildPackage
// Initialize simple dependencies
ConstraintsPackage.eINSTANCE.eClass();
ExtendedtypesPackage.eINSTANCE.eClass();
+ TypesPackage.eINSTANCE.eClass();
// Obtain or create and register interdependencies
NcpolicyPackageImpl theNcpolicyPackage = (NcpolicyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NcpolicyPackage.eNS_URI) instanceof NcpolicyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NcpolicyPackage.eNS_URI) : NcpolicyPackage.eINSTANCE);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/SeparatorImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/SeparatorImpl.java
index 693a84e7c40..12294f1c70c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/SeparatorImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/SeparatorImpl.java
@@ -4,12 +4,11 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CreateIn.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CreateIn.java
index 95f62108c08..068fc321c7f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CreateIn.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CreateIn.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import java.util.Arrays;
import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Create In</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCreateIn()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CustomPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CustomPolicy.java
index d9a46103725..dbdfef7b920 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CustomPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CustomPolicy.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
/**
@@ -15,11 +15,11 @@ package org.eclipse.papyrus.newchild.ncpolicy;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy()
* @model
* @generated
*/
@@ -34,14 +34,14 @@ public interface CustomPolicy extends NewChildPolicy {
* <!-- end-user-doc -->
* @return the value of the '<em>Class Name</em>' attribute.
* @see #setClassName(String)
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy_ClassName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy_ClassName()
* @model required="true"
* @generated
*/
String getClassName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Class Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/FilterPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/FilterPolicy.java
index ef7aafd01ba..bf83eed76cd 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/FilterPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/FilterPolicy.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
/**
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.newchild.ncpolicy;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getFilterPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getFilterPolicy()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/Layout.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/Layout.java
index 95047a2e170..ae9c186bd9f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/Layout.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/Layout.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import java.util.Arrays;
import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Layout</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getLayout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getLayout()
* @model
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyFactory.java
index 7f341ca2520..5933299c750 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
* @generated
*/
public interface NcpolicyFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface NcpolicyFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- NcpolicyFactory eINSTANCE = org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyFactoryImpl.init();
+ NcpolicyFactory eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyFactoryImpl.init();
/**
* Returns a new object of class '<em>New EMF Child Menu</em>'.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyPackage.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyPackage.java
index c40dd4be65c..27aac1d1b5c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyPackage.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyPackage.java
@@ -4,17 +4,15 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* <!-- begin-user-doc -->
@@ -27,7 +25,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyFactory
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory
* @model kind="package"
* @generated
*/
@@ -62,14 +60,14 @@ public interface NcpolicyPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- NcpolicyPackage eINSTANCE = org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl.init();
+ NcpolicyPackage eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
* @generated
*/
int NEW_EMF_CHILD_MENU = 0;
@@ -147,11 +145,11 @@ public interface NcpolicyPackage extends EPackage {
int NEW_EMF_CHILD_MENU_FEATURE_COUNT = NewchildPackage.MENU_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
* @generated
*/
int NEW_CHILD_POLICY_SET = 1;
@@ -202,11 +200,11 @@ public interface NcpolicyPackage extends EPackage {
int NEW_CHILD_POLICY_SET_FEATURE_COUNT = ConstraintsPackage.DISPLAY_UNIT_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
* @generated
*/
int NEW_CHILD_POLICY = 2;
@@ -248,11 +246,11 @@ public interface NcpolicyPackage extends EPackage {
int NEW_CHILD_POLICY_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
* @generated
*/
int FILTER_POLICY = 3;
@@ -294,11 +292,11 @@ public interface NcpolicyPackage extends EPackage {
int FILTER_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
* @generated
*/
int REPLACE_POLICY = 4;
@@ -349,11 +347,11 @@ public interface NcpolicyPackage extends EPackage {
int REPLACE_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
* @generated
*/
int CUSTOM_POLICY = 5;
@@ -404,212 +402,212 @@ public interface NcpolicyPackage extends EPackage {
int CUSTOM_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
* @generated
*/
int CREATE_IN = 6;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
* @generated
*/
int LAYOUT = 7;
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>New EMF Child Menu</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu
* @generated
*/
EClass getNewEMFChildMenu();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Create In</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn()
* @see #getNewEMFChildMenu()
* @generated
*/
EAttribute getNewEMFChildMenu_CreateIn();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Layout</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout()
* @see #getNewEMFChildMenu()
* @generated
*/
EAttribute getNewEMFChildMenu_Layout();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Groups</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups()
* @see #getNewEMFChildMenu()
* @generated
*/
EReference getNewEMFChildMenu_Groups();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>New Child Policy Set</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet
* @generated
*/
EClass getNewChildPolicySet();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName()
* @see #getNewChildPolicySet()
* @generated
*/
EAttribute getNewChildPolicySet_Name();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Policies</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies()
* @see #getNewChildPolicySet()
* @generated
*/
EReference getNewChildPolicySet_Policies();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>New Child Policy</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy
* @generated
*/
EClass getNewChildPolicy();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}'.
+ * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute list '<em>Roles</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles()
* @see #getNewChildPolicy()
* @generated
*/
EAttribute getNewChildPolicy_Roles();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>EClasses</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses()
* @see #getNewChildPolicy()
* @generated
*/
EReference getNewChildPolicy_EClasses();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName()
* @see #getNewChildPolicy()
* @generated
*/
EAttribute getNewChildPolicy_Name();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Filter Policy</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy
* @generated
*/
EClass getFilterPolicy();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Replace Policy</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy
* @generated
*/
EClass getReplacePolicy();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Replace With</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith()
* @see #getReplacePolicy()
* @generated
*/
EReference getReplacePolicy_ReplaceWith();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Custom Policy</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy
* @generated
*/
EClass getCustomPolicy();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Class Name</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName()
* @see #getCustomPolicy()
* @generated
*/
EAttribute getCustomPolicy_ClassName();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for enum '<em>Create In</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
* @generated
*/
EEnum getCreateIn();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for enum '<em>Layout</em>'.
- * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
* @generated
*/
EEnum getLayout();
@@ -637,11 +635,11 @@ public interface NcpolicyPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
* @generated
*/
EClass NEW_EMF_CHILD_MENU = eINSTANCE.getNewEMFChildMenu();
@@ -671,11 +669,11 @@ public interface NcpolicyPackage extends EPackage {
EReference NEW_EMF_CHILD_MENU__GROUPS = eINSTANCE.getNewEMFChildMenu_Groups();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
* @generated
*/
EClass NEW_CHILD_POLICY_SET = eINSTANCE.getNewChildPolicySet();
@@ -697,11 +695,11 @@ public interface NcpolicyPackage extends EPackage {
EReference NEW_CHILD_POLICY_SET__POLICIES = eINSTANCE.getNewChildPolicySet_Policies();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
* @generated
*/
EClass NEW_CHILD_POLICY = eINSTANCE.getNewChildPolicy();
@@ -731,21 +729,21 @@ public interface NcpolicyPackage extends EPackage {
EAttribute NEW_CHILD_POLICY__NAME = eINSTANCE.getNewChildPolicy_Name();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
* @generated
*/
EClass FILTER_POLICY = eINSTANCE.getFilterPolicy();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
* @generated
*/
EClass REPLACE_POLICY = eINSTANCE.getReplacePolicy();
@@ -759,11 +757,11 @@ public interface NcpolicyPackage extends EPackage {
EReference REPLACE_POLICY__REPLACE_WITH = eINSTANCE.getReplacePolicy_ReplaceWith();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
* @generated
*/
EClass CUSTOM_POLICY = eINSTANCE.getCustomPolicy();
@@ -777,21 +775,21 @@ public interface NcpolicyPackage extends EPackage {
EAttribute CUSTOM_POLICY__CLASS_NAME = eINSTANCE.getCustomPolicy_ClassName();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
* @generated
*/
EEnum CREATE_IN = eINSTANCE.getCreateIn();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
- * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
* @generated
*/
EEnum LAYOUT = eINSTANCE.getLayout();
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicy.java
index 401ae8f20b1..d0e05d53d7d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicy.java
@@ -4,10 +4,9 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -19,13 +18,13 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy()
* @model abstract="true"
* @generated
*/
@@ -40,7 +39,7 @@ public interface NewChildPolicy extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Roles</em>' attribute list.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Roles()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Roles()
* @model
* @generated
*/
@@ -56,7 +55,7 @@ public interface NewChildPolicy extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>EClasses</em>' reference list.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_EClasses()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_EClasses()
* @model
* @generated
*/
@@ -72,14 +71,14 @@ public interface NewChildPolicy extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Name()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicySet.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicySet.java
index 45240617ace..eecb160d1c8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicySet.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicySet.java
@@ -4,11 +4,10 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
/**
* <!-- begin-user-doc -->
@@ -18,12 +17,12 @@ import org.eclipse.papyrus.constraints.DisplayUnit;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet()
* @model
* @generated
*/
@@ -38,14 +37,14 @@ public interface NewChildPolicySet extends DisplayUnit {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Name()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Name()
* @model required="true"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -56,7 +55,7 @@ public interface NewChildPolicySet extends DisplayUnit {
/**
* Returns the value of the '<em><b>Policies</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Policies</em>' containment reference list isn't clear,
@@ -64,7 +63,7 @@ public interface NewChildPolicySet extends DisplayUnit {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Policies</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Policies()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Policies()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewEMFChildMenu.java
index 22ec5d470ae..e7b4a5504a8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewEMFChildMenu.java
@@ -4,12 +4,11 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
/**
* <!-- begin-user-doc -->
@@ -19,13 +18,13 @@ import org.eclipse.papyrus.newchild.MenuGroup;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu()
* @model
* @generated
*/
@@ -33,7 +32,7 @@ public interface NewEMFChildMenu extends Menu {
/**
* Returns the value of the '<em><b>Create In</b></em>' attribute.
* The default value is <code>"self"</code>.
- * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn}.
+ * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Create In</em>' attribute isn't clear,
@@ -41,20 +40,20 @@ public interface NewEMFChildMenu extends Menu {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Create In</em>' attribute.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
* @see #setCreateIn(CreateIn)
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_CreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_CreateIn()
* @model default="self" required="true"
* @generated
*/
CreateIn getCreateIn();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Create In</em>' attribute.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
* @see #getCreateIn()
* @generated
*/
@@ -63,7 +62,7 @@ public interface NewEMFChildMenu extends Menu {
/**
* Returns the value of the '<em><b>Layout</b></em>' attribute.
* The default value is <code>"hierarchical"</code>.
- * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.ncpolicy.Layout}.
+ * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Layout</em>' attribute isn't clear,
@@ -71,20 +70,20 @@ public interface NewEMFChildMenu extends Menu {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Layout</em>' attribute.
- * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
* @see #setLayout(Layout)
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Layout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Layout()
* @model default="hierarchical" required="true"
* @generated
*/
Layout getLayout();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Layout</em>' attribute.
- * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
* @see #getLayout()
* @generated
*/
@@ -92,7 +91,7 @@ public interface NewEMFChildMenu extends Menu {
/**
* Returns the value of the '<em><b>Groups</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuGroup}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
@@ -100,7 +99,7 @@ public interface NewEMFChildMenu extends Menu {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Groups</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Groups()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Groups()
* @model containment="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/ReplacePolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/ReplacePolicy.java
index 43ac0abcc60..ea9538e28c4 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/ReplacePolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/ReplacePolicy.java
@@ -4,11 +4,10 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
/**
* <!-- begin-user-doc -->
@@ -18,18 +17,18 @@ import org.eclipse.papyrus.newchild.MenuItem;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy()
* @model
* @generated
*/
public interface ReplacePolicy extends NewChildPolicy {
/**
* Returns the value of the '<em><b>Replace With</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuItem}.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuItem}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Replace With</em>' containment reference list isn't clear,
@@ -37,7 +36,7 @@ public interface ReplacePolicy extends NewChildPolicy {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replace With</em>' containment reference list.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy_ReplaceWith()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy_ReplaceWith()
* @model containment="true" required="true"
* @generated
*/
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/CustomPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/CustomPolicyImpl.java
index 34a61858384..b70524e630a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/CustomPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/CustomPolicyImpl.java
@@ -4,16 +4,13 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
/**
* <!-- begin-user-doc -->
@@ -22,7 +19,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl#getClassName <em>Class Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl#getClassName <em>Class Name</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/FilterPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/FilterPolicyImpl.java
index 166f7b17ab8..2136b5f1686 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/FilterPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/FilterPolicyImpl.java
@@ -4,12 +4,11 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
index 54b2f45fb35..b7e8055a3d3 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
@@ -4,18 +4,23 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
index 85a6785777a..e00c254c567 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -12,27 +12,25 @@ import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.uml2.types.TypesPackage;
-import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.impl.NewchildPackageImpl;
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-import org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.Layout;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyFactory;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
/**
* <!-- begin-user-doc -->
@@ -108,7 +106,7 @@ public class NcpolicyPackageImpl extends EPackageImpl implements NcpolicyPackage
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -146,6 +144,7 @@ public class NcpolicyPackageImpl extends EPackageImpl implements NcpolicyPackage
// Initialize simple dependencies
ConstraintsPackage.eINSTANCE.eClass();
ExtendedtypesPackage.eINSTANCE.eClass();
+ TypesPackage.eINSTANCE.eClass();
// Obtain or create and register interdependencies
NewchildPackageImpl theNewchildPackage = (NewchildPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NewchildPackage.eNS_URI) instanceof NewchildPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NewchildPackage.eNS_URI) : NewchildPackage.eINSTANCE);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicyImpl.java
index e279384f8ea..dc65f059a6b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicyImpl.java
@@ -4,24 +4,19 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
/**
* <!-- begin-user-doc -->
@@ -30,9 +25,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getRoles <em>Roles</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getEClasses <em>EClasses</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getRoles <em>Roles</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getEClasses <em>EClasses</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getName <em>Name</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicySetImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
index dcbbc8a35f1..dbf527bad22 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
@@ -4,28 +4,22 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.constraints.impl.DisplayUnitImpl;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
/**
* <!-- begin-user-doc -->
@@ -34,8 +28,8 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl#getPolicies <em>Policies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl#getPolicies <em>Policies</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
index ebb4a8f2d2b..672a01fe405 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
@@ -4,31 +4,26 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
-import org.eclipse.papyrus.newchild.MenuGroup;
-
-import org.eclipse.papyrus.newchild.impl.MenuImpl;
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-import org.eclipse.papyrus.newchild.ncpolicy.Layout;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
/**
* <!-- begin-user-doc -->
@@ -37,9 +32,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getCreateIn <em>Create In</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getLayout <em>Layout</em>}</li>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getCreateIn <em>Create In</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getLayout <em>Layout</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getGroups <em>Groups</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/ReplacePolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/ReplacePolicyImpl.java
index 3c7ad3c10bb..0ab5128c2ef 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/ReplacePolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/ReplacePolicyImpl.java
@@ -4,24 +4,20 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
/**
* <!-- begin-user-doc -->
@@ -30,7 +26,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl#getReplaceWith <em>Replace With</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl#getReplaceWith <em>Replace With</em>}</li>
* </ul>
* </p>
*
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyAdapterFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
index 653b5fb2264..566e5c685b7 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
@@ -4,29 +4,31 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
* @generated
*/
public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
@@ -138,13 +140,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu
* @generated
*/
public Adapter createNewEMFChildMenuAdapter() {
@@ -152,13 +154,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet
* @generated
*/
public Adapter createNewChildPolicySetAdapter() {
@@ -166,13 +168,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy
* @generated
*/
public Adapter createNewChildPolicyAdapter() {
@@ -180,13 +182,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy
* @generated
*/
public Adapter createFilterPolicyAdapter() {
@@ -194,13 +196,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy
* @generated
*/
public Adapter createReplacePolicyAdapter() {
@@ -208,13 +210,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy
* @generated
*/
public Adapter createCustomPolicyAdapter() {
@@ -222,13 +224,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuContainer
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
* @generated
*/
public Adapter createMenuContainerAdapter() {
@@ -236,13 +238,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuItem
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
* @generated
*/
public Adapter createMenuItemAdapter() {
@@ -250,13 +252,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.Menu
+ * @see org.eclipse.papyrus.infra.emf.newchild.Menu
* @generated
*/
public Adapter createMenuAdapter() {
@@ -264,13 +266,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.DisplayUnit
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
* @generated
*/
public Adapter createDisplayUnitAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
index 33689ef93bd..ad5257634ca 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
@@ -4,21 +4,18 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.util.NcpolicyResourceImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util.NcpolicyResourceImpl
* @generated
*/
public class NcpolicyResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceImpl.java
index b619077ba63..f6bcb8238ea 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceImpl.java
@@ -4,17 +4,16 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
* <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.util.NcpolicyResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util.NcpolicyResourceFactoryImpl
* @generated
*/
public class NcpolicyResourceImpl extends XMLResourceImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicySwitch.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicySwitch.java
index b515a5a57c7..8a19a516f82 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicySwitch.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicySwitch.java
@@ -4,20 +4,23 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
/**
* <!-- begin-user-doc -->
@@ -29,7 +32,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
* @generated
*/
public class NcpolicySwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyXMLProcessor.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
index cb95b3a47a5..488e102bf5d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
@@ -4,17 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
/**
* This class contains helper methods to serialize and deserialize XML documents
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildAdapterFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildAdapterFactory.java
index 00e57378784..eae764cdd91 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildAdapterFactory.java
@@ -4,25 +4,30 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
* @generated
*/
public class NewchildAdapterFactory extends AdapterFactoryImpl {
@@ -134,13 +139,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.NewchildConfiguration <em>Configuration</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration <em>Configuration</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.NewchildConfiguration
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration
* @generated
*/
public Adapter createNewchildConfigurationAdapter() {
@@ -148,13 +153,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuRoot <em>Menu Root</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot <em>Menu Root</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuRoot
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot
* @generated
*/
public Adapter createMenuRootAdapter() {
@@ -162,13 +167,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuItem
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
* @generated
*/
public Adapter createMenuItemAdapter() {
@@ -176,13 +181,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuContainer
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
* @generated
*/
public Adapter createMenuContainerAdapter() {
@@ -190,13 +195,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.Menu
+ * @see org.eclipse.papyrus.infra.emf.newchild.Menu
* @generated
*/
public Adapter createMenuAdapter() {
@@ -204,13 +209,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuAction <em>Menu Action</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction <em>Menu Action</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuAction
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction
* @generated
*/
public Adapter createMenuActionAdapter() {
@@ -218,13 +223,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Separator <em>Separator</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Separator <em>Separator</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.Separator
+ * @see org.eclipse.papyrus.infra.emf.newchild.Separator
* @generated
*/
public Adapter createSeparatorAdapter() {
@@ -232,13 +237,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuGroup <em>Menu Group</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup <em>Menu Group</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.MenuGroup
+ * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup
* @generated
*/
public Adapter createMenuGroupAdapter() {
@@ -246,13 +251,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.CustomFiller <em>Custom Filler</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller <em>Custom Filler</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.newchild.CustomFiller
+ * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller
* @generated
*/
public Adapter createCustomFillerAdapter() {
@@ -260,13 +265,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.constraints.DisplayUnit
+ * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
* @generated
*/
public Adapter createDisplayUnitAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceFactoryImpl.java
index 53d7b0b85bb..bf3f5cf5a12 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceFactoryImpl.java
@@ -4,21 +4,18 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.util.NewchildResourceImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.util.NewchildResourceImpl
* @generated
*/
public class NewchildResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceImpl.java
index 483e317753c..87f4620d093 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceImpl.java
@@ -4,17 +4,16 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
* <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.util.NewchildResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.util.NewchildResourceFactoryImpl
* @generated
*/
public class NewchildResourceImpl extends XMLResourceImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildSwitch.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildSwitch.java
index e451dbdb8a7..bb7f519d8b1 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildSwitch.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildSwitch.java
@@ -4,16 +4,22 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
/**
* <!-- begin-user-doc -->
@@ -25,7 +31,7 @@ import org.eclipse.papyrus.newchild.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
* @generated
*/
public class NewchildSwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildXMLProcessor.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildXMLProcessor.java
index 0979380ff58..aac8d02ecd8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildXMLProcessor.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildXMLProcessor.java
@@ -4,17 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
/**
* This class contains helper methods to serialize and deserialize XML documents
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/Activator.java
index 6d82a9b636c..5341d9da478 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/Activator.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.newchild"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.newchild"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/CreateChildAction.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/CreateChildAction.java
index 2dc2f1ccd6e..d477dea90b8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/CreateChildAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/CreateChildAction.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.action;
+package org.eclipse.papyrus.infra.emf.newchild.action;
import java.net.URL;
import java.util.Collection;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java
index 5ab0eb56460..120edaadde0 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.action;
+package org.eclipse.papyrus.infra.emf.newchild.action;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/AbstractCustomFillElement.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/AbstractCustomFillElement.java
index 2f069cf178a..bf5c1c5325e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/AbstractCustomFillElement.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/AbstractCustomFillElement.java
@@ -9,10 +9,10 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
/**
* A base implementation for CustomFillElement
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/CustomFillElement.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/CustomFillElement.java
index 1c98925d089..0f0a4a824c3 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/CustomFillElement.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/CustomFillElement.java
@@ -9,9 +9,9 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
-import org.eclipse.papyrus.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
/**
* An interface for Custom menu filler
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillElement.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillElement.java
index ec15646452b..e91f761f5f9 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillElement.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillElement.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenu.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenu.java
index 7305434b257..02d5dd465ad 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenu.java
@@ -9,15 +9,15 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.runtime.NewchildManager;
-import org.eclipse.papyrus.newchild.util.MenuHelper;
-import org.eclipse.papyrus.newchild.util.Util;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.NewchildManager;
+import org.eclipse.papyrus.infra.emf.newchild.util.MenuHelper;
+import org.eclipse.papyrus.infra.emf.newchild.util.Util;
public class FillMenu extends FillMenuContainer {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuAction.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuAction.java
index ce2fe93d2ef..6356c504748 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuAction.java
@@ -9,16 +9,16 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.action.ExtendedTypeAction;
+import org.eclipse.papyrus.infra.emf.newchild.util.MenuHelper;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.action.ExtendedTypeAction;
-import org.eclipse.papyrus.newchild.util.MenuHelper;
public class FillMenuAction implements FillElement {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuContainer.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuContainer.java
index 99a9be5c3da..cabcb331c3b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuContainer.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuContainer.java
@@ -9,11 +9,11 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
public class FillMenuContainer implements FillElement {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuGroup.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuGroup.java
index 1f289befeda..30dfdf1de79 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuGroup.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuGroup.java
@@ -9,13 +9,13 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.runtime.NewchildManager;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.NewchildManager;
public class FillMenuGroup extends FillMenuContainer {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuRoot.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuRoot.java
index 5b70900bdd2..5332eda969f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillMenuRoot.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillMenuRoot.java
@@ -9,11 +9,11 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
public class FillMenuRoot extends FillMenuContainer {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillNewChild.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillNewChild.java
index 573ebac8896..3cad806dd37 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillNewChild.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillNewChild.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import java.io.IOException;
import java.text.Collator;
@@ -33,21 +33,21 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.emf.newchild.Activator;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.action.CreateChildAction;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.policies.NewChildFillPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.policies.PolicyManager;
+import org.eclipse.papyrus.infra.emf.newchild.policies.PolicyMatcher;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.DisabledContributionItem;
+import org.eclipse.papyrus.infra.emf.newchild.util.MenuHelper;
+import org.eclipse.papyrus.infra.emf.newchild.util.Util;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.newchild.Activator;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.action.CreateChildAction;
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-import org.eclipse.papyrus.newchild.ncpolicy.Layout;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
-import org.eclipse.papyrus.newchild.policies.NewChildFillPolicy;
-import org.eclipse.papyrus.newchild.policies.PolicyManager;
-import org.eclipse.papyrus.newchild.policies.PolicyMatcher;
-import org.eclipse.papyrus.newchild.runtime.DisabledContributionItem;
-import org.eclipse.papyrus.newchild.util.MenuHelper;
-import org.eclipse.papyrus.newchild.util.Util;
@@ -69,7 +69,7 @@ public class FillNewChild extends FillMenu implements FillElement {
//TODO : Extract that to a static instance, and load with extension point
policyManager = new PolicyManager();
try {
- NewchildConfiguration configuration = (NewchildConfiguration)EMFHelper.loadEMFModel(null, URI.createPlatformPluginURI("org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi", true));
+ NewchildConfiguration configuration = (NewchildConfiguration)EMFHelper.loadEMFModel(null, URI.createPlatformPluginURI("org.eclipse.papyrus.infra.emf.newchild/Model/NewchildConfiguration.xmi", true));
policyManager.addConfiguration(configuration);
} catch (IOException ex) {
Activator.log.error(ex);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillSeparator.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillSeparator.java
index b4dc0ac2b66..d8237a935e6 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillSeparator.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillSeparator.java
@@ -9,11 +9,11 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.Separator;
-import org.eclipse.papyrus.newchild.util.MenuHelper;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.util.MenuHelper;
public class FillSeparator implements FillElement {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillerFactory.java
index b9919a50e90..084c2187ebe 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/FillerFactory.java
@@ -9,19 +9,19 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
+import org.eclipse.papyrus.infra.emf.newchild.Activator;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-import org.eclipse.papyrus.newchild.Activator;
-import org.eclipse.papyrus.newchild.CustomFiller;
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.Separator;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
public class FillerFactory {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/MyCustomFiller.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/MyCustomFiller.java
index a94b97430b2..bc0fe9a475e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/MyCustomFiller.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/menu/MyCustomFiller.java
@@ -9,11 +9,11 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.menu;
+package org.eclipse.papyrus.infra.emf.newchild.menu;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.runtime.DisabledContributionItem;
-import org.eclipse.papyrus.newchild.util.MenuHelper;
+import org.eclipse.papyrus.infra.emf.newchild.runtime.DisabledContributionItem;
+import org.eclipse.papyrus.infra.emf.newchild.util.MenuHelper;
public class MyCustomFiller extends AbstractCustomFillElement {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/AbstractFillPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/AbstractFillPolicy.java
index 3577e468ef3..3dddbc0bf68 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/AbstractFillPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/AbstractFillPolicy.java
@@ -9,14 +9,14 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
import java.util.Collection;
import java.util.HashSet;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
public abstract class AbstractFillPolicy implements NewChildFillPolicy {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/FilterFillPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/FilterFillPolicy.java
index 487e05f7b32..cce63c79631 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/FilterFillPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/FilterFillPolicy.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/NewChildFillPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/NewChildFillPolicy.java
index 1e5a9b13f71..9a6a9f6839e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/NewChildFillPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/NewChildFillPolicy.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
import java.util.Collection;
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-import org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
public interface NewChildFillPolicy {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyManager.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyManager.java
index 989f7dd5c27..136d4370cc2 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyManager.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyManager.java
@@ -9,12 +9,12 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.runtime.DefaultConstraintEngine;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.runtime.DefaultConstraintEngine;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
public class PolicyManager extends DefaultConstraintEngine<NewChildPolicySet> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyMatcher.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyMatcher.java
index a81c11290bf..4e3c9d20116 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/PolicyMatcher.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/PolicyMatcher.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
import java.util.Collection;
import java.util.LinkedList;
@@ -17,9 +17,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
public class PolicyMatcher {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/ReplaceFillPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/ReplaceFillPolicy.java
index d3fb1baa3fe..2b4089c5868 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/policies/ReplaceFillPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/policies/ReplaceFillPolicy.java
@@ -9,16 +9,16 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.policies;
+package org.eclipse.papyrus.infra.emf.newchild.policies;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.menu.FillElement;
-import org.eclipse.papyrus.newchild.menu.FillerFactory;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.menu.FillElement;
+import org.eclipse.papyrus.infra.emf.newchild.menu.FillerFactory;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
public class ReplaceFillPolicy extends AbstractFillPolicy {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/DisabledContributionItem.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/DisabledContributionItem.java
index 7e16e180096..684846ae5ef 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/DisabledContributionItem.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/DisabledContributionItem.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.runtime;
+package org.eclipse.papyrus.infra.emf.newchild.runtime;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/MenuConstraintEngine.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/MenuConstraintEngine.java
index 39493bdfd97..a2c4bd502a8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/MenuConstraintEngine.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/MenuConstraintEngine.java
@@ -9,12 +9,12 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.runtime;
+package org.eclipse.papyrus.infra.emf.newchild.runtime;
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.runtime.DefaultConstraintEngine;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.runtime.DefaultConstraintEngine;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
public class MenuConstraintEngine extends DefaultConstraintEngine<MenuRoot> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/NewchildManager.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/NewchildManager.java
index 3c6355348d1..2b9e2d949cd 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/runtime/NewchildManager.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/runtime/NewchildManager.java
@@ -9,7 +9,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.runtime;
+package org.eclipse.papyrus.infra.emf.newchild.runtime;
import java.io.IOException;
import java.util.Set;
@@ -17,12 +17,12 @@ import java.util.Set;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.newchild.Activator;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.menu.FillElement;
+import org.eclipse.papyrus.infra.emf.newchild.menu.FillerFactory;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.newchild.Activator;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.menu.FillElement;
-import org.eclipse.papyrus.newchild.menu.FillerFactory;
/**
* A singleton manager for customizable "New child" menu.
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.newchild.menu.FillerFactory;
*
* USAGE : NewchildManager.instance.fillMenu(IMenuManager, IStructuredSelection)
*
- * See the org.eclipse.papyrus.newchild.configuration extension point.
+ * See the org.eclipse.papyrus.infra.emf.newchild.configuration extension point.
*
* @author Camille Letavernier
*
@@ -77,7 +77,7 @@ public class NewchildManager {
constraintEngine = new MenuConstraintEngine();
try {
//TODO : Load that from extension point
- NewchildConfiguration configuration = (NewchildConfiguration)EMFHelper.loadEMFModel(null, URI.createPlatformPluginURI("org.eclipse.papyrus.newchild/Model/NewchildConfiguration.xmi", true));
+ NewchildConfiguration configuration = (NewchildConfiguration)EMFHelper.loadEMFModel(null, URI.createPlatformPluginURI("org.eclipse.papyrus.infra.emf.newchild/Model/NewchildConfiguration.xmi", true));
constraintEngine.addConfiguration(configuration);
} catch (IOException ex) {
Activator.log.error(ex);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/MenuHelper.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/MenuHelper.java
index 108da1a31a5..f435fb14b08 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/MenuHelper.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/MenuHelper.java
@@ -9,13 +9,13 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.papyrus.newchild.menu.FillMenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.menu.FillMenuGroup;
public class MenuHelper {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/Util.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/Util.java
index 77f9b6c81b1..34368aca544 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/util/Util.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/infra/emf/newchild/util/Util.java
@@ -9,15 +9,15 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.newchild.Activator;
-import org.eclipse.papyrus.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.Activator;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
public class Util {

Back to the top