Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2015-02-16 15:45:10 +0000
committerVincent Lorenzo2015-02-16 15:48:05 +0000
commit2bdec905ed072e56523099a57311c30d7445576a (patch)
tree50dd8eec8090de02dc6c735db8e89d84689a6607
parent4c79b652ac8eb94b5d25ef33db9c796737a85016 (diff)
downloadorg.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.gz
org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.xz
org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.zip
408930: [Table 2] Table must provide a row filter located in the column header
-rwxr-xr-xfeatures/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml31
-rwxr-xr-x[-rw-r--r--]plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml0
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java5
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java8
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java70
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanFilterRowComboBoxCellEditorFilterConfiguration.java54
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java65
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EEnumFilterCellEditorFilterConfiguration.java323
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java69
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterComboBoxDataProvider.java96
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterRowComboBoxCellEditorConfiguration.java110
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceTextEditorFilterConfiguration.java48
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EnumeratorMatcherEditor.java128
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectTreeAxisManagerForEventList.java9
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingFeatureLabelProvider.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml26
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java11
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectListValueStyle.gifbin0 -> 223 bytes
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectValueStyle.gifbin0 -> 223 bytes
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectListValueStyle.gifbin0 -> 129 bytes
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectValueStyle.gifbin0 -> 129 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java112
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java26
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java24
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java91
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java28
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java42
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java49
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java30
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java42
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java42
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java16
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java140
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java140
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java30
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java166
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java28
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java36
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java174
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java66
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java31
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java45
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java181
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java194
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java5
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java173
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java41
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java26
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java28
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java65
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java46
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java41
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java150
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java65
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java46
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java268
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java317
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java44
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java23
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java248
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java46
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java63
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java61
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java57
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java32
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java27
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java288
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java42
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java94
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java217
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java190
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java161
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java72
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java90
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java125
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java126
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java50
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java64
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java26
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java94
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java88
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java58
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java76
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java71
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java187
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java168
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java40
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java131
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java39
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java63
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java42
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java106
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java27
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java94
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java57
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java24
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java81
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java27
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java91
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java46
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java32
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java26
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java8
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java51
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java63
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java32
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java5
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java440
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java17
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java148
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java179
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java41
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java50
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java220
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java20
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java52
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java262
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java276
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java11
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java29
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java77
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java78
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java40
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java75
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java29
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java69
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml21
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.filter.configuration.exsd135
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/UpdateFilterMapCommand.java48
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java74
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/IntegerFilterComparator.java73
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/ObjectNameAndPathComparator.java60
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/FilterRowCustomConfiguration.java76
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/IPapyrusNatTableConfiguration.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java13
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java1
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/FilterRowDataProvider.java579
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ListComboBoxDataProvider.java54
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/display/converter/ObjectNameAndPathDisplayConverter.java117
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractPapyrusMatcherEditor.java96
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractSinglePapyrusMatcher.java125
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditor.java99
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditorFactory.java47
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterPreferences.java38
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterRowUtils.java133
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/GlazedListsImpl.java49
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IFilterValueToMatchManager.java48
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IPapyrusMatcherEditorFactory.java43
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/ObjectMatcherEditor.java111
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java275
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusTextMatchingMode.java65
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusThresholdMatcherEditor.java358
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/RegexFindEditor.java99
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java335
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanComboBoxCellEditorFilterConfiguration.java87
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration.java218
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractDoubleEditorFilterConfiguration.java152
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterConfiguration.java37
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterValueToMatchManager.java252
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractIntegerEditorFilterConfiguration.java140
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNaturalEditorFilterConfiguration.java48
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNumericEditorFilterConfiguration.java47
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/FilterConfigurationFactory.java180
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/IFilterConfiguration.java80
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/TextEditorFilterConfiguration.java214
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/AbstractFilterDataValidator.java59
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/DoubleFilterDataValidator.java75
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/IntegerFilterDataValidator.java74
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/NaturalFilterDataValidator.java73
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/RegexFilterDataValidator.java66
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/StringFilterDataValidator.java76
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java4
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayFilterHandler.java35
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TransactionalCommandHandler.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesCommandHandler.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java4
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowDataLayer.java87
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowHeaderComposite.java96
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusTreeLayer.java21
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderHierarchicalLayerStack.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java318
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java466
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java380
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java5
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java11
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java62
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CreatableEObjectAxisUtils.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java41
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableModelManagerFactory.java48
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java16
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StyleUtils.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java18
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/AbstractTableWizard.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java24
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java48
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePastePage.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java16
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java58
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java1
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml23
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java10
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java44
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java73
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java285
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationMatcherEditor.java135
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java85
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLRealEditorFilterConfiguration.java82
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLUnlimitedNaturalEditorFilterConfiguration.java98
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/AbstractCreateStereotypePropertyMenuFactory.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java17
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/TreeFillingStereotypePropertyLabelProvider.java14
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java21
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java126
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java4
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF8
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties4
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.notation28
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.uml98
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.notation32
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.uml8
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.notation76
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.uml62
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.notation36
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.uml8
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.notation51
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.uml35
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.notation49
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.uml91
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.notation52
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.uml12
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.notation31
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.uml25
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.di2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.notation75
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.uml67
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractFilterMatcherTest.java188
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java142
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java7
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java501
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterEEnumMatcherTest.java118
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterNumericMatcherTest.java82
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterStringMatcherTest.java95
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterUMLEnumerationMatcherTest.java108
489 files changed, 18240 insertions, 7236 deletions
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
index d3d4847ff43..9d7c7f22bea 100755
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
@@ -26,6 +26,20 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
+ id="org.eclipse.papyrus.infra.nattable.model.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.nattable.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.papyrus.uml.nattable.generic.tests"
download-size="0"
install-size="0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index 81122d5072c..f3c09c026d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -2,8 +2,10 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.emf.nattable,
org.eclipse.papyrus.infra.emf.nattable.celleditor.config,
org.eclipse.papyrus.infra.emf.nattable.dataprovider,
+ org.eclipse.papyrus.infra.emf.nattable.filter.configuration,
org.eclipse.papyrus.infra.emf.nattable.manager.axis,
org.eclipse.papyrus.infra.emf.nattable.manager.cell,
+ org.eclipse.papyrus.infra.emf.nattable.messages,
org.eclipse.papyrus.infra.emf.nattable.provider,
org.eclipse.papyrus.infra.emf.nattable.registry,
org.eclipse.papyrus.infra.emf.nattable.selection,
@@ -24,7 +26,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.emf.type.core,
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
- ca.odell.glazedlists;bundle-version="1.9.0"
+ ca.odell.glazedlists;bundle-version="1.9.0",
+ com.google.guava;bundle-version="15.0.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.1.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
index 274ea85ac29..ba84e3b43a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
@@ -58,4 +58,35 @@
order="1000">
</cellManager>
</extension>
+ <extension
+ point="org.eclipse.papyrus.infra.nattable.filter.configuration">
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceFilterRowComboBoxCellEditorConfiguration"
+ order="9000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanComboBoxCellEditorFilterConfiguration"
+ order="9000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanFilterRowComboBoxCellEditorFilterConfiguration"
+ order="8800">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceTextEditorFilterConfiguration"
+ order="8900">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EIntegereEditorFilterConfiguration"
+ order="9000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EDoubleEditorFilterConfiguration"
+ order="9000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration"
+ order="8000">
+ </configuration>
+ </extension>
</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index 0763e58a43c..0763e58a43c 100644..100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
index 16aaa36b2ff..1e9ba5fb6b4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
@@ -38,7 +38,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
index c76949789b4..ce76abd070d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
@@ -52,7 +52,7 @@ public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfigurat
/**
* the id of the editor config
*/
- public static final String EDITOR_CONFIG_ID = "EMF_EDITOR";
+ public static final String EDITOR_CONFIG_ID = "EMF_EDITOR"; //$NON-NLS-1$
/**
* the int used to identify the kind of editor
@@ -107,6 +107,7 @@ public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfigurat
editor = new ComboBoxCellEditor(new EEnumComboBoxDataProvider((EEnum) ((EStructuralFeature) axisElement).getEType()));
break;
default:
+ break;
}
return editor;
}
@@ -176,6 +177,7 @@ public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfigurat
};
break;
default:
+ break;
}
return displayConverter;
}
@@ -223,6 +225,7 @@ public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfigurat
displayMode = DisplayMode.NORMAL;
break;
default:
+ break;
}
return displayMode;
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
index 91976b412fe..8017252cff3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.nattable.dataprovider;
@@ -36,7 +36,7 @@ public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {
private final EEnum eenum;
/**
- *
+ *
* Constructor.
*
* @param eenum
@@ -60,7 +60,7 @@ public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {
}
/**
- *
+ *
* @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)
*
* @param columnIndex
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java
new file mode 100755
index 00000000000..55193353121
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractBooleanComboBoxCellEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+
+
+/**
+ *
+ * This class provide the configuration for boolean
+ */
+public class EBooleanComboBoxCellEditorFilterConfiguration extends AbstractBooleanComboBoxCellEditorFilterConfiguration {
+
+ /**
+ * The ID for this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.filter.eboolean.combo.with.NA"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ EClassifier etype = feature.getEType();
+ if (etype instanceof EDataType) {
+ EDataType datatype = (EDataType) etype;
+ return TypesConstants.BOOLEAN.equals(datatype.getName());
+ }
+ }
+ return false;
+ }
+
+
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanFilterRowComboBoxCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanFilterRowComboBoxCellEditorFilterConfiguration.java
new file mode 100755
index 00000000000..e957bfa0dec
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanFilterRowComboBoxCellEditorFilterConfiguration.java
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration;
+
+/**
+ * This configuration provides a Combo With checkbox to edit boolean values
+ *
+ */
+public class EBooleanFilterRowComboBoxCellEditorFilterConfiguration extends AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration {
+ /**
+ * The ID for this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.filter.eboolean.checkboxcombo.with.NA"; //$NON-NLS-1$
+
+ /**
+ * An other conf used for EBoolean values
+ */
+ private static final EBooleanComboBoxCellEditorFilterConfiguration conf = new EBooleanComboBoxCellEditorFilterConfiguration();
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param axis
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object axis) {
+ return conf.handles(registry, axis);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanComboBoxCellEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java
new file mode 100644
index 00000000000..2d98bac443b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractDoubleEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+
+/**
+ * The filter configuration for double values
+ *
+ */
+public class EDoubleEditorFilterConfiguration extends AbstractDoubleEditorFilterConfiguration {
+
+ /**
+ * the id for this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.emf.nattable.filter.edouble.text"; ////$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ EClassifier etype = feature.getEType();
+ if (etype instanceof EDataType) {
+ EDataType datatype = (EDataType) etype;
+ return TypesConstants.DOUBLE.equals(datatype.getName());
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EEnumFilterCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EEnumFilterCellEditorFilterConfiguration.java
new file mode 100755
index 00000000000..7813c67a8b1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EEnumFilterCellEditorFilterConfiguration.java
@@ -0,0 +1,323 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.filterrow.combobox.FilterRowComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.dataprovider.ListComboBoxDataProvider;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ * Filter configuration for eenum filter
+ *
+ */
+public class EEnumFilterCellEditorFilterConfiguration implements IFilterConfiguration {
+
+ /**
+ * the id of this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.eenum.checkboxcombo.with.NA";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object representedElement = AxisUtils.getRepresentedElement(columnElement);
+ if (representedElement instanceof EStructuralFeature) {
+ EClassifier eType = ((EStructuralFeature) representedElement).getEType();
+ return eType instanceof EEnum;
+ }
+ return false;
+ }
+
+ /**
+ *
+ * @param axis
+ * an axis
+ * @return
+ * a list containing the possible Enumerator for the axis
+ */
+ protected List<Enumerator> getLiteral(IConfigRegistry configRegistry, Object axis) {
+ Object representedElement = AxisUtils.getRepresentedElement(axis);
+ final List<Enumerator> literals = new ArrayList<Enumerator>();
+ if (representedElement instanceof EStructuralFeature) {
+ EClassifier eType = ((EStructuralFeature) representedElement).getEType();
+ Assert.isTrue(eType instanceof EEnum);
+ EEnum eenum = (EEnum) eType;
+ for (EEnumLiteral current : eenum.getELiterals()) {
+ literals.add(current.getInstance());
+ }
+ }
+ return literals;
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+ *
+ * @param configRegistry
+ * @param columnElement
+ * @param configLabel
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, final Object columnElement, String configLabel) {
+ List<Enumerator> literals = getLiteral(configRegistry, columnElement);
+ final List<Object> valuesToProposed = new ArrayList<Object>(literals);
+
+ valuesToProposed.add(0, ICellManager.NOT_AVALAIBLE);
+
+ ICellEditor editor = new FilterRowComboBoxCellEditor(new ListComboBoxDataProvider(valuesToProposed));
+ IPapyrusMatcherEditorFactory<Object> factory = createPapyrusMatcherFactory();
+
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, factory, DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.FILTER_VALUE_TO_MATCH_MANAGER, createFilterValueToMatchManager(getConfigurationId(), literals), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter(), DisplayMode.NORMAL, configLabel);
+ }
+
+ protected IPapyrusMatcherEditorFactory<Object> createPapyrusMatcherFactory(){
+ return new IPapyrusMatcherEditorFactory<Object>() {
+
+ @Override
+ public EventList<MatcherEditor<Object>> instantiateMatcherEditors(IColumnAccessor<Object> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry) {
+ EventList<MatcherEditor<Object>> list = new BasicEventList<MatcherEditor<Object>>();
+ list.add(new EnumeratorMatcherEditor(columnAccessor, columnIndex, wantedValue, configRegistry));
+ return list;
+ }
+ };
+ }
+ /**
+ *
+ * @param filterConfiguration
+ * the id of the filter configuration used for the managed axis
+ * @param literals
+ * the available literals
+ * @return
+ * the filter value manager for the managed axis
+ */
+ protected IFilterValueToMatchManager createFilterValueToMatchManager(String filterConfiguration, List<Enumerator> literals) {
+ return new EnumeratorFilterValueToMatchManager(filterConfiguration, literals);
+ }
+
+ /**
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides a combo with checkbox to filter EEnum, with N/A value"; //$NON-NLS-1$
+ }
+
+ /**
+ *
+ * This class allows to save the state of the filter for column typed with enumeration
+ *
+ */
+ public static class EnumeratorFilterValueToMatchManager extends AbstractFilterValueToMatchManager {
+
+ /**
+ * a list with the available literal
+ */
+ protected final List<Enumerator> literals;
+
+ /**
+ * Constructor.
+ *
+ * @param filterConfigurationId
+ * the id of the filter configuration used by the axis
+ * @param literals
+ * the available literals
+ */
+ public EnumeratorFilterValueToMatchManager(String filterConfigurationId, List<Enumerator> literals) {
+ super(filterConfigurationId);
+ this.literals = literals;
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager#getValueToMatch(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param configRegistry
+ * @param axis
+ * @return
+ */
+ @Override
+ public Object getValueToMatch(IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ NamedStyle style = getValueToMatchStyle(iaxis);
+ if (style != null) {
+ if (style instanceof StringListValueStyle) {
+ List<Object> returnedValues = new ArrayList<Object>();
+ Collection<String> coll = ((StringListValueStyle) style).getStringListValue();
+ for (String string : coll) {
+ if (string.equals(ICellManager.NOT_AVALAIBLE)) {
+ returnedValues.add(ICellManager.NOT_AVALAIBLE);
+ } else {
+ for (Enumerator tmp : literals) {
+ if (tmp.getName().equals(string)) {
+ returnedValues.add(tmp);
+ continue;
+ }
+ }
+ }
+ }
+ return returnedValues;
+ }
+ if (style instanceof StringValueStyle) {
+ String val = ((StringValueStyle) style).getStringValue();
+ if (val.equals(ICellManager.NOT_AVALAIBLE)) {
+ return ICellManager.NOT_AVALAIBLE;
+ }
+ for (Enumerator tmp : literals) {
+ if (tmp.getName().equals(val)) {
+ return tmp;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager#getSaveValueToMatchCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,
+ * java.lang.Object, java.lang.Object)
+ *
+ * @param domain
+ * @param configRegistry
+ * @param axis
+ * @param newValue
+ * @return
+ */
+ @Override
+ protected Command getSaveValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis, Object newValue) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ CompoundCommand cc = new CompoundCommand("Save Value To Match Command"); //$NON-NLS-1$
+ NamedStyle keyStyle = getValueToMatchStyle(iaxis);
+ if (newValue instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) newValue;
+ // we need to update the keystyle
+ if (keyStyle != null && !(keyStyle instanceof StringListValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createStringListValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+
+ List<String> values = new ArrayList<String>();
+ for (Object tmp : coll) {
+ Assert.isTrue(tmp instanceof Enumerator || ICellManager.NOT_AVALAIBLE.equals(tmp));
+ if (tmp instanceof Enumerator) {
+ values.add(((Enumerator) tmp).getName());
+ } else {
+ values.add(ICellManager.NOT_AVALAIBLE);
+ }
+ }
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringListValueStyle_StringListValue(), values));
+ } else {
+ if (keyStyle != null && !(keyStyle instanceof StringValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createEObjectValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+ Assert.isTrue(newValue instanceof Enumerator || ICellManager.NOT_AVALAIBLE.equals(newValue));
+ // we store the name of the literal and a reference to the literal, for 2 reasons :
+ // - for static profile we get enumerator and not EEnumLiteral
+ // - in case of redefinition of the profile, the reference would be not correct
+ String name;
+ if (newValue instanceof Enumerator) {
+ name = ((Enumerator) newValue).getName();
+ } else {
+ name = ICellManager.NOT_AVALAIBLE;
+ }
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringValueStyle_StringValue(), name));
+ }
+ return cc;
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java
new file mode 100644
index 00000000000..7ffca787614
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+
+/**
+ * The filter configuration for integer values
+ *
+ */
+public class EIntegereEditorFilterConfiguration extends AbstractIntegerEditorFilterConfiguration {
+
+ /**
+ * the id of this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.emf.nattable.filter.einteger.text"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ EClassifier etype = feature.getEType();
+ if (etype instanceof EDataType) {
+ EDataType datatype = (EDataType) etype;
+ return TypesConstants.INTEGER.equals(datatype.getName());
+ }
+ }
+ return false;
+ }
+
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterComboBoxDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterComboBoxDataProvider.java
new file mode 100755
index 00000000000..62e8f60450b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterComboBoxDataProvider.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+/**
+ * Content provider for ComboBox cell editor used for EReference
+ *
+ */
+public class EReferenceFilterComboBoxDataProvider implements IComboBoxDataProvider {
+
+
+ /**
+ * the axis element (column) for which we want the possible values
+ */
+ private Object axisElement;
+
+ /**
+ * the config registry
+ */
+ private IConfigRegistry configRegistry;
+
+
+ /**
+ * Constructor.
+ *
+ */
+ public EReferenceFilterComboBoxDataProvider(IConfigRegistry configRegistry, Object axisElement) {
+ this.configRegistry = configRegistry;
+ this.axisElement = axisElement;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @return
+ */
+ @Override
+ public List<?> getValues(int columnIndex, int rowIndex) {
+ NattableModelManager tableManager = (NattableModelManager) configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ List<Object> rowElements = ((NattableModelManager) tableManager).getHorizontalBasicEventList();
+ Assert.isTrue(rowIndex >= 0);
+ Assert.isTrue(rowIndex < rowElements.size());
+
+ List<Object> columnElements = tableManager.getColumnElementsList();
+ Assert.isTrue(columnIndex >= 0);
+ Assert.isTrue(columnIndex < columnElements.size());
+ Object columnElement = columnElements.get(columnIndex);
+
+ Assert.isTrue(columnElement == this.axisElement);
+
+ Comparator<Object> comparator = this.configRegistry.getConfigAttribute(NattableConfigAttributes.OBJECT_NAME_AND_PATH_COMPARATOR, DisplayMode.NORMAL, NattableConfigAttributes.OBJECT_NAME_AND_PATH_COMPARATOR_ID);
+ Set<Object> uniqueValues = new TreeSet<Object>(comparator);
+ for (Object current : rowElements) {
+ Object result = CellManagerFactory.INSTANCE.getCrossValue(columnElement, current, tableManager);
+ if (result != null) {
+ if (result instanceof Collection<?>) {
+ uniqueValues.addAll(((Collection<?>) result));
+ } else if (result instanceof String && ((String) result).isEmpty()) {
+ // do nothing
+ } else {
+ uniqueValues.add(result);
+ }
+ }
+ }
+
+ return new ArrayList<Object>(uniqueValues);
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterRowComboBoxCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterRowComboBoxCellEditorConfiguration.java
new file mode 100755
index 00000000000..fa53351c68c
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceFilterRowComboBoxCellEditorConfiguration.java
@@ -0,0 +1,110 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.filterrow.combobox.FilterRowComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.filter.ObjectMatcherEditor;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ * Configuration for filters on EReference. This configuration provides a combo with checkbox and display the qualified name of the element
+ *
+ */
+
+public class EReferenceFilterRowComboBoxCellEditorConfiguration implements IFilterConfiguration {
+
+ /**
+ * the id of this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.ereference.checkboxcombo"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object representedElement = AxisUtils.getRepresentedElement(columnElement);
+ return representedElement instanceof EReference;
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+ *
+ * @param configRegistry
+ * @param columnElement
+ * @param configLabel
+ */
+ @Override
+ public void configureFilter(final IConfigRegistry configRegistry, final Object columnElement, String configLabel) {
+ EReferenceFilterComboBoxDataProvider dataProvider = new EReferenceFilterComboBoxDataProvider(configRegistry, columnElement);
+ ICellEditor editor = new FilterRowComboBoxCellEditor(dataProvider);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, DisplayMode.NORMAL, configLabel);
+ DisplayConverter converter = configRegistry.getConfigAttribute(NattableConfigAttributes.OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER, DisplayMode.NORMAL, NattableConfigAttributes.OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER_ID);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, converter, DisplayMode.NORMAL, configLabel);
+
+ IPapyrusMatcherEditorFactory<Object> factory = new IPapyrusMatcherEditorFactory<Object>() {
+
+ @Override
+ public EventList<MatcherEditor<Object>> instantiateMatcherEditors(IColumnAccessor<Object> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry) {
+ EventList<MatcherEditor<Object>> list = new BasicEventList<MatcherEditor<Object>>();
+ list.add(new ObjectMatcherEditor(columnAccessor, columnIndex, wantedValue, configRegistry));
+ return list;
+ }
+ };
+ // register the matcher creator to use for filtering rows
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, factory, DisplayMode.NORMAL, configLabel);
+ }
+
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides a combo with checkbox to filter EReference"; //$NON-NLS-1$
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceTextEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceTextEditorFilterConfiguration.java
new file mode 100755
index 00000000000..7416b1c1fb7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EReferenceTextEditorFilterConfiguration.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration;
+
+/**
+ * String editor used for ereference
+ *
+ */
+public class EReferenceTextEditorFilterConfiguration extends TextEditorFilterConfiguration {
+
+ /**
+ * the id of this filter configuration
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.ereference.text"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return super.getConfigurationDescription();
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EnumeratorMatcherEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EnumeratorMatcherEditor.java
new file mode 100755
index 00000000000..f847e99640d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EnumeratorMatcherEditor.java
@@ -0,0 +1,128 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.filter.configuration;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor;
+import org.eclipse.papyrus.infra.nattable.filter.AbstractSinglePapyrusMatcher;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ * Matcher Editor for UML Enumeration
+ *
+ */
+public class EnumeratorMatcherEditor extends AbstractPapyrusMatcherEditor {
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ */
+ public EnumeratorMatcherEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ super(columnAccesor, columnIndex, matchOn, configRegistry);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor#createMatcher(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, int, java.lang.Object, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ protected Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ return new EnumeratorMatcher(columnAccesor, matchOn, columnIndex, configRegistry);
+ }
+
+ /**
+ * This Matcher allows to know is an object is displayed in a cell
+ *
+ */
+ public static class EnumeratorMatcher extends AbstractSinglePapyrusMatcher<Object> {
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ * @param configRegistry
+ */
+ public EnumeratorMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex, IConfigRegistry configRegistry) {
+ super(accessor, columnIndex, wantedObject, configRegistry);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ */
+ public EnumeratorMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex) {
+ super(accessor, columnIndex, wantedObject);
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.Matcher#matches(java.lang.Object)
+ *
+ * @param item
+ * @return
+ */
+ @Override
+ public boolean matches(Object item) {
+ Object res = getColumnAccessor().getDataValue(item, getColumnIndex());
+ if (res != null) {
+ Object wantedObject = getObjectToMatch();
+ String stringToMatch = null;
+ if (wantedObject instanceof String) {
+ stringToMatch = (String) wantedObject;
+ } else {
+ stringToMatch = ((Enumerator) wantedObject).getName();
+ }
+ if (res instanceof Collection<?>) {
+ for (Object tmp : (Collection<?>) res) {
+ if (tmp instanceof Enumerator) {
+ Enumerator lit = (Enumerator) tmp;
+ if (stringToMatch.equals(lit.getName())) {
+ return true;
+ }
+ } else {
+ if (stringToMatch.equals(tmp)) {
+ return true;
+ }
+ }
+ }
+ }
+ if (res instanceof Enumerator) {
+ return stringToMatch.equals(((Enumerator) res).getName());
+ }
+ return stringToMatch.equals(res);
+ }
+ return false;
+ }
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectTreeAxisManagerForEventList.java
index 3dbff4c2b7c..6f0b7d95be6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectTreeAxisManagerForEventList.java
@@ -48,7 +48,7 @@ public class EObjectTreeAxisManagerForEventList extends AbstractTreeAxisManagerF
/**
* NOT IN THE API, only here to do the dev about the display of the category (intermediate level displayed filling configuration
- *
+ *
*/
public static final boolean DISPLAY_CATEOGORY = HierarchicalRowLabelHeaderDataProvider.DISPLAY_CATEOGORY;
@@ -101,34 +101,31 @@ public class EObjectTreeAxisManagerForEventList extends AbstractTreeAxisManagerF
* @return
* @deprecated
*/
- @Deprecated
@Override
public boolean isAllowedContents(Object object) {
return object instanceof EObject;
}
/**
- *
+ *
* @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#createITreeItemAxis(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis, java.lang.Object)
*
* @param parentAxis
* @param objectToAdd
* @return
*/
- @Override
protected ITreeItemAxis createITreeItemAxis(ITreeItemAxis parentAxis, Object objectToAdd) {
return ITreeItemAxisHelper.createITreeItemAxis(getTableEditingDomain(), parentAxis, objectToAdd, this.representedAxisManager);
}
/**
- *
+ *
* @param notification
* a notification
* @return
* <code>true</code> if the notification must be ignored
*/
- @Override
protected boolean ignoreEvent(final Notification notification) {
boolean res = super.ignoreEvent(notification);
if (res) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
index c84fcf10440..db03bfcb765 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
@@ -261,15 +261,15 @@ public class EMFFeatureValueCellManager extends AbstractCellManager {
protected final ICommand getOpenConfirmChangeContainmentDialogCommand(final TransactionalEditingDomain domain, final ICommand defaultCommand, final boolean isMany) {
final String messageDialog;
if (isMany) {
- messageDialog = "Your are setting a value in a containment feature. This action will change the owner of the dropped element(s).\nContinue?";
+ messageDialog = "Your are setting a value in a containment feature. This action will change the owner of the dropped element(s).\nContinue?"; //$NON-NLS-1$
} else {
- messageDialog = "Your are setting a value in a containment feature. The previous value will be erased and the owner of the dropped element(s) will be changed.\nContinue?";
+ messageDialog = "Your are setting a value in a containment feature. The previous value will be erased and the owner of the dropped element(s) will be changed.\nContinue?"; //$NON-NLS-1$
}
- final ICommand cmd = new AbstractTransactionalCommand(domain, "Set Value Command Dialog", null) {
+ final ICommand cmd = new AbstractTransactionalCommand(domain, "Set Value Command Dialog", null) { //$NON-NLS-1$
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- final boolean result = MessageDialog.openConfirm(Display.getDefault().getActiveShell(), "Set Containment Value", messageDialog);
+ final boolean result = MessageDialog.openConfirm(Display.getDefault().getActiveShell(), "Set Containment Value", messageDialog); //$NON-NLS-1$
if (result) {
defaultCommand.execute(monitor, info);
return CommandResult.newOKCommandResult();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
index f1c293e2315..55800df83b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
@@ -74,7 +74,7 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
}
if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
- return "";
+ return ""; //$NON-NLS-1$
}
return serv.getLabelProvider(object).getText(object);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingFeatureLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingFeatureLabelProvider.java
index 60600a08451..413b5e5801c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingFeatureLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingFeatureLabelProvider.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.nattable.provider;
@@ -69,7 +69,7 @@ public class TreeFillingFeatureLabelProvider extends EMFFeatureHeaderLabelProvid
/**
- *
+ *
* @param wrapper
* @return
* the wrapped value to use to calculate the label
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
index 3170a46576c..e63ddff95e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.nattable.selection;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
index 9c4ae1c8bee..ba38bc5aeab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
@@ -195,6 +195,19 @@
</visibleWhen>
</command>
</toolbar>
+ <command
+ commandId="org.eclipse.papyrus.infra.nattable.createFromCatalog.command"
+ mnemonic="&amp;G"
+ style="push">
+ <visibleWhen>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </visibleWhen>
+ </command>
</menuContribution>
<menuContribution
allPopups="false"
@@ -203,6 +216,19 @@
class="org.eclipse.papyrus.infra.nattable.common.handlers.DynamicTablesMenuContribution"
id="org.eclipse.papyrus.infra.nattable.common.handlers.DynamicTablesMenuContribution">
</dynamic>
+ <command
+ commandId="org.eclipse.papyrus.infra.nattable.createFromCatalog.command"
+ mnemonic="&amp;G"
+ style="push">
+ <visibleWhen>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </visibleWhen>
+ </command>
</menuContribution>
</extension>
<extension
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
index e0ad616ed50..6f405baeeb5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
import org.eclipse.papyrus.infra.emf.nattable.selection.EObjectSelectionExtractor;
-import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
import org.eclipse.papyrus.infra.nattable.common.utils.TableEditorInput;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
@@ -82,7 +82,7 @@ public abstract class AbstractEMFNattableEditor extends EditorPart implements Na
*/
public AbstractEMFNattableEditor(final ServicesRegistry servicesRegistry, final Table rawModel) {
this.servicesRegistry = servicesRegistry;
- this.tableManager = new NattableModelManager(rawModel, new EObjectSelectionExtractor());
+ this.tableManager = NattableModelManagerFactory.INSTANCE.createNatTableModelManager(rawModel, new EObjectSelectionExtractor());
this.synchronizer = new PartNameSynchronizer(rawModel);
this.workspacePreferenceStore = getWorkspaceViewerPreferenceStore();
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java
index ad7cd65b674..3fb25f46c95 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForIEvaluationContext;
+import org.eclipse.papyrus.infra.nattable.common.messages.Messages;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
@@ -37,9 +38,9 @@ import org.eclipse.ui.IEditorPart;
*/
public class RenameTableHandler extends AbstractHandler {
- public static String RenameTableHandler_NewName = "New name:";
-
- public static String RenameTableHandler_RenameAnExistingTable = "Rename an existing table";
+ public static final String NEW_TABLE_NAME = Messages.RenameTableHandler_NewName;
+
+ public static final String RENAME_AN_EXISTING_TABLE = Messages.RenameTableHandler_RenameAnExistingTable;
/**
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
@@ -79,7 +80,7 @@ public class RenameTableHandler extends AbstractHandler {
// Open the dialog to ask the new name
String currentName = tableManager.getTableName();
String newName = null;
- InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), RenameTableHandler_RenameAnExistingTable, RenameTableHandler_NewName, currentName, null);
+ InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), RENAME_AN_EXISTING_TABLE, NEW_TABLE_NAME, currentName, null);
if (dialog.open() == Window.OK) {
newName = dialog.getValue();
if (newName == null || newName.length() <= 0) {
@@ -100,7 +101,7 @@ public class RenameTableHandler extends AbstractHandler {
* @return The command name to show.
*/
public String getCommandName() {
- return "Rename Table";
+ return "Rename Table"; //$NON-NLS-1$
}
protected IEvaluationContext getIEvaluationContext(ExecutionEvent event) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
index 3207edcbb10..d2b554f1511 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
@@ -19,6 +19,10 @@ public class Messages extends NLS {
public static String CreateNattableFromCatalogWizard_1;
public static String CreateNattableFromCatalogWizard_2;
+
+ public static String RenameTableHandler_NewName;
+
+ public static String RenameTableHandler_RenameAnExistingTable;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
index 654112f72cf..d82e7085913 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
@@ -5,3 +5,5 @@ ChooseNattableConfigWizardPage_9=Quantity
CreateNattableFromCatalogWizard_0=Select a Table configuration from the catalog:
CreateNattableFromCatalogWizard_1=Create a Table from an existing configuration
CreateNattableFromCatalogWizard_2=Select table configuration
+RenameTableHandler_NewName=New name:
+RenameTableHandler_RenameAnExistingTable=Rename an existing table
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java
index e9da30df115..430ede79480 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java
@@ -114,7 +114,7 @@ public class TablePasteStrategy extends AbstractPasteStrategy implements IPasteS
Object object = iterator.next();
// get target Element
EObject target = papyrusClipboard.getTragetCopyFromInternalClipboardCopy(object);
- if (target != null && target instanceof EObject) {
+ if (target != null) {
// get affiliate additionalDataMap
additionalData = additionalDataMap.get(object);
@@ -203,7 +203,7 @@ public class TablePasteStrategy extends AbstractPasteStrategy implements IPasteS
- protected class TableClipboardAdditionalData implements IClipboardAdditionalData {
+ protected static class TableClipboardAdditionalData implements IClipboardAdditionalData {
/** The internal copies of tables */
protected Collection<Table> tables;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
index 51c8f942992..ed11031d0e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
@@ -124,7 +124,7 @@ public class ChooseNattableConfigWizardPage extends WizardPage {
@Override
protected void setValue(Object element, Object value) {
- if (checkboxCellEditor.getValue() == Boolean.TRUE) {
+ if (Boolean.TRUE.equals(checkboxCellEditor.getValue())) {
selectedConfigs.put((TableConfiguration) element, 1);
} else {
selectedConfigs.remove(element);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectListValueStyle.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectListValueStyle.gif
new file mode 100755
index 00000000000..5323f34f12a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectListValueStyle.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectValueStyle.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectValueStyle.gif
new file mode 100755
index 00000000000..3da98f77436
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateStyledElement_styles_EObjectValueStyle.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectListValueStyle.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectListValueStyle.gif
new file mode 100755
index 00000000000..48e3cf22687
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectListValueStyle.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectValueStyle.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectValueStyle.gif
new file mode 100755
index 00000000000..136e3b27269
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectValueStyle.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 27085c4c49d..67a92f84239 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -9,7 +9,7 @@
# Contributors:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
-pluginName = Papyrus Nattable Model
+pluginName = Nattable Edit Support
providerName = Eclipse Modeling Project
_UI_CreateChild_text = {0}
@@ -116,15 +116,15 @@ _UI_AbstractHeaderAxisConfiguration_indexStyle_feature = Index Style
_UI_AbstractHeaderAxisConfiguration_displayLabel_feature = Display Label
_UI_AbstractHeaderAxisConfiguration_displayFilter_feature = Display Filter
_UI_AbstractHeaderAxisConfiguration_displayIndex_feature = Display Index
-_UI_AbstractHeaderAxisConfiguration_ownedLabelConfiguration_feature = Owned Label Configuration
-_UI_AbstractHeaderAxisConfiguration_ownedAxisConfiguration_feature = Owned Axis Configuration
+_UI_AbstractHeaderAxisConfiguration_ownedLabelConfigurations_feature = Owned Label Configurations
+_UI_AbstractHeaderAxisConfiguration_ownedAxisConfigurations_feature = Owned Axis Configurations
_UI_AxisManagerRepresentation_axisManagerId_feature = Axis Manager Id
_UI_AxisManagerRepresentation_labelProviderContext_feature = Label Provider Context
_UI_AxisManagerRepresentation_headerLabelConfiguration_feature = Header Label Configuration
-_UI_AxisManagerRepresentation_specificAxisConfiguration_feature = Specific Axis Configuration
+_UI_AxisManagerRepresentation_specificAxisConfigurations_feature = Specific Axis Configurations
_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature = Local Header Label Configuration
_UI_AxisManagerConfiguration_axisManager_feature = Axis Manager
-_UI_AxisManagerConfiguration_localSpecificConfiguration_feature = Local Specific Configuration
+_UI_AxisManagerConfiguration_localSpecificConfigurations_feature = Local Specific Configurations
_UI_TableHeaderAxisConfiguration_axisManagers_feature = Axis Managers
_UI_LocalTableHeaderAxisConfiguration_axisManagerConfigurations_feature = Axis Manager Configurations
_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature = Show Only Common Feature
@@ -217,3 +217,7 @@ _UI_TreeFillingConfiguration_pasteConfiguration_feature = Paste Configuration
_UI_TreeFillingConfiguration_depth_feature = Depth
_UI_TreeFillingConfiguration_labelProvider_feature = Label Provider
_UI_TreeFillingConfiguration_labelProviderContext_feature = Label Provider Context
+_UI_EObjectValueStyle_type = EObject Value Style
+_UI_EObjectListValueStyle_type = EObject List Value Style
+_UI_EObjectValueStyle_eObjectValue_feature = EObject Value
+_UI_EObjectListValueStyle_eObjectValue_feature = EObject Value
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
index ff94311431f..60050945ae3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AxisGroupItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AxisGroupItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -70,7 +70,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Manager feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addManagerPropertyDescriptor(Object object) {
@@ -93,7 +93,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Alias feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAliasPropertyDescriptor(Object object) {
@@ -116,7 +116,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Grouped Axis feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addGroupedAxisPropertyDescriptor(Object object) {
@@ -139,7 +139,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This returns AxisGroup.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -151,7 +151,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -168,7 +168,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -200,7 +200,7 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
index f981472afe5..3ad77d76594 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
@@ -35,7 +35,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EObjectAxisItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -63,7 +63,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* This adds a property descriptor for the Element feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addElementPropertyDescriptor(Object object) {
@@ -86,7 +86,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* This returns EObjectAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -98,7 +98,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -115,7 +115,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -129,7 +129,7 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
index 82a706e464e..c2fab537354 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
@@ -37,7 +37,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This returns EObjectTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
index 1efc618d9d0..f92406af44a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider {
@@ -35,7 +35,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EStructuralFeatureAxisItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -63,7 +63,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* This adds a property descriptor for the Element feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addElementPropertyDescriptor(Object object) {
@@ -86,7 +86,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* This returns EStructuralFeatureAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -98,7 +98,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -115,7 +115,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -129,7 +129,7 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
index f8679a1f1a5..8da6b6e8c8a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {
@@ -37,7 +37,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EStructuralFeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This returns EStructuralFeatureTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
index f40d9fb5a57..e29fd03c9a1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureAxisItemProvider extends StyledElementItemProvider {
@@ -42,7 +42,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureAxisItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +53,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -71,7 +71,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Manager feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addManagerPropertyDescriptor(Object object) {
@@ -94,7 +94,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Alias feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAliasPropertyDescriptor(Object object) {
@@ -118,7 +118,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -133,7 +133,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -205,7 +205,7 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
index d7bc1a18953..b8d9c460b00 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
@@ -37,7 +37,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +80,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -95,7 +95,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* This returns FeatureIdAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -107,7 +107,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -124,7 +124,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -144,7 +144,7 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
index cd27099e81b..cc0387493cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider {
@@ -37,7 +37,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This returns FeatureIdTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
index 78439a26c87..e412d115df3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
@@ -37,7 +37,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This returns FeatureTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
index 474fdeb757c..001803ea856 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IdAxisItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IdAxisItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -70,7 +70,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Manager feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addManagerPropertyDescriptor(Object object) {
@@ -93,7 +93,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Alias feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAliasPropertyDescriptor(Object object) {
@@ -116,7 +116,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Element feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addElementPropertyDescriptor(Object object) {
@@ -139,7 +139,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -156,7 +156,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -177,7 +177,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -189,7 +189,7 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
index 7c349366383..3a310f6ea75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
@@ -37,7 +37,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This returns IdTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
index 62927a96960..72b73f3d3c2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.Natta
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* 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>();
@@ -73,7 +73,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IdTreeItemAxisItemProvider idTreeItemAxisItemProvider;
@@ -97,7 +97,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObjectAxisItemProvider eObjectAxisItemProvider;
@@ -122,7 +122,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObjectTreeItemAxisItemProvider eObjectTreeItemAxisItemProvider;
@@ -147,7 +147,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -163,7 +163,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FeatureTreeItemAxisItemProvider featureTreeItemAxisItemProvider;
@@ -172,7 +172,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ObjectTreeItemAxisItemProvider objectTreeItemAxisItemProvider;
@@ -197,7 +197,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -213,7 +213,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FeatureIdAxisItemProvider featureIdAxisItemProvider;
@@ -222,7 +222,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -238,7 +238,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;
@@ -247,7 +247,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -263,7 +263,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;
@@ -272,7 +272,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -288,7 +288,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;
@@ -297,7 +297,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -313,7 +313,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ObjectIdAxisItemProvider objectIdAxisItemProvider;
@@ -322,7 +322,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -338,7 +338,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ObjectIdTreeItemAxisItemProvider objectIdTreeItemAxisItemProvider;
@@ -347,7 +347,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -363,7 +363,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected AxisGroupItemProvider axisGroupItemProvider;
@@ -372,7 +372,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -388,7 +388,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -400,7 +400,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -411,7 +411,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -423,7 +423,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -434,7 +434,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -453,7 +453,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -465,7 +465,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -477,7 +477,7 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -493,47 +493,35 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (idTreeItemAxisItemProvider != null) {
+ if (idTreeItemAxisItemProvider != null)
idTreeItemAxisItemProvider.dispose();
- }
- if (eObjectAxisItemProvider != null) {
+ if (eObjectAxisItemProvider != null)
eObjectAxisItemProvider.dispose();
- }
- if (eObjectTreeItemAxisItemProvider != null) {
+ if (eObjectTreeItemAxisItemProvider != null)
eObjectTreeItemAxisItemProvider.dispose();
- }
- if (featureTreeItemAxisItemProvider != null) {
+ if (featureTreeItemAxisItemProvider != null)
featureTreeItemAxisItemProvider.dispose();
- }
- if (objectTreeItemAxisItemProvider != null) {
+ if (objectTreeItemAxisItemProvider != null)
objectTreeItemAxisItemProvider.dispose();
- }
- if (featureIdAxisItemProvider != null) {
+ if (featureIdAxisItemProvider != null)
featureIdAxisItemProvider.dispose();
- }
- if (featureIdTreeItemAxisItemProvider != null) {
+ if (featureIdTreeItemAxisItemProvider != null)
featureIdTreeItemAxisItemProvider.dispose();
- }
- if (eStructuralFeatureAxisItemProvider != null) {
+ if (eStructuralFeatureAxisItemProvider != null)
eStructuralFeatureAxisItemProvider.dispose();
- }
- if (eStructuralFeatureTreeItemAxisItemProvider != null) {
+ if (eStructuralFeatureTreeItemAxisItemProvider != null)
eStructuralFeatureTreeItemAxisItemProvider.dispose();
- }
- if (objectIdAxisItemProvider != null) {
+ if (objectIdAxisItemProvider != null)
objectIdAxisItemProvider.dispose();
- }
- if (objectIdTreeItemAxisItemProvider != null) {
+ if (objectIdTreeItemAxisItemProvider != null)
objectIdTreeItemAxisItemProvider.dispose();
- }
- if (axisGroupItemProvider != null) {
+ if (axisGroupItemProvider != null)
axisGroupItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
index 98a821641d6..251a2ccbfda 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ObjectAxisItemProvider extends StyledElementItemProvider {
@@ -42,7 +42,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ObjectAxisItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +53,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -71,7 +71,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Manager feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addManagerPropertyDescriptor(Object object) {
@@ -94,7 +94,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Alias feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAliasPropertyDescriptor(Object object) {
@@ -118,7 +118,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -133,7 +133,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -210,7 +210,7 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
index 367eacef8d3..8cdc03a1353 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
@@ -37,7 +37,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +80,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -95,7 +95,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* This returns ObjectIdAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -107,7 +107,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -124,7 +124,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -144,7 +144,7 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
index a90dc8112da..8e90758fc43 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTr
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
@@ -37,7 +37,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ObjectIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This returns ObjectIdTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
index adf21d2b690..443608e9c96 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
@@ -37,7 +37,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This adds a property descriptor for the Parent feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addParentPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This adds a property descriptor for the Expanded feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addExpandedPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This adds a property descriptor for the Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addChildrenPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This returns ObjectTreeItemAxis.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -185,7 +185,7 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
index db581a0dc94..78d168eb778 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {
@@ -44,7 +44,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AbstractHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -55,7 +55,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -75,7 +75,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This adds a property descriptor for the Index Style feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addIndexStylePropertyDescriptor(Object object) {
@@ -98,7 +98,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This adds a property descriptor for the Display Label feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayLabelPropertyDescriptor(Object object) {
@@ -121,7 +121,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This adds a property descriptor for the Display Filter feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayFilterPropertyDescriptor(Object object) {
@@ -144,7 +144,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This adds a property descriptor for the Display Index feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayIndexPropertyDescriptor(Object object) {
@@ -168,7 +168,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -184,7 +184,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -199,7 +199,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -217,7 +217,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -244,7 +244,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -291,7 +291,7 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
index 071c9ac9bac..64ad8c41435 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {
@@ -37,7 +37,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AxisManagerConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -67,7 +67,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Local Header Label Configuration feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addLocalHeaderLabelConfigurationPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Axis Manager feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAxisManagerPropertyDescriptor(Object object) {
@@ -113,7 +113,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Local Specific Configurations feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addLocalSpecificConfigurationsPropertyDescriptor(Object object) {
@@ -136,7 +136,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This returns AxisManagerConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -162,7 +162,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -176,7 +176,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
index 70458ead0de..8893038420c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AxisManagerRepresentationItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -71,7 +71,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This adds a property descriptor for the Axis Manager Id feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAxisManagerIdPropertyDescriptor(Object object) {
@@ -94,7 +94,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This adds a property descriptor for the Label Provider Context feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addLabelProviderContextPropertyDescriptor(Object object) {
@@ -117,7 +117,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This adds a property descriptor for the Header Label Configuration feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addHeaderLabelConfigurationPropertyDescriptor(Object object) {
@@ -140,7 +140,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This adds a property descriptor for the Specific Axis Configurations feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addSpecificAxisConfigurationsPropertyDescriptor(Object object) {
@@ -163,7 +163,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This returns AxisManagerRepresentation.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -175,7 +175,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -192,7 +192,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -213,7 +213,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -225,7 +225,7 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
index c1c007b7c42..a5fcb2e8654 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {
@@ -37,7 +37,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EStructuralFeatureValueFillingConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* This adds a property descriptor for the Listen Feature feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addListenFeaturePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* This returns EStructuralFeatureValueFillingConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -114,7 +114,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -128,7 +128,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -140,7 +140,7 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
index 8a2f0837ab1..e0034630182 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -68,7 +68,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Show Only Common Feature feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addShowOnlyCommonFeaturePropertyDescriptor(Object object) {
@@ -91,7 +91,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* This returns FeatureAxisConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -103,7 +103,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -118,7 +118,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -150,7 +150,7 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
index 1691cfa9854..4ae147740f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPasteConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Post Actions feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addPostActionsPropertyDescriptor(Object object) {
@@ -92,7 +92,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Detached Mode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDetachedModePropertyDescriptor(Object object) {
@@ -115,7 +115,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This returns IPasteConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -127,7 +127,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -142,7 +142,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -163,7 +163,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -175,7 +175,7 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
index dd29cbeff68..a153cbb618b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {
@@ -38,7 +38,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -49,7 +49,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +66,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -81,7 +81,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -96,7 +96,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* This returns LocalTableHeaderAxisConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -108,7 +108,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -126,7 +126,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -146,7 +146,7 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
index 9358da6135f..ca1dcf8c9b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationItemProviderAdapterFactory extends NattableaxisconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* 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>();
@@ -73,7 +73,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisconfigurationItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected AxisManagerRepresentationItemProvider axisManagerRepresentationItemProvider;
@@ -97,7 +97,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected AxisManagerConfigurationItemProvider axisManagerConfigurationItemProvider;
@@ -122,7 +122,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableHeaderAxisConfigurationItemProvider tableHeaderAxisConfigurationItemProvider;
@@ -147,7 +147,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -163,7 +163,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected LocalTableHeaderAxisConfigurationItemProvider localTableHeaderAxisConfigurationItemProvider;
@@ -172,7 +172,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -188,7 +188,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FeatureAxisConfigurationItemProvider featureAxisConfigurationItemProvider;
@@ -197,7 +197,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -213,7 +213,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EStructuralFeatureValueFillingConfigurationItemProvider eStructuralFeatureValueFillingConfigurationItemProvider;
@@ -222,7 +222,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -238,7 +238,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPasteConfigurationItemProvider iPasteConfigurationItemProvider;
@@ -247,7 +247,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -263,7 +263,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected PasteEObjectConfigurationItemProvider pasteEObjectConfigurationItemProvider;
@@ -272,7 +272,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -288,7 +288,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeFillingConfigurationItemProvider treeFillingConfigurationItemProvider;
@@ -297,7 +297,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -313,7 +313,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -325,7 +325,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -336,7 +336,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -348,7 +348,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -359,7 +359,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -378,7 +378,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -390,7 +390,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -402,7 +402,7 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -418,38 +418,29 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (axisManagerRepresentationItemProvider != null) {
+ if (axisManagerRepresentationItemProvider != null)
axisManagerRepresentationItemProvider.dispose();
- }
- if (axisManagerConfigurationItemProvider != null) {
+ if (axisManagerConfigurationItemProvider != null)
axisManagerConfigurationItemProvider.dispose();
- }
- if (tableHeaderAxisConfigurationItemProvider != null) {
+ if (tableHeaderAxisConfigurationItemProvider != null)
tableHeaderAxisConfigurationItemProvider.dispose();
- }
- if (localTableHeaderAxisConfigurationItemProvider != null) {
+ if (localTableHeaderAxisConfigurationItemProvider != null)
localTableHeaderAxisConfigurationItemProvider.dispose();
- }
- if (featureAxisConfigurationItemProvider != null) {
+ if (featureAxisConfigurationItemProvider != null)
featureAxisConfigurationItemProvider.dispose();
- }
- if (eStructuralFeatureValueFillingConfigurationItemProvider != null) {
+ if (eStructuralFeatureValueFillingConfigurationItemProvider != null)
eStructuralFeatureValueFillingConfigurationItemProvider.dispose();
- }
- if (iPasteConfigurationItemProvider != null) {
+ if (iPasteConfigurationItemProvider != null)
iPasteConfigurationItemProvider.dispose();
- }
- if (pasteEObjectConfigurationItemProvider != null) {
+ if (pasteEObjectConfigurationItemProvider != null)
pasteEObjectConfigurationItemProvider.dispose();
- }
- if (treeFillingConfigurationItemProvider != null) {
+ if (treeFillingConfigurationItemProvider != null)
treeFillingConfigurationItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
index 3f14b0ad106..a60b9d1552d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationItemProvider {
@@ -37,7 +37,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public PasteEObjectConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +66,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This adds a property descriptor for the Pasted Element Id feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addPastedElementIdPropertyDescriptor(Object object) {
@@ -89,7 +89,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This adds a property descriptor for the Paste Element Containement Feature feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addPasteElementContainementFeaturePropertyDescriptor(Object object) {
@@ -112,7 +112,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This returns PasteEObjectConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -124,7 +124,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -139,7 +139,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -159,7 +159,7 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
index 629314c31fa..8e9bc4eb0ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {
@@ -38,7 +38,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -49,7 +49,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +66,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -81,7 +81,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -96,7 +96,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* This returns TableHeaderAxisConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -108,7 +108,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -126,7 +126,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -146,7 +146,7 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
index 4713c2ec3e6..592eb6d760b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {
@@ -42,7 +42,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TreeFillingConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +53,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -73,7 +73,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Paste Configuration feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addPasteConfigurationPropertyDescriptor(Object object) {
@@ -96,7 +96,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Depth feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDepthPropertyDescriptor(Object object) {
@@ -119,7 +119,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Label Provider feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addLabelProviderPropertyDescriptor(Object object) {
@@ -142,7 +142,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This adds a property descriptor for the Label Provider Context feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addLabelProviderContextPropertyDescriptor(Object object) {
@@ -166,7 +166,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -196,7 +196,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This returns TreeFillingConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -208,7 +208,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -223,7 +223,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -247,7 +247,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -319,7 +319,7 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
index 7b9d01e85ad..ce87559a57c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {
@@ -36,7 +36,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {
@@ -47,7 +47,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -63,7 +63,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +80,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -94,7 +94,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -106,7 +106,7 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
index 1d60805e919..0a685b8ab14 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
@@ -37,7 +37,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AxisProviderItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +80,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -95,7 +95,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -112,7 +112,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -132,7 +132,7 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
index a5eb67dda67..928472f682c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvider {
@@ -37,7 +37,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public MasterObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* This adds a property descriptor for the Disconnect Slave feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisconnectSlavePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* This returns MasterObjectAxisProvider.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -117,7 +117,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -137,7 +137,7 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
index 850164d2d7c..bccee771475 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ut
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderItemProviderAdapterFactory extends NattableaxisproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* 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>();
@@ -73,7 +73,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisproviderItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected SlaveObjectAxisProviderItemProvider slaveObjectAxisProviderItemProvider;
@@ -97,7 +97,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MasterObjectAxisProviderItemProvider masterObjectAxisProviderItemProvider;
@@ -122,7 +122,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -150,7 +150,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -161,7 +161,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -173,7 +173,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -184,7 +184,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -203,7 +203,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -215,7 +215,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -227,7 +227,7 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -243,17 +243,15 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (slaveObjectAxisProviderItemProvider != null) {
+ if (slaveObjectAxisProviderItemProvider != null)
slaveObjectAxisProviderItemProvider.dispose();
- }
- if (masterObjectAxisProviderItemProvider != null) {
+ if (masterObjectAxisProviderItemProvider != null)
masterObjectAxisProviderItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
index bead371ad1d..20a51bb4690 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvider {
@@ -33,7 +33,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {
@@ -44,7 +44,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -60,7 +60,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* This returns SlaveObjectAxisProvider.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -72,7 +72,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -89,7 +89,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -103,7 +103,7 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
index aef8861506a..195e652efba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class CellItemProvider extends EModelElementItemProvider {
@@ -41,7 +41,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public CellItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -86,7 +86,7 @@ public class CellItemProvider extends EModelElementItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -101,7 +101,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* This returns Cell.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -127,7 +127,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -149,7 +149,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -214,7 +214,7 @@ public class CellItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
index 8d3c57e16be..734e339865a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
@@ -37,7 +37,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EObjectAxisWrapperItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Element feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addElementPropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns EObjectAxisWrapper.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -114,7 +114,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -128,7 +128,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -140,7 +140,7 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
index 4de3c9180d5..354443d2ba5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
@@ -40,7 +40,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IdAxisWrapperItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -68,7 +68,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Element feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addElementPropertyDescriptor(Object object) {
@@ -91,7 +91,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns IdAxisWrapper.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -103,7 +103,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -120,7 +120,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -140,7 +140,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -152,7 +152,7 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
index 91b283ba555..f9e4df9727b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.Natta
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* 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>();
@@ -73,7 +73,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablecellItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected CellItemProvider cellItemProvider;
@@ -97,7 +97,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObjectAxisWrapperItemProvider eObjectAxisWrapperItemProvider;
@@ -122,7 +122,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IdAxisWrapperItemProvider idAxisWrapperItemProvider;
@@ -147,7 +147,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -163,7 +163,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -175,7 +175,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -186,7 +186,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -198,7 +198,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -209,7 +209,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -228,7 +228,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -240,7 +240,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -252,7 +252,7 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -268,20 +268,17 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (cellItemProvider != null) {
+ if (cellItemProvider != null)
cellItemProvider.dispose();
- }
- if (eObjectAxisWrapperItemProvider != null) {
+ if (eObjectAxisWrapperItemProvider != null)
eObjectAxisWrapperItemProvider.dispose();
- }
- if (idAxisWrapperItemProvider != null) {
+ if (idAxisWrapperItemProvider != null)
idAxisWrapperItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
index e0a4539b6c0..7592e857dfb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.u
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationItemProviderAdapterFactory extends NattableconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* 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>();
@@ -73,7 +73,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableconfigurationItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableConfigurationItemProvider tableConfigurationItemProvider;
@@ -97,7 +97,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -125,7 +125,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -159,7 +159,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -178,7 +178,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -190,7 +190,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -202,7 +202,7 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -218,14 +218,13 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (tableConfigurationItemProvider != null) {
+ if (tableConfigurationItemProvider != null)
tableConfigurationItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
index 9e1a2b8ff73..0aceb4490a8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TableConfigurationItemProvider extends TableNamedElementItemProvider {
@@ -41,7 +41,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TableConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -73,7 +73,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This adds a property descriptor for the Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addTypePropertyDescriptor(Object object) {
@@ -96,7 +96,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This adds a property descriptor for the Icon Path feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addIconPathPropertyDescriptor(Object object) {
@@ -119,7 +119,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This adds a property descriptor for the Cell Editor Declaration feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addCellEditorDeclarationPropertyDescriptor(Object object) {
@@ -142,7 +142,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This adds a property descriptor for the Default Row Axis Provider feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDefaultRowAxisProviderPropertyDescriptor(Object object) {
@@ -165,7 +165,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This adds a property descriptor for the Default Column Axis Provider feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDefaultColumnAxisProviderPropertyDescriptor(Object object) {
@@ -189,7 +189,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -208,7 +208,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -223,7 +223,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This returns TableConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -235,7 +235,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -252,7 +252,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -281,7 +281,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -328,7 +328,7 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
* This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
index aecb80b9ba6..70454152faa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TableNamedElementItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TableNamedElementItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Description feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDescriptionPropertyDescriptor(Object object) {
@@ -92,7 +92,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
@@ -115,7 +115,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -132,7 +132,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -153,7 +153,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -165,7 +165,7 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
index b927250363b..8f705ae58ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {
@@ -37,7 +37,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FeatureLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -68,7 +68,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This adds a property descriptor for the Display Is Derived feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayIsDerivedPropertyDescriptor(Object object) {
@@ -91,7 +91,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This adds a property descriptor for the Display Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayTypePropertyDescriptor(Object object) {
@@ -114,7 +114,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This adds a property descriptor for the Display Multiplicity feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayMultiplicityPropertyDescriptor(Object object) {
@@ -137,7 +137,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This adds a property descriptor for the Display Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayNamePropertyDescriptor(Object object) {
@@ -160,7 +160,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This returns FeatureLabelProviderConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -172,7 +172,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -187,7 +187,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -210,7 +210,7 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
index a06e34737ef..87fc533c3f0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.u
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderItemProviderAdapterFactory extends NattablelabelproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* 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>();
@@ -73,7 +73,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablelabelproviderItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FeatureLabelProviderConfigurationItemProvider featureLabelProviderConfigurationItemProvider;
@@ -97,7 +97,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ObjectLabelProviderConfigurationItemProvider objectLabelProviderConfigurationItemProvider;
@@ -122,7 +122,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -150,7 +150,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -161,7 +161,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -173,7 +173,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -184,7 +184,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -203,7 +203,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -215,7 +215,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -227,7 +227,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -243,17 +243,15 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (featureLabelProviderConfigurationItemProvider != null) {
+ if (featureLabelProviderConfigurationItemProvider != null)
featureLabelProviderConfigurationItemProvider.dispose();
- }
- if (objectLabelProviderConfigurationItemProvider != null) {
+ if (objectLabelProviderConfigurationItemProvider != null)
objectLabelProviderConfigurationItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
index 2c09c1b11fa..2a36a1e2e84 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {
@@ -40,7 +40,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This adds a property descriptor for the Display Icon feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayIconPropertyDescriptor(Object object) {
@@ -92,7 +92,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This adds a property descriptor for the Display Label feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayLabelPropertyDescriptor(Object object) {
@@ -115,7 +115,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This returns ObjectLabelProviderConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -127,7 +127,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -142,7 +142,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -163,7 +163,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -175,7 +175,7 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
index 2cec3d71b60..031affbb6bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.Na
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemItemProviderAdapterFactory extends NattableproblemAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* 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>();
@@ -73,7 +73,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableproblemItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ProblemItemProvider problemItemProvider;
@@ -97,7 +97,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected StringResolutionProblemItemProvider stringResolutionProblemItemProvider;
@@ -122,7 +122,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -138,7 +138,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -150,7 +150,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -161,7 +161,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -173,7 +173,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -184,7 +184,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -203,7 +203,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -215,7 +215,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -227,7 +227,7 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -243,17 +243,15 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (problemItemProvider != null) {
+ if (problemItemProvider != null)
problemItemProvider.dispose();
- }
- if (stringResolutionProblemItemProvider != null) {
+ if (stringResolutionProblemItemProvider != null)
stringResolutionProblemItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
index bdd052e1bb7..55e087c7d29 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ProblemItemProvider extends TableNamedElementItemProvider {
@@ -36,7 +36,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ProblemItemProvider(AdapterFactory adapterFactory) {
@@ -47,7 +47,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -63,7 +63,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* This returns Problem.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -75,7 +75,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -92,7 +92,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -106,7 +106,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -118,7 +118,7 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
index bc3d8f9707e..5b96d0f7488 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class StringResolutionProblemItemProvider extends ProblemItemProvider {
@@ -37,7 +37,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public StringResolutionProblemItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +66,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This adds a property descriptor for the Value As String feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addValueAsStringPropertyDescriptor(Object object) {
@@ -89,7 +89,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This adds a property descriptor for the Unresolved String feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addUnresolvedStringPropertyDescriptor(Object object) {
@@ -112,7 +112,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This returns StringResolutionProblem.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -124,7 +124,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -141,7 +141,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -162,7 +162,7 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
index 6f371eccdb7..ddd5b6e1f27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public BooleanListValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Boolean List Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addBooleanListValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns BooleanListValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
index 94d941eb4be..b86105f69f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public BooleanValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Boolean Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addBooleanValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* This returns BooleanValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
index 61c9dbbc323..53b84a00e1d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class CellTextStyleItemProvider extends EModelElementItemProvider {
@@ -41,7 +41,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public CellTextStyleItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Alignment feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAlignmentPropertyDescriptor(Object object) {
@@ -92,7 +92,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* This returns CellTextStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -104,7 +104,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -121,7 +121,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -141,7 +141,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -153,7 +153,7 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
index 15fafd80aba..53efca4085b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DoubleListValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Double List Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDoubleListValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns DoubleListValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
index e0c31f633fd..52bcc20de40 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DoubleValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Double Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDoubleValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* This returns DoubleValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java
new file mode 100755
index 00000000000..a0a947c3c69
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EObjectListValueStyleItemProvider(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);
+
+ addEObjectValuePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the EObject Value feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addEObjectValuePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_EObjectListValueStyle_eObjectValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_EObjectListValueStyle_eObjectValue_feature", "_UI_EObjectListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ NattablestylePackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns EObjectListValueStyle.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectListValueStyle")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((EObjectListValueStyle) object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_EObjectListValueStyle_type") : //$NON-NLS-1$
+ getString("_UI_EObjectListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+
+ /**
+ * 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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java
new file mode 100755
index 00000000000..6a11af72b16
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EObjectValueStyleItemProvider(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);
+
+ addEObjectValuePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the EObject Value feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addEObjectValuePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_EObjectValueStyle_eObjectValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_EObjectValueStyle_eObjectValue_feature", "_UI_EObjectValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ NattablestylePackage.Literals.EOBJECT_VALUE_STYLE__EOBJECT_VALUE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns EObjectValueStyle.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectValueStyle")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((EObjectValueStyle) object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_EObjectValueStyle_type") : //$NON-NLS-1$
+ getString("_UI_EObjectValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+
+ /**
+ * 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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
index 5c5cda81b2d..799478996de 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FontStyleItemProvider extends EModelElementItemProvider {
@@ -40,7 +40,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FontStyleItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -74,7 +74,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Font Color feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addFontColorPropertyDescriptor(Object object) {
@@ -97,7 +97,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Font Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addFontNamePropertyDescriptor(Object object) {
@@ -120,7 +120,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Font Height feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addFontHeightPropertyDescriptor(Object object) {
@@ -143,7 +143,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Bold feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addBoldPropertyDescriptor(Object object) {
@@ -166,7 +166,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Italic feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addItalicPropertyDescriptor(Object object) {
@@ -189,7 +189,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Underline feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addUnderlinePropertyDescriptor(Object object) {
@@ -212,7 +212,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Strike Through feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addStrikeThroughPropertyDescriptor(Object object) {
@@ -235,7 +235,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This returns FontStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -247,7 +247,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -263,7 +263,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -289,7 +289,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -301,7 +301,7 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
index 03375b7f76f..33cf11dd581 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IntListValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Int List Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addIntListValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns IntListValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
index 7afdf9cd38f..4f9256a2220 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class IntValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IntValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the Int Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addIntValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* This returns IntValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
index 5c5c02371cf..54e306d97d5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NamedStyleItemProvider extends EModelElementItemProvider {
@@ -40,7 +40,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NamedStyleItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -68,7 +68,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
@@ -91,7 +91,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* This returns NamedStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -103,7 +103,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -119,7 +119,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -139,7 +139,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -151,7 +151,7 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
index 078480895ad..b112ee8d917 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.Natt
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -47,7 +47,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -56,7 +56,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -65,7 +65,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* 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>();
@@ -74,7 +74,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablestyleItemProviderAdapterFactory() {
@@ -89,7 +89,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NamedStyleItemProvider namedStyleItemProvider;
@@ -98,7 +98,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -114,7 +114,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected FontStyleItemProvider fontStyleItemProvider;
@@ -123,7 +123,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -139,7 +139,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected CellTextStyleItemProvider cellTextStyleItemProvider;
@@ -148,7 +148,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -164,7 +164,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IntValueStyleItemProvider intValueStyleItemProvider;
@@ -173,7 +173,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -189,7 +189,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IntListValueStyleItemProvider intListValueStyleItemProvider;
@@ -198,7 +198,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -214,7 +214,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected BooleanValueStyleItemProvider booleanValueStyleItemProvider;
@@ -223,7 +223,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -239,7 +239,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected BooleanListValueStyleItemProvider booleanListValueStyleItemProvider;
@@ -248,7 +248,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -264,7 +264,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected DoubleValueStyleItemProvider doubleValueStyleItemProvider;
@@ -273,7 +273,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -289,7 +289,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected DoubleListValueStyleItemProvider doubleListValueStyleItemProvider;
@@ -298,7 +298,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -314,7 +314,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected StringValueStyleItemProvider stringValueStyleItemProvider;
@@ -323,7 +323,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -339,7 +339,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected StringListValueStyleItemProvider stringListValueStyleItemProvider;
@@ -348,7 +348,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -364,7 +364,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableDisplayStyleItemProvider tableDisplayStyleItemProvider;
@@ -373,7 +373,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -386,10 +386,60 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected EObjectValueStyleItemProvider eObjectValueStyleItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createEObjectValueStyleAdapter() {
+ if (eObjectValueStyleItemProvider == null) {
+ eObjectValueStyleItemProvider = new EObjectValueStyleItemProvider(this);
+ }
+
+ return eObjectValueStyleItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected EObjectListValueStyleItemProvider eObjectListValueStyleItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createEObjectListValueStyleAdapter() {
+ if (eObjectListValueStyleItemProvider == null) {
+ eObjectListValueStyleItemProvider = new EObjectListValueStyleItemProvider(this);
+ }
+
+ return eObjectListValueStyleItemProvider;
+ }
+
+ /**
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -401,7 +451,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -412,7 +462,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -424,7 +474,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -435,7 +485,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -454,7 +504,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -466,7 +516,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -478,7 +528,7 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -494,46 +544,38 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (namedStyleItemProvider != null) {
+ if (namedStyleItemProvider != null)
namedStyleItemProvider.dispose();
- }
- if (fontStyleItemProvider != null) {
+ if (fontStyleItemProvider != null)
fontStyleItemProvider.dispose();
- }
- if (cellTextStyleItemProvider != null) {
+ if (cellTextStyleItemProvider != null)
cellTextStyleItemProvider.dispose();
- }
- if (intValueStyleItemProvider != null) {
+ if (intValueStyleItemProvider != null)
intValueStyleItemProvider.dispose();
- }
- if (intListValueStyleItemProvider != null) {
+ if (intListValueStyleItemProvider != null)
intListValueStyleItemProvider.dispose();
- }
- if (booleanValueStyleItemProvider != null) {
+ if (booleanValueStyleItemProvider != null)
booleanValueStyleItemProvider.dispose();
- }
- if (booleanListValueStyleItemProvider != null) {
+ if (booleanListValueStyleItemProvider != null)
booleanListValueStyleItemProvider.dispose();
- }
- if (doubleValueStyleItemProvider != null) {
+ if (doubleValueStyleItemProvider != null)
doubleValueStyleItemProvider.dispose();
- }
- if (doubleListValueStyleItemProvider != null) {
+ if (doubleListValueStyleItemProvider != null)
doubleListValueStyleItemProvider.dispose();
- }
- if (stringValueStyleItemProvider != null) {
+ if (stringValueStyleItemProvider != null)
stringValueStyleItemProvider.dispose();
- }
- if (stringListValueStyleItemProvider != null) {
+ if (stringListValueStyleItemProvider != null)
stringListValueStyleItemProvider.dispose();
- }
- if (tableDisplayStyleItemProvider != null) {
+ if (tableDisplayStyleItemProvider != null)
tableDisplayStyleItemProvider.dispose();
- }
+ if (eObjectValueStyleItemProvider != null)
+ eObjectValueStyleItemProvider.dispose();
+ if (eObjectListValueStyleItemProvider != null)
+ eObjectListValueStyleItemProvider.dispose();
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
index 04bd31668ca..7b157b897bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringLis
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public StringListValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the String List Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addStringListValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns StringListValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
index e4bc96042c6..734a78fe206 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringVal
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class StringValueStyleItemProvider extends NamedStyleItemProvider {
@@ -37,7 +37,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public StringValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* This adds a property descriptor for the String Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addStringValuePropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* This returns StringValueStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -116,7 +116,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
index a6699c95241..283e9721403 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class StyledElementItemProvider extends EModelElementItemProvider {
@@ -40,7 +40,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public StyledElementItemProvider(AdapterFactory adapterFactory) {
@@ -51,7 +51,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -68,7 +68,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -83,7 +83,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -98,7 +98,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -111,7 +111,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -131,7 +131,7 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -197,13 +197,23 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
(createChildParameter
(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+ NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+ NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));
}
/**
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
index 7fe4f319c46..9234ece2439 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
@@ -41,7 +41,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TableDisplayStyleItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -69,7 +69,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* This adds a property descriptor for the Display Style feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addDisplayStylePropertyDescriptor(Object object) {
@@ -92,7 +92,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* This returns TableDisplayStyle.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -104,7 +104,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -121,7 +121,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -141,7 +141,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -153,7 +153,7 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
index 22ce05fbb30..01b937709f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
@@ -35,7 +35,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AbstractTableTesterItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -62,7 +62,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -76,7 +76,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -90,7 +90,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -102,7 +102,7 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
index bd9589c4aa2..866f2d99834 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider {
@@ -37,7 +37,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +65,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* This adds a property descriptor for the Tester feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addTesterPropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* This returns JavaTableTester.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -100,7 +100,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -117,7 +117,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -137,7 +137,7 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
index 10612ae4848..d7af2f8972a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.Nat
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* 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>();
@@ -73,7 +73,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattabletesterItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected JavaTableTesterItemProvider javaTableTesterItemProvider;
@@ -97,7 +97,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -125,7 +125,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -159,7 +159,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -178,7 +178,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -190,7 +190,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -202,7 +202,7 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -218,14 +218,13 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (javaTableTesterItemProvider != null) {
+ if (javaTableTesterItemProvider != null)
javaTableTesterItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
index 531be7dac86..5f16b2feff7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
* This is the central singleton for the Nattable edit plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public final class NattableEditPlugin extends EMFPlugin {
@@ -29,7 +29,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final NattableEditPlugin INSTANCE = new NattableEditPlugin();
@@ -38,7 +38,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private static Implementation plugin;
@@ -47,7 +47,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Create the instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableEditPlugin() {
@@ -60,7 +60,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @return the singleton instance.
* @generated
*/
@@ -73,7 +73,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @return the singleton instance.
* @generated
*/
@@ -85,7 +85,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static class Implementation extends EclipsePlugin {
@@ -94,7 +94,7 @@ public final class NattableEditPlugin extends EMFPlugin {
* Creates an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Implementation() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
index a2ea21a2c18..0a71092abec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFac
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableItemProviderAdapterFactory extends NattableAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -46,7 +46,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* 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>();
@@ -73,7 +73,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableItemProvider tableItemProvider;
@@ -97,7 +97,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -113,7 +113,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -125,7 +125,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -136,7 +136,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -148,7 +148,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -159,7 +159,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -178,7 +178,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -190,7 +190,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -202,7 +202,7 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -218,14 +218,13 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
* This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
public void dispose() {
- if (tableItemProvider != null) {
+ if (tableItemProvider != null)
tableItemProvider.dispose();
- }
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
index 0eef2ceb734..eeaf0622f1b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.p
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class TableItemProvider extends TableNamedElementItemProvider {
@@ -43,7 +43,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public TableItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -77,7 +77,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Context feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addContextPropertyDescriptor(Object object) {
@@ -100,7 +100,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Owner feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addOwnerPropertyDescriptor(Object object) {
@@ -123,7 +123,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Prototype feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addPrototypePropertyDescriptor(Object object) {
@@ -146,7 +146,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Table Configuration feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addTableConfigurationPropertyDescriptor(Object object) {
@@ -169,7 +169,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Invert Axis feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addInvertAxisPropertyDescriptor(Object object) {
@@ -192,7 +192,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Current Row Axis Provider feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addCurrentRowAxisProviderPropertyDescriptor(Object object) {
@@ -215,7 +215,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This adds a property descriptor for the Current Column Axis Provider feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addCurrentColumnAxisProviderPropertyDescriptor(Object object) {
@@ -239,7 +239,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -258,7 +258,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -273,7 +273,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This returns Table.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -285,7 +285,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -302,7 +302,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -329,7 +329,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -376,7 +376,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -401,7 +401,7 @@ public class TableItemProvider extends TableNamedElementItemProvider {
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
index 5cf99b8d514..de118b091ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
META-INF/,\
plugin.xml,\
plugin.properties,\
- plugin.pdoc,\
about.html
jars.compile.order = .
source.. = src-gen/,\
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
deleted file mode 100644
index 0f9d81c7a7c..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the editor to create table configuration.">
- <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index f508110888f..1355b9c971a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -9,7 +9,7 @@
# Contributors:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
-pluginName = Papyrus Nattable Model
+pluginName = Nattable Editor
providerName = Eclipse Modeling Project
_UI_NattableEditor_menu = &Nattable Editor
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
index 2757571e89e..41214376a76 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattableaxis model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattableaxisActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattableaxisActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattableaxisActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattableaxisActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattableaxisActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattableaxisActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattableaxisActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattableaxisActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattableaxisActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattableaxisActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattableaxisActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
index bd3c0c03c05..033826d6ab3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattableaxis model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisEditor
@@ -155,7 +155,7 @@ public class NattableaxisEditor
* 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;
@@ -164,7 +164,7 @@ public class NattableaxisEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisEditor
* 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;
@@ -228,7 +228,7 @@ public class NattableaxisEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisEditor
* 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;
@@ -284,7 +284,7 @@ public class NattableaxisEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattableaxisEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattableaxisEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattableaxisEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattableaxisEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattableaxisEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattableaxisEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattableaxisEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattableaxisEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattableaxisEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattableaxisEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattableaxisEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattableaxisEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattableaxisEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattableaxisEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattableaxisEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattableaxisEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattableaxisEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattableaxisEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattableaxisEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattableaxisEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
index 5b12c4a57ec..7133cfb3ec4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();
@@ -121,7 +121,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* 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;
@@ -166,7 +166,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -204,7 +204,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
index 4ab4e823707..fa0324020f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattableaxisconfiguration model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisconfigurationActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisconfigurationActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisconfigurationActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisconfigurationActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisconfigurationActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisconfigurationActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattableaxisconfigurationActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisconfigurationActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattableaxisconfigurationActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisconfigurationActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisconfigurationActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattableaxisconfigurationActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattableaxisconfigurationActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattableaxisconfigurationActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattableaxisconfigurationActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattableaxisconfigurationActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisconfigurationActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisconfigurationActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattableaxisconfigurationActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattableaxisconfigurationActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattableaxisconfigurationActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattableaxisconfigurationActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
index a5ceda31e94..501d6d5e561 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattableaxisconfiguration model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationEditor
@@ -155,7 +155,7 @@ public class NattableaxisconfigurationEditor
* 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;
@@ -164,7 +164,7 @@ public class NattableaxisconfigurationEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisconfigurationEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisconfigurationEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisconfigurationEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisconfigurationEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisconfigurationEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisconfigurationEditor
* 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;
@@ -228,7 +228,7 @@ public class NattableaxisconfigurationEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisconfigurationEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisconfigurationEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisconfigurationEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisconfigurationEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisconfigurationEditor
* 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;
@@ -284,7 +284,7 @@ public class NattableaxisconfigurationEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisconfigurationEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattableaxisconfigurationEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisconfigurationEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisconfigurationEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisconfigurationEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattableaxisconfigurationEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisconfigurationEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisconfigurationEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisconfigurationEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattableaxisconfigurationEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisconfigurationEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisconfigurationEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattableaxisconfigurationEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattableaxisconfigurationEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattableaxisconfigurationEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisconfigurationEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisconfigurationEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisconfigurationEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisconfigurationEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisconfigurationEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisconfigurationEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisconfigurationEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisconfigurationEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisconfigurationEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisconfigurationEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattableaxisconfigurationEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattableaxisconfigurationEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisconfigurationEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattableaxisconfigurationEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisconfigurationEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisconfigurationEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattableaxisconfigurationEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattableaxisconfigurationEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattableaxisconfigurationEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattableaxisconfigurationEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisconfigurationEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisconfigurationEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattableaxisconfigurationEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattableaxisconfigurationEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisconfigurationEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisconfigurationEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisconfigurationEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisconfigurationEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisconfigurationEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattableaxisconfigurationEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisconfigurationEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattableaxisconfigurationEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisconfigurationEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisconfigurationEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattableaxisconfigurationEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisconfigurationEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisconfigurationEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisconfigurationEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisconfigurationEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattableaxisconfigurationEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattableaxisconfigurationEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisconfigurationEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
index 148e151ec09..d9c52472899 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();
@@ -121,7 +121,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* 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;
@@ -166,7 +166,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* 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() {
@@ -204,7 +204,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
index e5046a67636..e42fe9dd204 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattableaxisprovider model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisproviderActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisproviderActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisproviderActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisproviderActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisproviderActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisproviderActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattableaxisproviderActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisproviderActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattableaxisproviderActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisproviderActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisproviderActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattableaxisproviderActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattableaxisproviderActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattableaxisproviderActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattableaxisproviderActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattableaxisproviderActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisproviderActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisproviderActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattableaxisproviderActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattableaxisproviderActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattableaxisproviderActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattableaxisproviderActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index f4dd647f0fd..b9686e4c796 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattableaxisprovider model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderEditor
@@ -155,7 +155,7 @@ public class NattableaxisproviderEditor
* 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;
@@ -164,7 +164,7 @@ public class NattableaxisproviderEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisproviderEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisproviderEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisproviderEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisproviderEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisproviderEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisproviderEditor
* 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;
@@ -228,7 +228,7 @@ public class NattableaxisproviderEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisproviderEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisproviderEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisproviderEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisproviderEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisproviderEditor
* 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;
@@ -284,7 +284,7 @@ public class NattableaxisproviderEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisproviderEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattableaxisproviderEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisproviderEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisproviderEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisproviderEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattableaxisproviderEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisproviderEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisproviderEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisproviderEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattableaxisproviderEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisproviderEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisproviderEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattableaxisproviderEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattableaxisproviderEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattableaxisproviderEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisproviderEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisproviderEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisproviderEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisproviderEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisproviderEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisproviderEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisproviderEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisproviderEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisproviderEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisproviderEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattableaxisproviderEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattableaxisproviderEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisproviderEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattableaxisproviderEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisproviderEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisproviderEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattableaxisproviderEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattableaxisproviderEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattableaxisproviderEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattableaxisproviderEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisproviderEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisproviderEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattableaxisproviderEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattableaxisproviderEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisproviderEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisproviderEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisproviderEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisproviderEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisproviderEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattableaxisproviderEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisproviderEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattableaxisproviderEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisproviderEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisproviderEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattableaxisproviderEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisproviderEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisproviderEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisproviderEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisproviderEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattableaxisproviderEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattableaxisproviderEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisproviderEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
index 56680aac045..83c8bfb67e0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();
@@ -121,7 +121,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* 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;
@@ -166,7 +166,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* 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() {
@@ -204,7 +204,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableaxisproviderModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
index 517fd5fb037..79962db236f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattablecell model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellActionBarContributor
@@ -59,7 +59,7 @@ public class NattablecellActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablecellActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablecellActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablecellActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablecellActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablecellActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattablecellActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablecellActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattablecellActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablecellActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablecellActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattablecellActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattablecellActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattablecellActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattablecellActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattablecellActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablecellActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablecellActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattablecellActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattablecellActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattablecellActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattablecellActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
index f111075f36e..471d8f5412a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattablecell model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellEditor
@@ -155,7 +155,7 @@ public class NattablecellEditor
* 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;
@@ -164,7 +164,7 @@ public class NattablecellEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablecellEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablecellEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablecellEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablecellEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablecellEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablecellEditor
* 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;
@@ -228,7 +228,7 @@ public class NattablecellEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablecellEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablecellEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablecellEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablecellEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablecellEditor
* 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;
@@ -284,7 +284,7 @@ public class NattablecellEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablecellEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattablecellEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablecellEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablecellEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablecellEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattablecellEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablecellEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablecellEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablecellEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattablecellEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablecellEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablecellEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattablecellEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattablecellEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattablecellEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablecellEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablecellEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {
@@ -563,7 +552,7 @@ public class NattablecellEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablecellEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablecellEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablecellEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablecellEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablecellEditor() {
@@ -717,7 +706,7 @@ public class NattablecellEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablecellEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattablecellEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattablecellEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablecellEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattablecellEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablecellEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablecellEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattablecellEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattablecellEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattablecellEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattablecellEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablecellEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattablecellEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattablecellEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattablecellEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablecellEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablecellEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattablecellEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablecellEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablecellEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattablecellEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablecellEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattablecellEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattablecellEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattablecellEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattablecellEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattablecellEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattablecellEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattablecellEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattablecellEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattablecellEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattablecellEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablecellEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattablecellEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattablecellEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablecellEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattablecellEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
index 61ce331eb74..a6cf0fb8100 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();
@@ -121,7 +121,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* 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;
@@ -166,7 +166,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -204,7 +204,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablecellModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablecellModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
index ac4f577a4cf..4a46a9f69f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattableconfiguration model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationActionBarContributor
@@ -59,7 +59,7 @@ public class NattableconfigurationActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableconfigurationActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableconfigurationActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableconfigurationActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableconfigurationActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableconfigurationActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattableconfigurationActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableconfigurationActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattableconfigurationActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableconfigurationActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableconfigurationActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattableconfigurationActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattableconfigurationActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattableconfigurationActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattableconfigurationActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattableconfigurationActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableconfigurationActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableconfigurationActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattableconfigurationActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattableconfigurationActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattableconfigurationActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattableconfigurationActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index f108a6742a2..aec5e90b166 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattableconfiguration model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationEditor
@@ -155,7 +155,7 @@ public class NattableconfigurationEditor
* 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;
@@ -164,7 +164,7 @@ public class NattableconfigurationEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableconfigurationEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableconfigurationEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableconfigurationEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableconfigurationEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableconfigurationEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableconfigurationEditor
* 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;
@@ -228,7 +228,7 @@ public class NattableconfigurationEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableconfigurationEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableconfigurationEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableconfigurationEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableconfigurationEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableconfigurationEditor
* 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;
@@ -284,7 +284,7 @@ public class NattableconfigurationEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableconfigurationEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattableconfigurationEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableconfigurationEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableconfigurationEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableconfigurationEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattableconfigurationEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableconfigurationEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableconfigurationEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableconfigurationEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattableconfigurationEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableconfigurationEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableconfigurationEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattableconfigurationEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattableconfigurationEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattableconfigurationEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableconfigurationEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableconfigurationEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {
@@ -563,7 +552,7 @@ public class NattableconfigurationEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableconfigurationEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableconfigurationEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableconfigurationEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableconfigurationEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableconfigurationEditor() {
@@ -717,7 +706,7 @@ public class NattableconfigurationEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableconfigurationEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattableconfigurationEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattableconfigurationEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableconfigurationEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattableconfigurationEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableconfigurationEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableconfigurationEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattableconfigurationEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattableconfigurationEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattableconfigurationEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattableconfigurationEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableconfigurationEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattableconfigurationEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattableconfigurationEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattableconfigurationEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableconfigurationEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableconfigurationEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattableconfigurationEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableconfigurationEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableconfigurationEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattableconfigurationEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableconfigurationEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattableconfigurationEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattableconfigurationEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattableconfigurationEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattableconfigurationEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattableconfigurationEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattableconfigurationEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattableconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattableconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattableconfigurationEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattableconfigurationEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableconfigurationEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattableconfigurationEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattableconfigurationEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableconfigurationEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattableconfigurationEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
index e77868a188b..06ceab1a094 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();
@@ -121,7 +121,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* 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;
@@ -166,7 +166,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* 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() {
@@ -204,7 +204,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
index a37d6bb62e6..3ac8a6f85a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattablelabelprovider model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderActionBarContributor
@@ -59,7 +59,7 @@ public class NattablelabelproviderActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablelabelproviderActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablelabelproviderActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablelabelproviderActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablelabelproviderActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablelabelproviderActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattablelabelproviderActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablelabelproviderActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattablelabelproviderActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablelabelproviderActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablelabelproviderActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattablelabelproviderActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattablelabelproviderActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattablelabelproviderActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattablelabelproviderActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattablelabelproviderActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablelabelproviderActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablelabelproviderActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattablelabelproviderActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattablelabelproviderActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattablelabelproviderActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattablelabelproviderActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index 1952e434c25..75aba22402b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattablelabelprovider model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderEditor
@@ -155,7 +155,7 @@ public class NattablelabelproviderEditor
* 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;
@@ -164,7 +164,7 @@ public class NattablelabelproviderEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablelabelproviderEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablelabelproviderEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablelabelproviderEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablelabelproviderEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablelabelproviderEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablelabelproviderEditor
* 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;
@@ -228,7 +228,7 @@ public class NattablelabelproviderEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablelabelproviderEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablelabelproviderEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablelabelproviderEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablelabelproviderEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablelabelproviderEditor
* 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;
@@ -284,7 +284,7 @@ public class NattablelabelproviderEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablelabelproviderEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattablelabelproviderEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablelabelproviderEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablelabelproviderEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablelabelproviderEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattablelabelproviderEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablelabelproviderEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablelabelproviderEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablelabelproviderEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattablelabelproviderEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablelabelproviderEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablelabelproviderEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattablelabelproviderEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattablelabelproviderEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattablelabelproviderEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablelabelproviderEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablelabelproviderEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {
@@ -563,7 +552,7 @@ public class NattablelabelproviderEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablelabelproviderEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablelabelproviderEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablelabelproviderEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablelabelproviderEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablelabelproviderEditor() {
@@ -717,7 +706,7 @@ public class NattablelabelproviderEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablelabelproviderEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattablelabelproviderEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattablelabelproviderEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablelabelproviderEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattablelabelproviderEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablelabelproviderEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablelabelproviderEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattablelabelproviderEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattablelabelproviderEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattablelabelproviderEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattablelabelproviderEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablelabelproviderEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattablelabelproviderEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattablelabelproviderEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattablelabelproviderEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablelabelproviderEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablelabelproviderEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattablelabelproviderEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablelabelproviderEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablelabelproviderEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattablelabelproviderEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablelabelproviderEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattablelabelproviderEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattablelabelproviderEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattablelabelproviderEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattablelabelproviderEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattablelabelproviderEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattablelabelproviderEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattablelabelproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattablelabelproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattablelabelproviderEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattablelabelproviderEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablelabelproviderEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattablelabelproviderEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattablelabelproviderEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablelabelproviderEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattablelabelproviderEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
index 84630cf7b29..f16d42ef359 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();
@@ -121,7 +121,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* 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;
@@ -166,7 +166,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* 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() {
@@ -204,7 +204,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablelabelproviderModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
index 3699f46841b..77089fe6bd0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattableproblem model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemActionBarContributor
@@ -59,7 +59,7 @@ public class NattableproblemActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableproblemActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableproblemActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableproblemActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableproblemActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableproblemActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattableproblemActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableproblemActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattableproblemActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableproblemActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableproblemActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattableproblemActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattableproblemActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattableproblemActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattableproblemActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattableproblemActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableproblemActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableproblemActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattableproblemActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattableproblemActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattableproblemActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattableproblemActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
index 3e922c32ce1..1e84859bb1c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattableproblem model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemEditor
@@ -155,7 +155,7 @@ public class NattableproblemEditor
* 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;
@@ -164,7 +164,7 @@ public class NattableproblemEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableproblemEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableproblemEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableproblemEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableproblemEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableproblemEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableproblemEditor
* 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;
@@ -228,7 +228,7 @@ public class NattableproblemEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableproblemEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableproblemEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableproblemEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableproblemEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableproblemEditor
* 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;
@@ -284,7 +284,7 @@ public class NattableproblemEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableproblemEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattableproblemEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableproblemEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableproblemEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableproblemEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattableproblemEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableproblemEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableproblemEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableproblemEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattableproblemEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableproblemEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableproblemEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattableproblemEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattableproblemEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattableproblemEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableproblemEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableproblemEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {
@@ -563,7 +552,7 @@ public class NattableproblemEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableproblemEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableproblemEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableproblemEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableproblemEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableproblemEditor() {
@@ -717,7 +706,7 @@ public class NattableproblemEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableproblemEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattableproblemEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattableproblemEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableproblemEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattableproblemEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableproblemEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableproblemEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattableproblemEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattableproblemEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattableproblemEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattableproblemEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableproblemEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattableproblemEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattableproblemEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattableproblemEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableproblemEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableproblemEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattableproblemEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableproblemEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableproblemEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattableproblemEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableproblemEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattableproblemEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattableproblemEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattableproblemEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattableproblemEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattableproblemEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattableproblemEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattableproblemEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattableproblemEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattableproblemEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattableproblemEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableproblemEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattableproblemEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattableproblemEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableproblemEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattableproblemEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
index ab7301b6151..209a8c27ea6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();
@@ -121,7 +121,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* 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;
@@ -166,7 +166,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -204,7 +204,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableproblemModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
index e9f5766dbac..cd23123f36e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattablestyle model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleActionBarContributor
@@ -59,7 +59,7 @@ public class NattablestyleActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablestyleActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablestyleActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablestyleActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablestyleActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablestyleActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattablestyleActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablestyleActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattablestyleActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablestyleActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablestyleActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattablestyleActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattablestyleActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattablestyleActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattablestyleActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattablestyleActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablestyleActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablestyleActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattablestyleActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattablestyleActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattablestyleActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattablestyleActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
index a7650332624..135a4409fe5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattablestyle model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleEditor
@@ -155,7 +155,7 @@ public class NattablestyleEditor
* 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;
@@ -164,7 +164,7 @@ public class NattablestyleEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablestyleEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablestyleEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablestyleEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablestyleEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablestyleEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablestyleEditor
* 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;
@@ -228,7 +228,7 @@ public class NattablestyleEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablestyleEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablestyleEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablestyleEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablestyleEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablestyleEditor
* 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;
@@ -284,7 +284,7 @@ public class NattablestyleEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablestyleEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattablestyleEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablestyleEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablestyleEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablestyleEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattablestyleEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablestyleEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablestyleEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablestyleEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattablestyleEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablestyleEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablestyleEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattablestyleEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattablestyleEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattablestyleEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablestyleEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablestyleEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {
@@ -563,7 +552,7 @@ public class NattablestyleEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablestyleEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablestyleEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablestyleEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablestyleEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablestyleEditor() {
@@ -717,7 +706,7 @@ public class NattablestyleEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablestyleEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattablestyleEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattablestyleEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablestyleEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattablestyleEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablestyleEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablestyleEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattablestyleEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattablestyleEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattablestyleEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattablestyleEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablestyleEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattablestyleEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattablestyleEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattablestyleEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablestyleEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablestyleEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattablestyleEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablestyleEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablestyleEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattablestyleEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablestyleEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattablestyleEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattablestyleEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattablestyleEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattablestyleEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattablestyleEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattablestyleEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattablestyleEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattablestyleEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattablestyleEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattablestyleEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablestyleEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattablestyleEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattablestyleEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablestyleEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattablestyleEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
index b536fc6769b..8bf68bce092 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();
@@ -121,7 +121,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* 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;
@@ -166,7 +166,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -204,7 +204,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattablestyleModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
index 869a9951978..8f07f676a1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattabletester model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterActionBarContributor
@@ -59,7 +59,7 @@ public class NattabletesterActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattabletesterActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattabletesterActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattabletesterActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattabletesterActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattabletesterActionBarContributor
* 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;
@@ -145,7 +145,7 @@ public class NattabletesterActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattabletesterActionBarContributor
* 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;
@@ -163,7 +163,7 @@ public class NattabletesterActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattabletesterActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattabletesterActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -191,7 +191,7 @@ public class NattabletesterActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -219,7 +219,6 @@ public class NattabletesterActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -232,7 +231,7 @@ public class NattabletesterActionBarContributor
* 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
@@ -266,7 +265,7 @@ public class NattabletesterActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -315,7 +314,7 @@ public class NattabletesterActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattabletesterActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattabletesterActionBarContributor
* 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) {
@@ -374,7 +373,7 @@ public class NattabletesterActionBarContributor
* 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) {
@@ -404,7 +403,7 @@ public class NattabletesterActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -425,7 +424,7 @@ public class NattabletesterActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -443,7 +442,7 @@ public class NattabletesterActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
index 6312b8cb66f..fe940a57096 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattabletester model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterEditor
@@ -155,7 +155,7 @@ public class NattabletesterEditor
* 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;
@@ -164,7 +164,7 @@ public class NattabletesterEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattabletesterEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattabletesterEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattabletesterEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattabletesterEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattabletesterEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattabletesterEditor
* 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;
@@ -228,7 +228,7 @@ public class NattabletesterEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattabletesterEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattabletesterEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattabletesterEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattabletesterEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattabletesterEditor
* 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;
@@ -284,7 +284,7 @@ public class NattabletesterEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattabletesterEditor
* 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>();
@@ -302,7 +302,7 @@ public class NattabletesterEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattabletesterEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattabletesterEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattabletesterEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -371,7 +366,7 @@ public class NattabletesterEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattabletesterEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattabletesterEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattabletesterEditor
* 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>();
@@ -407,7 +402,7 @@ public class NattabletesterEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattabletesterEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattabletesterEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -467,7 +461,6 @@ public class NattabletesterEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -480,12 +473,11 @@ public class NattabletesterEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -494,7 +486,6 @@ public class NattabletesterEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattabletesterEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattabletesterEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {
@@ -563,7 +552,7 @@ public class NattabletesterEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattabletesterEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattabletesterEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattabletesterEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattabletesterEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattabletesterEditor() {
@@ -717,7 +706,7 @@ public class NattabletesterEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattabletesterEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -784,7 +771,7 @@ public class NattabletesterEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -796,7 +783,7 @@ public class NattabletesterEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattabletesterEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -824,7 +810,7 @@ public class NattabletesterEditor
* 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
*/
@Override
@@ -835,14 +821,14 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -864,7 +850,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -876,7 +862,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -888,7 +874,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -900,7 +886,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattabletesterEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattabletesterEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -965,7 +950,7 @@ public class NattabletesterEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -977,7 +962,7 @@ public class NattabletesterEditor
* 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) {
@@ -999,7 +984,7 @@ public class NattabletesterEditor
* 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() {
@@ -1027,7 +1012,7 @@ public class NattabletesterEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattabletesterEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1277,7 +1262,6 @@ public class NattabletesterEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1303,7 +1287,6 @@ public class NattabletesterEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1315,7 +1298,7 @@ public class NattabletesterEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattabletesterEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattabletesterEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1368,7 +1351,7 @@ public class NattabletesterEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattabletesterEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattabletesterEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1458,7 +1440,7 @@ public class NattabletesterEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattabletesterEditor
* 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) {
@@ -1526,7 +1508,7 @@ public class NattabletesterEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1538,7 +1520,7 @@ public class NattabletesterEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1602,7 +1584,7 @@ public class NattabletesterEditor
* 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) {
@@ -1623,7 +1605,7 @@ public class NattabletesterEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1635,7 +1617,7 @@ public class NattabletesterEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1654,7 +1636,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1686,7 +1668,7 @@ public class NattabletesterEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1702,7 +1684,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1719,7 +1701,7 @@ public class NattabletesterEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1731,7 +1713,7 @@ public class NattabletesterEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1743,7 +1725,7 @@ public class NattabletesterEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1756,7 +1738,7 @@ public class NattabletesterEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1772,7 +1754,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattabletesterEditor
* 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) {
@@ -1819,7 +1801,7 @@ public class NattabletesterEditor
* 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) {
@@ -1830,7 +1812,7 @@ public class NattabletesterEditor
* 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
*/
@Override
@@ -1841,7 +1823,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattabletesterEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1903,7 +1885,7 @@ public class NattabletesterEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
index 81c81cf3584..a40bae10c74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();
@@ -121,7 +121,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* 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;
@@ -166,7 +166,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -181,7 +181,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -204,7 +204,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -279,7 +279,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -308,7 +307,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -347,7 +346,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattabletesterModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -475,12 +474,11 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -489,7 +487,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -520,7 +518,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -638,7 +636,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
index d912a392bf0..3a1ea9498ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
@@ -48,7 +48,7 @@ import org.eclipse.ui.PartInitException;
* This is the action bar contributor for the Nattable model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableActionBarContributor
@@ -58,7 +58,7 @@ public class NattableActionBarContributor
* This keeps track of the active editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IEditorPart activeEditorPart;
@@ -67,7 +67,7 @@ public class NattableActionBarContributor
* This keeps track of the current selection provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionProvider selectionProvider;
@@ -76,7 +76,7 @@ public class NattableActionBarContributor
* This action opens the Properties view.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction showPropertiesViewAction =
@@ -98,7 +98,7 @@ public class NattableActionBarContributor
* implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IAction refreshViewerAction =
@@ -125,7 +125,7 @@ public class NattableActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createChildActions;
@@ -134,7 +134,7 @@ public class NattableActionBarContributor
* 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;
@@ -144,7 +144,7 @@ public class NattableActionBarContributor
* generated for the current selection by the item provider.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> createSiblingActions;
@@ -153,7 +153,7 @@ public class NattableActionBarContributor
* 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;
@@ -162,7 +162,7 @@ public class NattableActionBarContributor
* This creates an instance of the contributor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableActionBarContributor() {
@@ -176,7 +176,7 @@ public class NattableActionBarContributor
* This adds Separators for editor additions to the tool bar.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -190,7 +190,7 @@ public class NattableActionBarContributor
* as well as the sub-menus for object creation items.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -218,7 +218,6 @@ public class NattableActionBarContributor
//
submenuManager.addMenuListener
(new IMenuListener() {
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.updateAll(true);
}
@@ -231,7 +230,7 @@ public class NattableActionBarContributor
* 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
@@ -265,7 +264,7 @@ public class NattableActionBarContributor
* that can be added to the selected object and updating the menus accordingly.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -314,7 +313,7 @@ public class NattableActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -332,7 +331,7 @@ public class NattableActionBarContributor
* and returns the collection of these actions.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -352,7 +351,7 @@ public class NattableActionBarContributor
* 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) {
@@ -373,7 +372,7 @@ public class NattableActionBarContributor
* 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) {
@@ -403,7 +402,7 @@ public class NattableActionBarContributor
* This populates the pop-up menu before it appears.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -424,7 +423,7 @@ public class NattableActionBarContributor
* This inserts global actions before the "additions-end" separator.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -442,7 +441,7 @@ public class NattableActionBarContributor
* This ensures that a delete action will clean up all references to deleted objects.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index 8b3c82e74ff..b365238d4e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -144,7 +144,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* This is an example of a Nattable model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableEditor
@@ -154,7 +154,7 @@ public class NattableEditor
* 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;
@@ -163,7 +163,7 @@ public class NattableEditor
* This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -172,7 +172,7 @@ public class NattableEditor
* This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -181,7 +181,7 @@ public class NattableEditor
* This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -190,7 +190,7 @@ public class NattableEditor
* This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -199,7 +199,7 @@ public class NattableEditor
* This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -209,7 +209,7 @@ public class NattableEditor
* The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -218,7 +218,7 @@ public class NattableEditor
* 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;
@@ -227,7 +227,7 @@ public class NattableEditor
* This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewer;
@@ -237,7 +237,7 @@ public class NattableEditor
* A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ListViewer listViewer;
@@ -247,7 +247,7 @@ public class NattableEditor
* A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TableViewer tableViewer;
@@ -256,7 +256,7 @@ public class NattableEditor
* This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -265,7 +265,7 @@ public class NattableEditor
* This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -274,7 +274,7 @@ public class NattableEditor
* 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;
@@ -283,7 +283,7 @@ public class NattableEditor
* This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -292,7 +292,7 @@ public class NattableEditor
* 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>();
@@ -301,7 +301,7 @@ public class NattableEditor
* This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -311,7 +311,7 @@ public class NattableEditor
* in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -320,12 +320,11 @@ public class NattableEditor
* This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IPartListener partListener =
new IPartListener() {
- @Override
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -345,22 +344,18 @@ public class NattableEditor
}
}
- @Override
public void partBroughtToTop(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partClosed(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partDeactivated(IWorkbenchPart p) {
// Ignore.
}
- @Override
public void partOpened(IWorkbenchPart p) {
// Ignore.
}
@@ -370,7 +365,7 @@ public class NattableEditor
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -379,7 +374,7 @@ public class NattableEditor
* Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -388,7 +383,7 @@ public class NattableEditor
* Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -397,7 +392,7 @@ public class NattableEditor
* 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>();
@@ -406,7 +401,7 @@ public class NattableEditor
* Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -415,7 +410,7 @@ public class NattableEditor
* Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
@@ -439,7 +434,6 @@ public class NattableEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -466,7 +460,6 @@ public class NattableEditor
if (updateProblemIndication) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -479,12 +472,11 @@ public class NattableEditor
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -493,7 +485,6 @@ public class NattableEditor
protected Collection<Resource> changedResources = new ArrayList<Resource>();
protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
public boolean visit(IResourceDelta delta) {
if (delta.getResource().getType() == IResource.FILE) {
if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -529,7 +520,6 @@ public class NattableEditor
if (!visitor.getRemovedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
@@ -542,7 +532,6 @@ public class NattableEditor
if (!visitor.getChangedResources().isEmpty()) {
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
changedResources.addAll(visitor.getChangedResources());
if (getSite().getPage().getActiveEditor() == NattableEditor.this) {
@@ -562,7 +551,7 @@ public class NattableEditor
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleActivate() {
@@ -598,7 +587,7 @@ public class NattableEditor
* Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void handleChangedResources() {
@@ -635,7 +624,7 @@ public class NattableEditor
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void updateProblemIndication() {
@@ -690,7 +679,7 @@ public class NattableEditor
* Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean handleDirtyConflict() {
@@ -704,7 +693,7 @@ public class NattableEditor
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableEditor() {
@@ -716,7 +705,7 @@ public class NattableEditor
* This sets up the editing domain for the model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void initializeEditingDomain() {
@@ -746,11 +735,9 @@ public class NattableEditor
//
commandStack.addCommandStackListener
(new CommandStackListener() {
- @Override
public void commandStackChanged(final EventObject event) {
getContainer().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -783,7 +770,7 @@ public class NattableEditor
* This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -795,7 +782,7 @@ public class NattableEditor
* This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setSelectionToViewer(Collection<?> collection) {
@@ -805,7 +792,6 @@ public class NattableEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- @Override
public void run() {
// Try to select the items in the current content viewer of the editor.
//
@@ -823,7 +809,7 @@ public class NattableEditor
* 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
*/
@Override
@@ -834,14 +820,14 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -851,7 +837,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -863,7 +849,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -875,7 +861,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -887,7 +873,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -899,7 +885,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -917,7 +903,7 @@ public class NattableEditor
* is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setCurrentViewer(Viewer viewer) {
@@ -931,7 +917,6 @@ public class NattableEditor
new ISelectionChangedListener() {
// This just notifies those things that are affected by the section.
//
- @Override
public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
setSelection(selectionChangedEvent.getSelection());
}
@@ -964,7 +949,7 @@ public class NattableEditor
* This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -976,7 +961,7 @@ public class NattableEditor
* 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) {
@@ -998,7 +983,7 @@ public class NattableEditor
* 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() {
@@ -1026,7 +1011,7 @@ public class NattableEditor
* and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1055,7 +1040,7 @@ public class NattableEditor
* This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1276,7 +1261,6 @@ public class NattableEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
setActivePage(0);
}
@@ -1302,7 +1286,6 @@ public class NattableEditor
getSite().getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
updateProblemIndication();
}
@@ -1314,7 +1297,7 @@ public class NattableEditor
* this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void hideTabs() {
@@ -1333,7 +1316,7 @@ public class NattableEditor
* this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void showTabs() {
@@ -1351,7 +1334,7 @@ public class NattableEditor
* This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1367,7 +1350,7 @@ public class NattableEditor
* This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("rawtypes")
@@ -1391,7 +1374,7 @@ public class NattableEditor
* This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
@@ -1443,7 +1426,6 @@ public class NattableEditor
(new ISelectionChangedListener() {
// This ensures that we handle selections correctly.
//
- @Override
public void selectionChanged(SelectionChangedEvent event) {
handleContentOutlineSelection(event.getSelection());
}
@@ -1457,7 +1439,7 @@ public class NattableEditor
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
@@ -1485,7 +1467,7 @@ public class NattableEditor
* 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) {
@@ -1525,7 +1507,7 @@ public class NattableEditor
* This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1537,7 +1519,7 @@ public class NattableEditor
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1601,7 +1583,7 @@ public class NattableEditor
* 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) {
@@ -1622,7 +1604,7 @@ public class NattableEditor
* This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1634,7 +1616,7 @@ public class NattableEditor
* This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1653,7 +1635,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1670,7 +1652,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1685,7 +1667,7 @@ public class NattableEditor
* This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1701,7 +1683,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1718,7 +1700,7 @@ public class NattableEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1730,7 +1712,7 @@ public class NattableEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1742,7 +1724,7 @@ public class NattableEditor
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1755,7 +1737,7 @@ public class NattableEditor
* Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1771,7 +1753,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void setStatusLineManager(ISelection selection) {
@@ -1807,7 +1789,7 @@ public class NattableEditor
* 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) {
@@ -1818,7 +1800,7 @@ public class NattableEditor
* 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) {
@@ -1829,7 +1811,7 @@ public class NattableEditor
* 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
*/
@Override
@@ -1840,7 +1822,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1850,7 +1832,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IActionBars getActionBars() {
@@ -1860,7 +1842,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFactory getAdapterFactory() {
@@ -1870,7 +1852,7 @@ public class NattableEditor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -1902,7 +1884,7 @@ public class NattableEditor
* Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
index df44d5a8824..1c580492e02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
* This is the central singleton for the Nattable editor plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public final class NattableEditorPlugin extends EMFPlugin {
@@ -29,7 +29,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final NattableEditorPlugin INSTANCE = new NattableEditorPlugin();
@@ -38,7 +38,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private static Implementation plugin;
@@ -47,7 +47,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Create the instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableEditorPlugin() {
@@ -60,7 +60,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @return the singleton instance.
* @generated
*/
@@ -73,7 +73,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @return the singleton instance.
* @generated
*/
@@ -85,7 +85,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static class Implementation extends EclipseUIPlugin {
@@ -93,7 +93,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
* Creates an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Implementation() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
index d0e4069b35d..49a3f26a9cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
@@ -74,7 +74,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
* This is a simple wizard for creating a new model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableModelWizard extends Wizard implements INewWizard {
@@ -82,7 +82,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* The supported extensions for created files.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
@@ -92,7 +92,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* A formatted list of supported file extensions, suitable for display.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
@@ -102,7 +102,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;
@@ -111,7 +111,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This caches an instance of the model factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();
@@ -120,7 +120,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This is the file creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableModelWizardNewFileCreationPage newFileCreationPage;
@@ -129,7 +129,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This is the initial object creation page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -138,7 +138,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Remember the selection during initialization for populating the default container.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IStructuredSelection selection;
@@ -147,7 +147,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Remember the workbench during initialization.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected IWorkbench workbench;
@@ -156,7 +156,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* 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;
@@ -165,7 +165,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This just records the information.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -180,7 +180,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* 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() {
@@ -203,7 +203,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Create a new model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected EObject createInitialModel() {
@@ -216,7 +216,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Do the work after everything is specified.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -278,7 +278,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
final ISelection targetSelection = new StructuredSelection(modelFile);
getShell().getDisplay().asyncExec
(new Runnable() {
- @Override
public void run() {
((ISetSelectionTarget) activePart).selectReveal(targetSelection);
}
@@ -307,7 +306,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This is the one page of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -315,7 +314,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -326,7 +325,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* The framework calls this to see if the file is correct.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -346,7 +345,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
@@ -358,14 +357,14 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* This is the page where the type of object to create is selected.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class NattableModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo initialObjectField;
@@ -380,7 +379,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Combo encodingField;
@@ -389,7 +388,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public NattableModelWizardInitialObjectCreationPage(String pageId) {
@@ -399,7 +398,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -474,12 +473,11 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ModifyListener validator =
new ModifyListener() {
- @Override
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -488,7 +486,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected boolean validatePage() {
@@ -498,7 +496,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -519,7 +517,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getInitialObjectName() {
@@ -536,7 +534,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public String getEncoding() {
@@ -547,7 +545,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Returns the label for the specified type name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected String getLabel(String typeName) {
@@ -562,7 +560,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<String> getEncodings() {
@@ -581,7 +579,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* The framework calls this to create the contents of the wizard.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -637,7 +635,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
* Get the file from the page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
index b5baaef8d07..b8311689f56 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
@@ -915,5 +915,12 @@
<eLiterals name="HIERARCHIC_SINGLE_TREE_COLUMN" value="1" literal="HIERARCHIC_SINGLE_TREE_COLUMN"/>
<eLiterals name="HIERARCHIC_MULTI_TREE_COLUMN" value="2" literal="HIERARCHIC_MULTI_TREE_COLUMN"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EObjectValueStyle" eSuperTypes="#//nattablestyle/NamedStyle">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectValue" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EObjectListValueStyle" eSuperTypes="#//nattablestyle/NamedStyle">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectValue" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ </eClassifiers>
</eSubpackages>
</ecore:EPackage>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
index 0575e1b43c6..e8d022d486a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -46,7 +46,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
index 5b11991f027..9dc940170fe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -52,5 +53,4 @@ public interface NattableFactory extends EFactory {
* @generated
*/
NattablePackage getNattablePackage();
-
} // NattableFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
index 29d721b729e..a61c9762314 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
* @generated
*/
public interface NattablePackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -306,7 +307,6 @@ public interface NattablePackage extends EPackage {
*/
int TABLE_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
-
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
* <!-- begin-user-doc -->
@@ -355,7 +355,8 @@ public interface NattablePackage extends EPackage {
EReference getTable_Prototype();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration
+ * <em>Table Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -379,7 +380,8 @@ public interface NattablePackage extends EPackage {
EAttribute getTable_InvertAxis();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -391,7 +393,8 @@ public interface NattablePackage extends EPackage {
EReference getTable_ColumnAxisProvidersHistory();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -403,7 +406,9 @@ public interface NattablePackage extends EPackage {
EReference getTable_RowAxisProvidersHistory();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}
+ * '.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -415,7 +420,9 @@ public interface NattablePackage extends EPackage {
EReference getTable_LocalRowHeaderAxisConfiguration();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration
+ * <em>Local Column Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -427,7 +434,8 @@ public interface NattablePackage extends EPackage {
EReference getTable_LocalColumnHeaderAxisConfiguration();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider
+ * <em>Current Row Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -439,7 +447,8 @@ public interface NattablePackage extends EPackage {
EReference getTable_CurrentRowAxisProvider();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider
+ * <em>Current Column Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -451,7 +460,8 @@ public interface NattablePackage extends EPackage {
EReference getTable_CurrentColumnAxisProvider();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells
+ * <em>Cells</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -487,6 +497,7 @@ public interface NattablePackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
* <!-- begin-user-doc -->
@@ -605,7 +616,5 @@ public interface NattablePackage extends EPackage {
* @generated
*/
EReference TABLE__CELLS = eINSTANCE.getTable_Cells();
-
}
-
} // NattablePackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
index 9c83aae5fad..6bc748e0a01 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
@@ -41,8 +41,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}
+ * </li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration
+ * </em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>
@@ -50,12 +52,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* </p>
*
* @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"
+ * @model
+ * annotation=
+ * "http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"
* annotation=
* "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory->includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory->includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"
* @generated
*/
public interface Table extends TableNamedElement {
+
/**
* Returns the value of the '<em><b>Context</b></em>' reference.
* <!-- begin-user-doc -->
@@ -83,7 +88,7 @@ public interface Table extends TableNamedElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Context</em>' reference.
+ * the new value of the '<em>Context</em>' reference.
* @see #getContext()
* @generated
*/
@@ -111,7 +116,7 @@ public interface Table extends TableNamedElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Owner</em>' reference.
+ * the new value of the '<em>Owner</em>' reference.
* @see #getOwner()
* @generated
*/
@@ -139,7 +144,7 @@ public interface Table extends TableNamedElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Prototype</em>' reference.
+ * the new value of the '<em>Prototype</em>' reference.
* @see #getPrototype()
* @generated
*/
@@ -162,12 +167,13 @@ public interface Table extends TableNamedElement {
TableConfiguration getTableConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'
+ * reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Table Configuration</em>' reference.
+ * the new value of the '<em>Table Configuration</em>' reference.
* @see #getTableConfiguration()
* @generated
*/
@@ -197,7 +203,7 @@ public interface Table extends TableNamedElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Invert Axis</em>' attribute.
+ * the new value of the '<em>Invert Axis</em>' attribute.
* @see #isInvertAxis()
* @generated
*/
@@ -253,12 +259,13 @@ public interface Table extends TableNamedElement {
LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration
+ * <em>Local Row Header Axis Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.
+ * the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.
* @see #getLocalRowHeaderAxisConfiguration()
* @generated
*/
@@ -282,12 +289,13 @@ public interface Table extends TableNamedElement {
LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration
+ * <em>Local Column Header Axis Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.
+ * the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.
* @see #getLocalColumnHeaderAxisConfiguration()
* @generated
*/
@@ -311,12 +319,13 @@ public interface Table extends TableNamedElement {
AbstractAxisProvider getCurrentRowAxisProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider
+ * <em>Current Row Axis Provider</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Current Row Axis Provider</em>' reference.
+ * the new value of the '<em>Current Row Axis Provider</em>' reference.
* @see #getCurrentRowAxisProvider()
* @generated
*/
@@ -340,12 +349,13 @@ public interface Table extends TableNamedElement {
AbstractAxisProvider getCurrentColumnAxisProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider
+ * <em>Current Column Axis Provider</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Current Column Axis Provider</em>' reference.
+ * the new value of the '<em>Current Column Axis Provider</em>' reference.
* @see #getCurrentColumnAxisProvider()
* @generated
*/
@@ -367,5 +377,4 @@ public interface Table extends TableNamedElement {
* @generated
*/
EList<Cell> getCells();
-
} // Table
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
index d02b9a1fef2..21efcd37bc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
* @generated
*/
public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -38,8 +39,8 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
*/
public static NattableFactory init() {
try {
- NattableFactory theNattableFactory = (NattableFactory) EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);
- if (theNattableFactory != null) {
+ NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);
+ if(theNattableFactory != null) {
return theNattableFactory;
}
} catch (Exception exception) {
@@ -67,7 +68,7 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattablePackage.TABLE:
return createTable();
default:
@@ -95,7 +96,7 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
*/
@Override
public NattablePackage getNattablePackage() {
- return (NattablePackage) getEPackage();
+ return (NattablePackage)getEPackage();
}
/**
@@ -109,5 +110,4 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
public static NattablePackage getPackage() {
return NattablePackage.eINSTANCE;
}
-
} // NattableFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
index ab6d46732d8..764063d8721 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;
* @generated
*/
public class NattablePackageImpl extends EPackageImpl implements NattablePackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -59,10 +60,12 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
private EClass tableEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI
@@ -85,7 +88,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattablePackage#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 -->
+ * This method is used to initialize {@link NattablePackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -93,41 +97,24 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
* @generated
*/
public static NattablePackage init() {
- if (isInited) {
- return (NattablePackage) EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
+ if(isInited) {
+ return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
}
-
// Obtain or create and register package
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattablePackage.createPackageContents();
theNattableconfigurationPackage.createPackageContents();
@@ -139,7 +126,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattablePackage.initializePackageContents();
theNattableconfigurationPackage.initializePackageContents();
@@ -151,21 +137,16 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theNattablePackage,
- new EValidator.Descriptor() {
- @Override
- public EValidator getEValidator() {
- return NattableValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theNattablePackage, new EValidator.Descriptor() {
+ @Override
+ public EValidator getEValidator() {
+ return NattableValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theNattablePackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);
return theNattablePackage;
@@ -190,7 +171,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_Context() {
- return (EReference) tableEClass.getEStructuralFeatures().get(0);
+ return (EReference)tableEClass.getEStructuralFeatures().get(0);
}
/**
@@ -201,7 +182,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_Owner() {
- return (EReference) tableEClass.getEStructuralFeatures().get(1);
+ return (EReference)tableEClass.getEStructuralFeatures().get(1);
}
/**
@@ -212,7 +193,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_Prototype() {
- return (EReference) tableEClass.getEStructuralFeatures().get(2);
+ return (EReference)tableEClass.getEStructuralFeatures().get(2);
}
/**
@@ -223,7 +204,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_TableConfiguration() {
- return (EReference) tableEClass.getEStructuralFeatures().get(3);
+ return (EReference)tableEClass.getEStructuralFeatures().get(3);
}
/**
@@ -234,7 +215,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EAttribute getTable_InvertAxis() {
- return (EAttribute) tableEClass.getEStructuralFeatures().get(4);
+ return (EAttribute)tableEClass.getEStructuralFeatures().get(4);
}
/**
@@ -245,7 +226,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_ColumnAxisProvidersHistory() {
- return (EReference) tableEClass.getEStructuralFeatures().get(5);
+ return (EReference)tableEClass.getEStructuralFeatures().get(5);
}
/**
@@ -256,7 +237,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_RowAxisProvidersHistory() {
- return (EReference) tableEClass.getEStructuralFeatures().get(6);
+ return (EReference)tableEClass.getEStructuralFeatures().get(6);
}
/**
@@ -267,7 +248,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_LocalRowHeaderAxisConfiguration() {
- return (EReference) tableEClass.getEStructuralFeatures().get(7);
+ return (EReference)tableEClass.getEStructuralFeatures().get(7);
}
/**
@@ -278,7 +259,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_LocalColumnHeaderAxisConfiguration() {
- return (EReference) tableEClass.getEStructuralFeatures().get(8);
+ return (EReference)tableEClass.getEStructuralFeatures().get(8);
}
/**
@@ -289,7 +270,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_CurrentRowAxisProvider() {
- return (EReference) tableEClass.getEStructuralFeatures().get(9);
+ return (EReference)tableEClass.getEStructuralFeatures().get(9);
}
/**
@@ -300,7 +281,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_CurrentColumnAxisProvider() {
- return (EReference) tableEClass.getEStructuralFeatures().get(10);
+ return (EReference)tableEClass.getEStructuralFeatures().get(10);
}
/**
@@ -311,7 +292,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public EReference getTable_Cells() {
- return (EReference) tableEClass.getEStructuralFeatures().get(11);
+ return (EReference)tableEClass.getEStructuralFeatures().get(11);
}
/**
@@ -322,7 +303,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
@Override
public NattableFactory getNattableFactory() {
- return (NattableFactory) getEFactoryInstance();
+ return (NattableFactory)getEFactoryInstance();
}
/**
@@ -342,11 +323,10 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
tableEClass = createEClass(TABLE);
createEReference(tableEClass, TABLE__CONTEXT);
@@ -380,27 +360,24 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
- NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
- NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
- NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
- NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage) EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
- NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
- NattablecellPackage theNattablecellPackage = (NattablecellPackage) EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
- NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage) EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
-
+ NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+ NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+ NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+ NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+ NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+ NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+ NattablecellPackage theNattablecellPackage = (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
+ NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
// Add subpackages
getESubpackages().add(theNattableconfigurationPackage);
getESubpackages().add(theNattableaxisproviderPackage);
@@ -411,39 +388,26 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
getESubpackages().add(theNattablecellPackage);
getESubpackages().add(theNattableproblemPackage);
getESubpackages().add(theNattablestylePackage);
-
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
tableEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
-
// Initialize classes, features, and operations; add parameters
initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getTable_Owner(), ecorePackage.getEObject(), null, "owner", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getTable_Prototype(), ecorePackage.getEObject(), null, "prototype", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null,
- "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "columnAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "rowAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null,
- "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null,
- "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getTable_Cells(), theNattablecellPackage.getCell(), null, "cells", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
// Create resource
createResource(eNS_URI);
-
// Create annotations
// http://www.eclipse.org/OCL/Import
createImportAnnotations();
@@ -462,10 +426,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
protected void createImportAnnotations() {
String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$
- addAnnotation(this,
- source,
- new String[] { "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(this, source, new String[]{ "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
/**
@@ -477,16 +439,12 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
protected void createEcoreAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
- addAnnotation(this,
- source,
- new String[] { "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableEClass,
- source,
- new String[] { "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableEClass, source, new String[]{ "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
/**
@@ -498,12 +456,9 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*/
protected void createPivotAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$
- addAnnotation(tableEClass,
- source,
- new String[] { "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
- "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
- "currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(tableEClass, source, new String[]{ "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+ "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+ "currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
-
} // NattablePackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
index 1fd86738fc7..f5d325d713b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
@@ -45,8 +45,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis
+ * Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis
+ * Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</em>}</li>
@@ -56,6 +58,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
* @generated
*/
public class TableImpl extends TableNamedElementImpl implements Table {
+
/**
* The cached value of the '{@link #getContext() <em>Context</em>}' reference.
* <!-- begin-user-doc -->
@@ -156,7 +159,8 @@ public class TableImpl extends TableNamedElementImpl implements Table {
protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;
/**
- * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment reference.
+ * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment
+ * reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -228,11 +232,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EObject getContext() {
- if (context != null && context.eIsProxy()) {
- InternalEObject oldContext = (InternalEObject) context;
+ if(context != null && context.eIsProxy()) {
+ InternalEObject oldContext = (InternalEObject)context;
context = eResolveProxy(oldContext);
- if (context != oldContext) {
- if (eNotificationRequired()) {
+ if(context != oldContext) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));
}
}
@@ -260,7 +264,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setContext(EObject newContext) {
EObject oldContext = context;
context = newContext;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));
}
}
@@ -273,11 +277,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EObject getOwner() {
- if (owner != null && owner.eIsProxy()) {
- InternalEObject oldOwner = (InternalEObject) owner;
+ if(owner != null && owner.eIsProxy()) {
+ InternalEObject oldOwner = (InternalEObject)owner;
owner = eResolveProxy(oldOwner);
- if (owner != oldOwner) {
- if (eNotificationRequired()) {
+ if(owner != oldOwner) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));
}
}
@@ -305,7 +309,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setOwner(EObject newOwner) {
EObject oldOwner = owner;
owner = newOwner;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));
}
}
@@ -318,11 +322,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EObject getPrototype() {
- if (prototype != null && prototype.eIsProxy()) {
- InternalEObject oldPrototype = (InternalEObject) prototype;
+ if(prototype != null && prototype.eIsProxy()) {
+ InternalEObject oldPrototype = (InternalEObject)prototype;
prototype = eResolveProxy(oldPrototype);
- if (prototype != oldPrototype) {
- if (eNotificationRequired()) {
+ if(prototype != oldPrototype) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));
}
}
@@ -350,7 +354,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setPrototype(EObject newPrototype) {
EObject oldPrototype = prototype;
prototype = newPrototype;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));
}
}
@@ -363,11 +367,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public TableConfiguration getTableConfiguration() {
- if (tableConfiguration != null && tableConfiguration.eIsProxy()) {
- InternalEObject oldTableConfiguration = (InternalEObject) tableConfiguration;
- tableConfiguration = (TableConfiguration) eResolveProxy(oldTableConfiguration);
- if (tableConfiguration != oldTableConfiguration) {
- if (eNotificationRequired()) {
+ if(tableConfiguration != null && tableConfiguration.eIsProxy()) {
+ InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;
+ tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);
+ if(tableConfiguration != oldTableConfiguration) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
}
}
@@ -395,7 +399,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setTableConfiguration(TableConfiguration newTableConfiguration) {
TableConfiguration oldTableConfiguration = tableConfiguration;
tableConfiguration = newTableConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
}
}
@@ -421,7 +425,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setInvertAxis(boolean newInvertAxis) {
boolean oldInvertAxis = invertAxis;
invertAxis = newInvertAxis;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));
}
}
@@ -434,7 +438,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {
- if (columnAxisProvidersHistory == null) {
+ if(columnAxisProvidersHistory == null) {
columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);
}
return columnAxisProvidersHistory;
@@ -448,7 +452,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {
- if (rowAxisProvidersHistory == null) {
+ if(rowAxisProvidersHistory == null) {
rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);
}
return rowAxisProvidersHistory;
@@ -474,9 +478,9 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {
LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;
localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, oldLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -493,20 +497,19 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {
- if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {
+ if(newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {
NotificationChain msgs = null;
- if (localRowHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(localRowHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
}
- if (newLocalRowHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) newLocalRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(newLocalRowHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)newLocalRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalRowHeaderAxisConfiguration(newLocalRowHeaderAxisConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, newLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration));
}
}
@@ -531,9 +534,9 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {
LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;
localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, oldLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -550,20 +553,19 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {
- if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {
+ if(newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {
NotificationChain msgs = null;
- if (localColumnHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(localColumnHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
}
- if (newLocalColumnHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) newLocalColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(newLocalColumnHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)newLocalColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalColumnHeaderAxisConfiguration(newLocalColumnHeaderAxisConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, newLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration));
}
}
@@ -576,11 +578,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public AbstractAxisProvider getCurrentRowAxisProvider() {
- if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {
- InternalEObject oldCurrentRowAxisProvider = (InternalEObject) currentRowAxisProvider;
- currentRowAxisProvider = (AbstractAxisProvider) eResolveProxy(oldCurrentRowAxisProvider);
- if (currentRowAxisProvider != oldCurrentRowAxisProvider) {
- if (eNotificationRequired()) {
+ if(currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {
+ InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;
+ currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);
+ if(currentRowAxisProvider != oldCurrentRowAxisProvider) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));
}
}
@@ -608,7 +610,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {
AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;
currentRowAxisProvider = newCurrentRowAxisProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));
}
}
@@ -621,11 +623,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public AbstractAxisProvider getCurrentColumnAxisProvider() {
- if (currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {
- InternalEObject oldCurrentColumnAxisProvider = (InternalEObject) currentColumnAxisProvider;
- currentColumnAxisProvider = (AbstractAxisProvider) eResolveProxy(oldCurrentColumnAxisProvider);
- if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {
- if (eNotificationRequired()) {
+ if(currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {
+ InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;
+ currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);
+ if(currentColumnAxisProvider != oldCurrentColumnAxisProvider) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));
}
}
@@ -653,7 +655,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {
AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;
currentColumnAxisProvider = newCurrentColumnAxisProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));
}
}
@@ -666,7 +668,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public EList<Cell> getCells() {
- if (cells == null) {
+ if(cells == null) {
cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);
}
return cells;
@@ -680,17 +682,17 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
- return ((InternalEList<?>) getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);
case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
- return ((InternalEList<?>) getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);
case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
return basicSetLocalRowHeaderAxisConfiguration(null, msgs);
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);
case NattablePackage.TABLE__CELLS:
- return ((InternalEList<?>) getCells()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -703,24 +705,24 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablePackage.TABLE__CONTEXT:
- if (resolve) {
+ if(resolve) {
return getContext();
}
return basicGetContext();
case NattablePackage.TABLE__OWNER:
- if (resolve) {
+ if(resolve) {
return getOwner();
}
return basicGetOwner();
case NattablePackage.TABLE__PROTOTYPE:
- if (resolve) {
+ if(resolve) {
return getPrototype();
}
return basicGetPrototype();
case NattablePackage.TABLE__TABLE_CONFIGURATION:
- if (resolve) {
+ if(resolve) {
return getTableConfiguration();
}
return basicGetTableConfiguration();
@@ -735,12 +737,12 @@ public class TableImpl extends TableNamedElementImpl implements Table {
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
return getLocalColumnHeaderAxisConfiguration();
case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
- if (resolve) {
+ if(resolve) {
return getCurrentRowAxisProvider();
}
return basicGetCurrentRowAxisProvider();
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
- if (resolve) {
+ if(resolve) {
return getCurrentColumnAxisProvider();
}
return basicGetCurrentColumnAxisProvider();
@@ -759,45 +761,45 @@ public class TableImpl extends TableNamedElementImpl implements Table {
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablePackage.TABLE__CONTEXT:
- setContext((EObject) newValue);
+ setContext((EObject)newValue);
return;
case NattablePackage.TABLE__OWNER:
- setOwner((EObject) newValue);
+ setOwner((EObject)newValue);
return;
case NattablePackage.TABLE__PROTOTYPE:
- setPrototype((EObject) newValue);
+ setPrototype((EObject)newValue);
return;
case NattablePackage.TABLE__TABLE_CONFIGURATION:
- setTableConfiguration((TableConfiguration) newValue);
+ setTableConfiguration((TableConfiguration)newValue);
return;
case NattablePackage.TABLE__INVERT_AXIS:
- setInvertAxis((Boolean) newValue);
+ setInvertAxis((Boolean)newValue);
return;
case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
getColumnAxisProvidersHistory().clear();
- getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>) newValue);
+ getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);
return;
case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
getRowAxisProvidersHistory().clear();
- getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>) newValue);
+ getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);
return;
case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
- setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration) newValue);
+ setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);
return;
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
- setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration) newValue);
+ setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);
return;
case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
- setCurrentRowAxisProvider((AbstractAxisProvider) newValue);
+ setCurrentRowAxisProvider((AbstractAxisProvider)newValue);
return;
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
- setCurrentColumnAxisProvider((AbstractAxisProvider) newValue);
+ setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);
return;
case NattablePackage.TABLE__CELLS:
getCells().clear();
- getCells().addAll((Collection<? extends Cell>) newValue);
+ getCells().addAll((Collection<? extends Cell>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -811,18 +813,18 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablePackage.TABLE__CONTEXT:
- setContext((EObject) null);
+ setContext((EObject)null);
return;
case NattablePackage.TABLE__OWNER:
- setOwner((EObject) null);
+ setOwner((EObject)null);
return;
case NattablePackage.TABLE__PROTOTYPE:
- setPrototype((EObject) null);
+ setPrototype((EObject)null);
return;
case NattablePackage.TABLE__TABLE_CONFIGURATION:
- setTableConfiguration((TableConfiguration) null);
+ setTableConfiguration((TableConfiguration)null);
return;
case NattablePackage.TABLE__INVERT_AXIS:
setInvertAxis(INVERT_AXIS_EDEFAULT);
@@ -834,16 +836,16 @@ public class TableImpl extends TableNamedElementImpl implements Table {
getRowAxisProvidersHistory().clear();
return;
case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
- setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration) null);
+ setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);
return;
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
- setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration) null);
+ setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);
return;
case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
- setCurrentRowAxisProvider((AbstractAxisProvider) null);
+ setCurrentRowAxisProvider((AbstractAxisProvider)null);
return;
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
- setCurrentColumnAxisProvider((AbstractAxisProvider) null);
+ setCurrentColumnAxisProvider((AbstractAxisProvider)null);
return;
case NattablePackage.TABLE__CELLS:
getCells().clear();
@@ -860,7 +862,7 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablePackage.TABLE__CONTEXT:
return context != null;
case NattablePackage.TABLE__OWNER:
@@ -897,15 +899,13 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (invertAxis: "); //$NON-NLS-1$
result.append(invertAxis);
result.append(')');
return result.toString();
}
-
} // TableImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
index c26bf895ab4..9bc2f3233e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
@@ -31,6 +31,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface AxisGroup extends IAxis {
+
/**
* Returns the value of the '<em><b>Grouped Axis</b></em>' reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
@@ -46,5 +47,4 @@ public interface AxisGroup extends IAxis {
* @generated
*/
EList<IAxis> getGroupedAxis();
-
} // AxisGroup
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
index 5d0d309bf92..f288b39eb62 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
@@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface EObjectAxis extends ObjectAxis {
+
/**
* Returns the value of the '<em><b>Element</b></em>' reference.
* <!-- begin-user-doc -->
@@ -49,15 +50,15 @@ public interface EObjectAxis extends ObjectAxis {
EObject getElement();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}'
+ * reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Element</em>' reference.
+ * the new value of the '<em>Element</em>' reference.
* @see #getElement()
* @generated
*/
void setElement(EObject value);
-
} // EObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
index 47662ca7a94..117b10395f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>EObject Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
index eb958fc91ca..34b9a92a23e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* @generated
*/
public interface EStructuralFeatureAxis extends FeatureAxis {
+
/**
* Returns the value of the '<em><b>Element</b></em>' reference.
* <!-- begin-user-doc -->
@@ -53,15 +54,15 @@ public interface EStructuralFeatureAxis extends FeatureAxis {
EStructuralFeature getElement();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement
+ * <em>Element</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Element</em>' reference.
+ * the new value of the '<em>Element</em>' reference.
* @see #getElement()
* @generated
*/
void setElement(EStructuralFeature value);
-
} // EStructuralFeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
index 9da22debb4b..52d28a7e135 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>EStructural Feature Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
index b9dd18f9120..268bd2d0119 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
@@ -26,7 +26,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration
+ * </em>}</li>
* </ul>
* </p>
*
@@ -35,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
* @generated
*/
public interface FeatureAxis extends IAxis {
+
/**
* Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -54,15 +56,15 @@ public interface FeatureAxis extends IAxis {
FeatureLabelProviderConfiguration getLocalLabelConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration
+ * <em>Local Label Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Local Label Configuration</em>' containment reference.
+ * the new value of the '<em>Local Label Configuration</em>' containment reference.
* @see #getLocalLabelConfiguration()
* @generated
*/
void setLocalLabelConfiguration(FeatureLabelProviderConfiguration value);
-
} // FeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
index 5c2ca55d3e9..4574dede408 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Id Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
index df3ffb959b6..8f4078a4988 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Id Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
index 6461cb4f636..5f5608bc627 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
index fe7172270bd..425b60fab55 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public interface IAxis extends StyledElement {
+
/**
* Returns the value of the '<em><b>Manager</b></em>' reference.
* <!-- begin-user-doc -->
@@ -60,7 +61,7 @@ public interface IAxis extends StyledElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Manager</em>' reference.
+ * the new value of the '<em>Manager</em>' reference.
* @see #getManager()
* @generated
*/
@@ -88,7 +89,7 @@ public interface IAxis extends StyledElement {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Alias</em>' attribute.
+ * the new value of the '<em>Alias</em>' attribute.
* @see #getAlias()
* @generated
*/
@@ -118,5 +119,4 @@ public interface IAxis extends StyledElement {
* @generated
*/
ILabelProviderConfiguration getLocalLabelConfiguration();
-
} // IAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
index 7b66a98d15f..20785094ec5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
@@ -33,9 +33,11 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface ITreeItemAxis extends IAxis {
+
/**
* Returns the value of the '<em><b>Parent</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren
+ * <em>Children</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
@@ -52,12 +54,13 @@ public interface ITreeItemAxis extends IAxis {
ITreeItemAxis getParent();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'
+ * reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Parent</em>' reference.
+ * the new value of the '<em>Parent</em>' reference.
* @see #getParent()
* @generated
*/
@@ -81,12 +84,13 @@ public interface ITreeItemAxis extends IAxis {
boolean isExpanded();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Expanded</em>' attribute.
+ * the new value of the '<em>Expanded</em>' attribute.
* @see #isExpanded()
* @generated
*/
@@ -95,7 +99,8 @@ public interface ITreeItemAxis extends IAxis {
/**
* Returns the value of the '<em><b>Children</b></em>' reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis}.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent
+ * <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Children</em>' reference list isn't clear, there really should be more of a description here...
@@ -109,5 +114,4 @@ public interface ITreeItemAxis extends IAxis {
* @generated
*/
EList<ITreeItemAxis> getChildren();
-
} // ITreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
index 79f57896dec..6f6829d5eec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Id Axis</b></em>'.
@@ -30,6 +29,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
* @generated
*/
public interface IdAxis extends IAxis {
+
/**
* Returns the value of the '<em><b>Element</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -53,10 +53,9 @@ public interface IdAxis extends IAxis {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Element</em>' attribute.
+ * the new value of the '<em>Element</em>' attribute.
* @see #getElement()
* @generated
*/
void setElement(String value);
-
} // IdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
index b460007336b..fe7e6018b24 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Id Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
index 943ba409b69..f4e6f47acb0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableaxisFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -162,5 +163,4 @@ public interface NattableaxisFactory extends EFactory {
* @generated
*/
NattableaxisPackage getNattableaxisPackage();
-
} // NattableaxisFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
index 4bc54e79a4b..f848eeb9ed0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public interface NattableaxisPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -205,7 +206,8 @@ public interface NattableaxisPackage extends EPackage {
int IAXIS_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -507,7 +509,8 @@ public interface NattableaxisPackage extends EPackage {
int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl
+ * <em>Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -678,7 +681,8 @@ public interface NattableaxisPackage extends EPackage {
int ID_TREE_ITEM_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -819,7 +823,8 @@ public interface NattableaxisPackage extends EPackage {
int OBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -970,7 +975,8 @@ public interface NattableaxisPackage extends EPackage {
int EOBJECT_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl
+ * <em>EObject Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1151,7 +1157,8 @@ public interface NattableaxisPackage extends EPackage {
int EOBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = EOBJECT_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1292,7 +1299,8 @@ public interface NattableaxisPackage extends EPackage {
int FEATURE_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl
+ * <em>Feature Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1463,7 +1471,8 @@ public interface NattableaxisPackage extends EPackage {
int FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl
+ * <em>Object Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1634,7 +1643,8 @@ public interface NattableaxisPackage extends EPackage {
int OBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl
+ * <em>Feature Id Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1785,7 +1795,8 @@ public interface NattableaxisPackage extends EPackage {
int FEATURE_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl
+ * <em>Feature Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1966,7 +1977,8 @@ public interface NattableaxisPackage extends EPackage {
int FEATURE_ID_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_ID_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl
+ * <em>EStructural Feature Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2117,7 +2129,8 @@ public interface NattableaxisPackage extends EPackage {
int ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl
+ * <em>EStructural Feature Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2298,7 +2311,8 @@ public interface NattableaxisPackage extends EPackage {
int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl
+ * <em>Object Id Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2449,7 +2463,8 @@ public interface NattableaxisPackage extends EPackage {
int OBJECT_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl
+ * <em>Object Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2630,7 +2645,8 @@ public interface NattableaxisPackage extends EPackage {
int OBJECT_ID_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_ID_AXIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2770,7 +2786,6 @@ public interface NattableaxisPackage extends EPackage {
*/
int AXIS_GROUP_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
-
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.
* <!-- begin-user-doc -->
@@ -2783,7 +2798,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getIAxis();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager
+ * <em>Manager</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2795,7 +2811,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getIAxis_Manager();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}
+ * '.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2807,7 +2824,8 @@ public interface NattableaxisPackage extends EPackage {
EAttribute getIAxis_Alias();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}
+ * ' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2818,7 +2836,8 @@ public interface NattableaxisPackage extends EPackage {
EOperation getIAxis__GetElement();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration() <em>Get Local Label Configuration</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration()
+ * <em>Get Local Label Configuration</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2829,7 +2848,8 @@ public interface NattableaxisPackage extends EPackage {
EOperation getIAxis__GetLocalLabelConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+ * <em>ITree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2840,7 +2860,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getITreeItemAxis();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent
+ * <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2852,7 +2873,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getITreeItemAxis_Parent();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded
+ * <em>Expanded</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2864,7 +2886,8 @@ public interface NattableaxisPackage extends EPackage {
EAttribute getITreeItemAxis_Expanded();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2887,7 +2910,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getIdAxis();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement
+ * <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2899,7 +2923,8 @@ public interface NattableaxisPackage extends EPackage {
EAttribute getIdAxis_Element();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis
+ * <em>Id Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2921,7 +2946,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getEObjectAxis();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement
+ * <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2933,7 +2959,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getEObjectAxis_Element();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis
+ * <em>EObject Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2955,7 +2982,9 @@ public interface NattableaxisPackage extends EPackage {
EClass getFeatureAxis();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration
+ * <em>Local Label Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2967,7 +2996,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getFeatureAxis_LocalLabelConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis
+ * <em>Feature Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2989,7 +3019,9 @@ public interface NattableaxisPackage extends EPackage {
EClass getObjectAxis();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}
+ * '.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3001,7 +3033,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getObjectAxis_LocalLabelConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis
+ * <em>Object Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3012,7 +3045,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getObjectTreeItemAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis
+ * <em>Feature Id Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3023,7 +3057,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getFeatureIdAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis
+ * <em>Feature Id Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3034,7 +3069,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getFeatureIdTreeItemAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis
+ * <em>EStructural Feature Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3045,7 +3081,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getEStructuralFeatureAxis();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3057,7 +3094,8 @@ public interface NattableaxisPackage extends EPackage {
EReference getEStructuralFeatureAxis_Element();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis
+ * <em>EStructural Feature Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3068,7 +3106,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getEStructuralFeatureTreeItemAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}
+ * '.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3079,7 +3118,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getObjectIdAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis
+ * <em>Object Id Tree Item Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3101,7 +3141,8 @@ public interface NattableaxisPackage extends EPackage {
EClass getAxisGroup();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis
+ * <em>Grouped Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3137,6 +3178,7 @@ public interface NattableaxisPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.
* <!-- begin-user-doc -->
@@ -3185,7 +3227,8 @@ public interface NattableaxisPackage extends EPackage {
EOperation IAXIS___GET_LOCAL_LABEL_CONFIGURATION = eINSTANCE.getIAxis__GetLocalLabelConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+ * <em>ITree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3223,7 +3266,8 @@ public interface NattableaxisPackage extends EPackage {
EReference ITREE_ITEM_AXIS__CHILDREN = eINSTANCE.getITreeItemAxis_Children();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3243,7 +3287,8 @@ public interface NattableaxisPackage extends EPackage {
EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl
+ * <em>Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3254,7 +3299,8 @@ public interface NattableaxisPackage extends EPackage {
EClass ID_TREE_ITEM_AXIS = eINSTANCE.getIdTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl
+ * <em>EObject Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3274,7 +3320,8 @@ public interface NattableaxisPackage extends EPackage {
EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl
+ * <em>EObject Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3285,7 +3332,8 @@ public interface NattableaxisPackage extends EPackage {
EClass EOBJECT_TREE_ITEM_AXIS = eINSTANCE.getEObjectTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl
+ * <em>Feature Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3305,7 +3353,8 @@ public interface NattableaxisPackage extends EPackage {
EReference FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getFeatureAxis_LocalLabelConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl
+ * <em>Feature Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3316,7 +3365,8 @@ public interface NattableaxisPackage extends EPackage {
EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl
+ * <em>Object Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3336,7 +3386,8 @@ public interface NattableaxisPackage extends EPackage {
EReference OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getObjectAxis_LocalLabelConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl
+ * <em>Object Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3347,7 +3398,8 @@ public interface NattableaxisPackage extends EPackage {
EClass OBJECT_TREE_ITEM_AXIS = eINSTANCE.getObjectTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl
+ * <em>Feature Id Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3358,7 +3410,8 @@ public interface NattableaxisPackage extends EPackage {
EClass FEATURE_ID_AXIS = eINSTANCE.getFeatureIdAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl
+ * <em>Feature Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3369,7 +3422,8 @@ public interface NattableaxisPackage extends EPackage {
EClass FEATURE_ID_TREE_ITEM_AXIS = eINSTANCE.getFeatureIdTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl
+ * <em>EStructural Feature Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3389,7 +3443,9 @@ public interface NattableaxisPackage extends EPackage {
EReference ESTRUCTURAL_FEATURE_AXIS__ELEMENT = eINSTANCE.getEStructuralFeatureAxis_Element();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl
+ * <em>EStructural Feature Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3400,7 +3456,8 @@ public interface NattableaxisPackage extends EPackage {
EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl
+ * <em>Object Id Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3411,7 +3468,8 @@ public interface NattableaxisPackage extends EPackage {
EClass OBJECT_ID_AXIS = eINSTANCE.getObjectIdAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl
+ * <em>Object Id Tree Item Axis</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3422,7 +3480,8 @@ public interface NattableaxisPackage extends EPackage {
EClass OBJECT_ID_TREE_ITEM_AXIS = eINSTANCE.getObjectIdTreeItemAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl
+ * <em>Axis Group</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3440,7 +3499,5 @@ public interface NattableaxisPackage extends EPackage {
* @generated
*/
EReference AXIS_GROUP__GROUPED_AXIS = eINSTANCE.getAxisGroup_GroupedAxis();
-
}
-
} // NattableaxisPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
index 978d754110f..4da0ce22c9d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
@@ -26,7 +26,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}
+ * </li>
* </ul>
* </p>
*
@@ -35,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
* @generated
*/
public interface ObjectAxis extends IAxis {
+
/**
* Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -54,15 +56,15 @@ public interface ObjectAxis extends IAxis {
ObjectLabelProviderConfiguration getLocalLabelConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration
+ * <em>Local Label Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Local Label Configuration</em>' containment reference.
+ * the new value of the '<em>Local Label Configuration</em>' containment reference.
* @see #getLocalLabelConfiguration()
* @generated
*/
void setLocalLabelConfiguration(ObjectLabelProviderConfiguration value);
-
} // ObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
index af3faf6a587..5ca5862a0e0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Object Id Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
index f6bffa43e82..82131b34d84 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Object Id Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
index f3d60e10ec5..cd80215c34e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Object Tree Item Axis</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
index 5c87564485c..28775b1dbb9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* @generated
*/
public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
+
/**
* The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
* <!-- begin-user-doc -->
@@ -117,11 +118,11 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public AxisManagerRepresentation getManager() {
- if (manager != null && manager.eIsProxy()) {
- InternalEObject oldManager = (InternalEObject) manager;
- manager = (AxisManagerRepresentation) eResolveProxy(oldManager);
- if (manager != oldManager) {
- if (eNotificationRequired()) {
+ if(manager != null && manager.eIsProxy()) {
+ InternalEObject oldManager = (InternalEObject)manager;
+ manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+ if(manager != oldManager) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));
}
}
@@ -149,7 +150,7 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
public void setManager(AxisManagerRepresentation newManager) {
AxisManagerRepresentation oldManager = manager;
manager = newManager;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));
}
}
@@ -175,7 +176,7 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
public void setAlias(String newAlias) {
String oldAlias = alias;
alias = newAlias;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__ALIAS, oldAlias, alias));
}
}
@@ -188,7 +189,7 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public EList<IAxis> getGroupedAxis() {
- if (groupedAxis == null) {
+ if(groupedAxis == null) {
groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);
}
return groupedAxis;
@@ -228,9 +229,9 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.AXIS_GROUP__MANAGER:
- if (resolve) {
+ if(resolve) {
return getManager();
}
return basicGetManager();
@@ -251,16 +252,16 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.AXIS_GROUP__MANAGER:
- setManager((AxisManagerRepresentation) newValue);
+ setManager((AxisManagerRepresentation)newValue);
return;
case NattableaxisPackage.AXIS_GROUP__ALIAS:
- setAlias((String) newValue);
+ setAlias((String)newValue);
return;
case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:
getGroupedAxis().clear();
- getGroupedAxis().addAll((Collection<? extends IAxis>) newValue);
+ getGroupedAxis().addAll((Collection<? extends IAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -274,9 +275,9 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.AXIS_GROUP__MANAGER:
- setManager((AxisManagerRepresentation) null);
+ setManager((AxisManagerRepresentation)null);
return;
case NattableaxisPackage.AXIS_GROUP__ALIAS:
setAlias(ALIAS_EDEFAULT);
@@ -296,7 +297,7 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.AXIS_GROUP__MANAGER:
return manager != null;
case NattableaxisPackage.AXIS_GROUP__ALIAS:
@@ -315,7 +316,7 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattableaxisPackage.AXIS_GROUP___GET_ELEMENT:
return getElement();
case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:
@@ -332,15 +333,13 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alias: "); //$NON-NLS-1$
result.append(alias);
result.append(')');
return result.toString();
}
-
} // AxisGroupImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
index 019f3486f82..fa40a7dcd3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
+
/**
* The cached value of the '{@link #getElement() <em>Element</em>}' reference.
* <!-- begin-user-doc -->
@@ -74,11 +75,11 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
*/
@Override
public EObject getElement() {
- if (element != null && element.eIsProxy()) {
- InternalEObject oldElement = (InternalEObject) element;
+ if(element != null && element.eIsProxy()) {
+ InternalEObject oldElement = (InternalEObject)element;
element = eResolveProxy(oldElement);
- if (element != oldElement) {
- if (eNotificationRequired()) {
+ if(element != oldElement) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
}
}
@@ -106,7 +107,7 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
public void setElement(EObject newElement) {
EObject oldElement = element;
element = newElement;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
}
}
@@ -119,9 +120,9 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
- if (resolve) {
+ if(resolve) {
return getElement();
}
return basicGetElement();
@@ -137,9 +138,9 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
- setElement((EObject) newValue);
+ setElement((EObject)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -153,9 +154,9 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
- setElement((EObject) null);
+ setElement((EObject)null);
return;
}
super.eUnset(featureID);
@@ -169,11 +170,10 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
return element != null;
}
return super.eIsSet(featureID);
}
-
} // EObjectAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
index e9ec9e10f09..813e105a11a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // EObjectTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
index 4b501d82149..67cb06e009f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStructuralFeatureAxis {
+
/**
* The cached value of the '{@link #getElement() <em>Element</em>}' reference.
* <!-- begin-user-doc -->
@@ -74,11 +75,11 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
*/
@Override
public EStructuralFeature getElement() {
- if (element != null && element.eIsProxy()) {
- InternalEObject oldElement = (InternalEObject) element;
- element = (EStructuralFeature) eResolveProxy(oldElement);
- if (element != oldElement) {
- if (eNotificationRequired()) {
+ if(element != null && element.eIsProxy()) {
+ InternalEObject oldElement = (InternalEObject)element;
+ element = (EStructuralFeature)eResolveProxy(oldElement);
+ if(element != oldElement) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));
}
}
@@ -106,7 +107,7 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
public void setElement(EStructuralFeature newElement) {
EStructuralFeature oldElement = element;
element = newElement;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));
}
}
@@ -119,9 +120,9 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
- if (resolve) {
+ if(resolve) {
return getElement();
}
return basicGetElement();
@@ -137,9 +138,9 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
- setElement((EStructuralFeature) newValue);
+ setElement((EStructuralFeature)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -153,9 +154,9 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
- setElement((EStructuralFeature) null);
+ setElement((EStructuralFeature)null);
return;
}
super.eUnset(featureID);
@@ -169,11 +170,10 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
return element != null;
}
return super.eIsSet(featureID);
}
-
} // EStructuralFeatureAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
index e0f20c51e06..2a77cdb2ee3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisImpl implements EStructuralFeatureTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // EStructuralFeatureTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
index f7a59ab0073..a32e9a61e75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
@@ -35,13 +35,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <ul>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getManager <em>Manager</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getAlias <em>Alias</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label
+ * Configuration</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public abstract class FeatureAxisImpl extends StyledElementImpl implements FeatureAxis {
+
/**
* The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +117,11 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public AxisManagerRepresentation getManager() {
- if (manager != null && manager.eIsProxy()) {
- InternalEObject oldManager = (InternalEObject) manager;
- manager = (AxisManagerRepresentation) eResolveProxy(oldManager);
- if (manager != oldManager) {
- if (eNotificationRequired()) {
+ if(manager != null && manager.eIsProxy()) {
+ InternalEObject oldManager = (InternalEObject)manager;
+ manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+ if(manager != oldManager) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));
}
}
@@ -147,7 +149,7 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
public void setManager(AxisManagerRepresentation newManager) {
AxisManagerRepresentation oldManager = manager;
manager = newManager;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));
}
}
@@ -173,7 +175,7 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
public void setAlias(String newAlias) {
String oldAlias = alias;
alias = newAlias;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));
}
}
@@ -198,9 +200,9 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
localLabelConfiguration = newLocalLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -217,20 +219,19 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
- if (newLocalLabelConfiguration != localLabelConfiguration) {
+ if(newLocalLabelConfiguration != localLabelConfiguration) {
NotificationChain msgs = null;
- if (localLabelConfiguration != null) {
- msgs = ((InternalEObject) localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(localLabelConfiguration != null) {
+ msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
- if (newLocalLabelConfiguration != null) {
- msgs = ((InternalEObject) newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(newLocalLabelConfiguration != null) {
+ msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
}
}
@@ -256,7 +257,7 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
return basicSetLocalLabelConfiguration(null, msgs);
}
@@ -271,9 +272,9 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_AXIS__MANAGER:
- if (resolve) {
+ if(resolve) {
return getManager();
}
return basicGetManager();
@@ -293,15 +294,15 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) newValue);
+ setManager((AxisManagerRepresentation)newValue);
return;
case NattableaxisPackage.FEATURE_AXIS__ALIAS:
- setAlias((String) newValue);
+ setAlias((String)newValue);
return;
case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((FeatureLabelProviderConfiguration) newValue);
+ setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,15 +316,15 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) null);
+ setManager((AxisManagerRepresentation)null);
return;
case NattableaxisPackage.FEATURE_AXIS__ALIAS:
setAlias(ALIAS_EDEFAULT);
return;
case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((FeatureLabelProviderConfiguration) null);
+ setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);
return;
}
super.eUnset(featureID);
@@ -337,7 +338,7 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_AXIS__MANAGER:
return manager != null;
case NattableaxisPackage.FEATURE_AXIS__ALIAS:
@@ -356,7 +357,7 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:
return getElement();
}
@@ -371,15 +372,13 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alias: "); //$NON-NLS-1$
result.append(alias);
result.append(')');
return result.toString();
}
-
} // FeatureAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
index 8c4428fdf8e..73fe2926fe0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
@@ -29,13 +29,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label
+ * Configuration</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
+
/**
* The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -88,9 +90,9 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
localLabelConfiguration = newLocalLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -107,20 +109,19 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
- if (newLocalLabelConfiguration != localLabelConfiguration) {
+ if(newLocalLabelConfiguration != localLabelConfiguration) {
NotificationChain msgs = null;
- if (localLabelConfiguration != null) {
- msgs = ((InternalEObject) localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(localLabelConfiguration != null) {
+ msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
- if (newLocalLabelConfiguration != null) {
- msgs = ((InternalEObject) newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(newLocalLabelConfiguration != null) {
+ msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
}
}
@@ -133,7 +134,7 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return basicSetLocalLabelConfiguration(null, msgs);
}
@@ -148,7 +149,7 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return getLocalLabelConfiguration();
}
@@ -163,9 +164,9 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((FeatureLabelProviderConfiguration) newValue);
+ setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -179,9 +180,9 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((FeatureLabelProviderConfiguration) null);
+ setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);
return;
}
super.eUnset(featureID);
@@ -195,7 +196,7 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return localLabelConfiguration != null;
}
@@ -210,8 +211,8 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == FeatureAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == FeatureAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
default:
@@ -229,8 +230,8 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == FeatureAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == FeatureAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
default:
@@ -239,5 +240,4 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
}
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
-
} // FeatureIdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
index cd2f2b1c638..0904aa77e8b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements FeatureIdTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // FeatureIdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
index b4bea14a109..3488fa65ddf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // FeatureTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
index 0b37c9bcbcb..7048f534146 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* @generated
*/
public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
+
/**
* The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
* <!-- begin-user-doc -->
@@ -125,11 +126,11 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public AxisManagerRepresentation getManager() {
- if (manager != null && manager.eIsProxy()) {
- InternalEObject oldManager = (InternalEObject) manager;
- manager = (AxisManagerRepresentation) eResolveProxy(oldManager);
- if (manager != oldManager) {
- if (eNotificationRequired()) {
+ if(manager != null && manager.eIsProxy()) {
+ InternalEObject oldManager = (InternalEObject)manager;
+ manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+ if(manager != oldManager) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));
}
}
@@ -157,7 +158,7 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
public void setManager(AxisManagerRepresentation newManager) {
AxisManagerRepresentation oldManager = manager;
manager = newManager;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));
}
}
@@ -183,7 +184,7 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
public void setAlias(String newAlias) {
String oldAlias = alias;
alias = newAlias;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));
}
}
@@ -209,7 +210,7 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
public void setElement(String newElement) {
String oldElement = element;
element = newElement;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));
}
}
@@ -235,9 +236,9 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_AXIS__MANAGER:
- if (resolve) {
+ if(resolve) {
return getManager();
}
return basicGetManager();
@@ -257,15 +258,15 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) newValue);
+ setManager((AxisManagerRepresentation)newValue);
return;
case NattableaxisPackage.ID_AXIS__ALIAS:
- setAlias((String) newValue);
+ setAlias((String)newValue);
return;
case NattableaxisPackage.ID_AXIS__ELEMENT:
- setElement((String) newValue);
+ setElement((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -279,9 +280,9 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) null);
+ setManager((AxisManagerRepresentation)null);
return;
case NattableaxisPackage.ID_AXIS__ALIAS:
setAlias(ALIAS_EDEFAULT);
@@ -301,7 +302,7 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_AXIS__MANAGER:
return manager != null;
case NattableaxisPackage.ID_AXIS__ALIAS:
@@ -320,7 +321,7 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattableaxisPackage.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:
return getLocalLabelConfiguration();
}
@@ -335,10 +336,9 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alias: "); //$NON-NLS-1$
result.append(alias);
@@ -347,5 +347,4 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
result.append(')');
return result.toString();
}
-
} // IdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
index e92a0d6984f..2557d198164 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
* @generated
*/
public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // IdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
index 8e319051621..380e28b18e2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
* @generated
*/
public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -49,8 +50,8 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
*/
public static NattableaxisFactory init() {
try {
- NattableaxisFactory theNattableaxisFactory = (NattableaxisFactory) EPackage.Registry.INSTANCE.getEFactory(NattableaxisPackage.eNS_URI);
- if (theNattableaxisFactory != null) {
+ NattableaxisFactory theNattableaxisFactory = (NattableaxisFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisPackage.eNS_URI);
+ if(theNattableaxisFactory != null) {
return theNattableaxisFactory;
}
} catch (Exception exception) {
@@ -78,7 +79,7 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattableaxisPackage.ID_TREE_ITEM_AXIS:
return createIdTreeItemAxis();
case NattableaxisPackage.EOBJECT_AXIS:
@@ -260,7 +261,7 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
*/
@Override
public NattableaxisPackage getNattableaxisPackage() {
- return (NattableaxisPackage) getEPackage();
+ return (NattableaxisPackage)getEPackage();
}
/**
@@ -274,5 +275,4 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
public static NattableaxisPackage getPackage() {
return NattableaxisPackage.eINSTANCE;
}
-
} // NattableaxisFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
index 163ac4b78c0..f8327356562 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -202,10 +203,12 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
private EClass axisGroupEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI
@@ -228,8 +231,8 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattableaxisPackage#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
- * -->
+ * This method is used to initialize {@link NattableaxisPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -237,41 +240,24 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
* @generated
*/
public static NattableaxisPackage init() {
- if (isInited) {
- return (NattableaxisPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+ if(isInited) {
+ return (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisPackageImpl());
-
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -283,7 +269,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattableaxisPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -295,11 +280,8 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattableaxisPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattableaxisPackage.eNS_URI, theNattableaxisPackage);
return theNattableaxisPackage;
@@ -324,7 +306,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getIAxis_Manager() {
- return (EReference) iAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)iAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -335,7 +317,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EAttribute getIAxis_Alias() {
- return (EAttribute) iAxisEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);
}
/**
@@ -379,7 +361,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getITreeItemAxis_Parent() {
- return (EReference) iTreeItemAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -390,7 +372,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EAttribute getITreeItemAxis_Expanded() {
- return (EAttribute) iTreeItemAxisEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)iTreeItemAxisEClass.getEStructuralFeatures().get(1);
}
/**
@@ -401,7 +383,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getITreeItemAxis_Children() {
- return (EReference) iTreeItemAxisEClass.getEStructuralFeatures().get(2);
+ return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(2);
}
/**
@@ -423,7 +405,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EAttribute getIdAxis_Element() {
- return (EAttribute) idAxisEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -456,7 +438,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getEObjectAxis_Element() {
- return (EReference) eObjectAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -489,7 +471,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getFeatureAxis_LocalLabelConfiguration() {
- return (EReference) featureAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -522,7 +504,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getObjectAxis_LocalLabelConfiguration() {
- return (EReference) objectAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -577,7 +559,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getEStructuralFeatureAxis_Element() {
- return (EReference) eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);
+ return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);
}
/**
@@ -632,7 +614,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public EReference getAxisGroup_GroupedAxis() {
- return (EReference) axisGroupEClass.getEStructuralFeatures().get(0);
+ return (EReference)axisGroupEClass.getEStructuralFeatures().get(0);
}
/**
@@ -643,7 +625,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
*/
@Override
public NattableaxisFactory getNattableaxisFactory() {
- return (NattableaxisFactory) getEFactoryInstance();
+ return (NattableaxisFactory)getEFactoryInstance();
}
/**
@@ -663,56 +645,39 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
iAxisEClass = createEClass(IAXIS);
createEReference(iAxisEClass, IAXIS__MANAGER);
createEAttribute(iAxisEClass, IAXIS__ALIAS);
createEOperation(iAxisEClass, IAXIS___GET_ELEMENT);
createEOperation(iAxisEClass, IAXIS___GET_LOCAL_LABEL_CONFIGURATION);
-
iTreeItemAxisEClass = createEClass(ITREE_ITEM_AXIS);
createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__PARENT);
createEAttribute(iTreeItemAxisEClass, ITREE_ITEM_AXIS__EXPANDED);
createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__CHILDREN);
-
idAxisEClass = createEClass(ID_AXIS);
createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);
-
idTreeItemAxisEClass = createEClass(ID_TREE_ITEM_AXIS);
-
eObjectAxisEClass = createEClass(EOBJECT_AXIS);
createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);
-
eObjectTreeItemAxisEClass = createEClass(EOBJECT_TREE_ITEM_AXIS);
-
featureAxisEClass = createEClass(FEATURE_AXIS);
createEReference(featureAxisEClass, FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);
-
featureTreeItemAxisEClass = createEClass(FEATURE_TREE_ITEM_AXIS);
-
objectAxisEClass = createEClass(OBJECT_AXIS);
createEReference(objectAxisEClass, OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);
-
objectTreeItemAxisEClass = createEClass(OBJECT_TREE_ITEM_AXIS);
-
featureIdAxisEClass = createEClass(FEATURE_ID_AXIS);
-
featureIdTreeItemAxisEClass = createEClass(FEATURE_ID_TREE_ITEM_AXIS);
-
eStructuralFeatureAxisEClass = createEClass(ESTRUCTURAL_FEATURE_AXIS);
createEReference(eStructuralFeatureAxisEClass, ESTRUCTURAL_FEATURE_AXIS__ELEMENT);
-
eStructuralFeatureTreeItemAxisEClass = createEClass(ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS);
-
objectIdAxisEClass = createEClass(OBJECT_ID_AXIS);
-
objectIdTreeItemAxisEClass = createEClass(OBJECT_ID_TREE_ITEM_AXIS);
-
axisGroupEClass = createEClass(AXIS_GROUP);
createEReference(axisGroupEClass, AXIS_GROUP__GROUPED_AXIS);
}
@@ -734,25 +699,20 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
- NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
- NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
-
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+ NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+ NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
iAxisEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
iTreeItemAxisEClass.getESuperTypes().add(this.getIAxis());
@@ -780,62 +740,36 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
objectIdTreeItemAxisEClass.getESuperTypes().add(this.getObjectIdAxis());
objectIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
axisGroupEClass.getESuperTypes().add(this.getIAxis());
-
// Initialize classes, features, and operations; add parameters
initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null,
- "manager", null, 1, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null, "manager", null, 1, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getIAxis_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEOperation(getIAxis__GetLocalLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), "getLocalLabelConfiguration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEClass(iTreeItemAxisEClass, ITreeItemAxis.class, "ITreeItemAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getITreeItemAxis_Parent(), this.getITreeItemAxis(), this.getITreeItemAxis_Children(),
- "parent", null, 0, 1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getITreeItemAxis_Parent(), this.getITreeItemAxis(), this.getITreeItemAxis_Children(), "parent", null, 0, 1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getITreeItemAxis_Expanded(), ecorePackage.getEBoolean(), "expanded", "false", 1, 1, ITreeItemAxis.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEReference(getITreeItemAxis_Children(), this.getITreeItemAxis(), this.getITreeItemAxis_Parent(),
- "children", null, 0, -1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getITreeItemAxis_Children(), this.getITreeItemAxis(), this.getITreeItemAxis_Parent(), "children", null, 0, -1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(idAxisEClass, IdAxis.class, "IdAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(idTreeItemAxisEClass, IdTreeItemAxis.class, "IdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getEObjectAxis_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(eObjectTreeItemAxisEClass, EObjectTreeItemAxis.class, "EObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(featureAxisEClass, FeatureAxis.class, "FeatureAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFeatureAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getFeatureLabelProviderConfiguration(), null,
- "localLabelConfiguration", null, 0, 1, FeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getFeatureAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getFeatureLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, FeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(objectAxisEClass, ObjectAxis.class, "ObjectAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null,
- "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(featureIdTreeItemAxisEClass, FeatureIdTreeItemAxis.class, "FeatureIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(eStructuralFeatureAxisEClass, EStructuralFeatureAxis.class, "EStructuralFeatureAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEStructuralFeatureAxis_Element(), ecorePackage.getEStructuralFeature(), null,
- "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getEStructuralFeatureAxis_Element(), ecorePackage.getEStructuralFeature(), null, "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(eStructuralFeatureTreeItemAxisEClass, EStructuralFeatureTreeItemAxis.class, "EStructuralFeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(objectIdTreeItemAxisEClass, ObjectIdTreeItemAxis.class, "ObjectIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(axisGroupEClass, AxisGroup.class, "AxisGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getAxisGroup_GroupedAxis(), this.getIAxis(), null, "groupedAxis", null, 0, -1, AxisGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
}
-
} // NattableaxisPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
index c309d64957e..56ae15a6095 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
@@ -35,13 +35,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <ul>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getManager <em>Manager</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getAlias <em>Alias</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label
+ * Configuration</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public abstract class ObjectAxisImpl extends StyledElementImpl implements ObjectAxis {
+
/**
* The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +117,11 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public AxisManagerRepresentation getManager() {
- if (manager != null && manager.eIsProxy()) {
- InternalEObject oldManager = (InternalEObject) manager;
- manager = (AxisManagerRepresentation) eResolveProxy(oldManager);
- if (manager != oldManager) {
- if (eNotificationRequired()) {
+ if(manager != null && manager.eIsProxy()) {
+ InternalEObject oldManager = (InternalEObject)manager;
+ manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+ if(manager != oldManager) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));
}
}
@@ -147,7 +149,7 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
public void setManager(AxisManagerRepresentation newManager) {
AxisManagerRepresentation oldManager = manager;
manager = newManager;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));
}
}
@@ -173,7 +175,7 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
public void setAlias(String newAlias) {
String oldAlias = alias;
alias = newAlias;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));
}
}
@@ -198,9 +200,9 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
localLabelConfiguration = newLocalLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -217,20 +219,19 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
- if (newLocalLabelConfiguration != localLabelConfiguration) {
+ if(newLocalLabelConfiguration != localLabelConfiguration) {
NotificationChain msgs = null;
- if (localLabelConfiguration != null) {
- msgs = ((InternalEObject) localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(localLabelConfiguration != null) {
+ msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
- if (newLocalLabelConfiguration != null) {
- msgs = ((InternalEObject) newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(newLocalLabelConfiguration != null) {
+ msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
}
}
@@ -256,7 +257,7 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
return basicSetLocalLabelConfiguration(null, msgs);
}
@@ -271,9 +272,9 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_AXIS__MANAGER:
- if (resolve) {
+ if(resolve) {
return getManager();
}
return basicGetManager();
@@ -293,15 +294,15 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) newValue);
+ setManager((AxisManagerRepresentation)newValue);
return;
case NattableaxisPackage.OBJECT_AXIS__ALIAS:
- setAlias((String) newValue);
+ setAlias((String)newValue);
return;
case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((ObjectLabelProviderConfiguration) newValue);
+ setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,15 +316,15 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_AXIS__MANAGER:
- setManager((AxisManagerRepresentation) null);
+ setManager((AxisManagerRepresentation)null);
return;
case NattableaxisPackage.OBJECT_AXIS__ALIAS:
setAlias(ALIAS_EDEFAULT);
return;
case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((ObjectLabelProviderConfiguration) null);
+ setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);
return;
}
super.eUnset(featureID);
@@ -337,7 +338,7 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_AXIS__MANAGER:
return manager != null;
case NattableaxisPackage.OBJECT_AXIS__ALIAS:
@@ -356,7 +357,7 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:
return getElement();
}
@@ -371,15 +372,13 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alias: "); //$NON-NLS-1$
result.append(alias);
result.append(')');
return result.toString();
}
-
} // ObjectAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
index 75ee94ff44f..f8b28bf2e97 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
@@ -29,13 +29,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label
+ * Configuration</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
+
/**
* The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -88,9 +90,9 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
localLabelConfiguration = newLocalLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -107,20 +109,19 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
- if (newLocalLabelConfiguration != localLabelConfiguration) {
+ if(newLocalLabelConfiguration != localLabelConfiguration) {
NotificationChain msgs = null;
- if (localLabelConfiguration != null) {
- msgs = ((InternalEObject) localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(localLabelConfiguration != null) {
+ msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
- if (newLocalLabelConfiguration != null) {
- msgs = ((InternalEObject) newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+ if(newLocalLabelConfiguration != null) {
+ msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
}
msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
}
}
@@ -133,7 +134,7 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return basicSetLocalLabelConfiguration(null, msgs);
}
@@ -148,7 +149,7 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return getLocalLabelConfiguration();
}
@@ -163,9 +164,9 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((ObjectLabelProviderConfiguration) newValue);
+ setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -179,9 +180,9 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
- setLocalLabelConfiguration((ObjectLabelProviderConfiguration) null);
+ setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);
return;
}
super.eUnset(featureID);
@@ -195,7 +196,7 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return localLabelConfiguration != null;
}
@@ -210,8 +211,8 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ObjectAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ObjectAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
default:
@@ -229,8 +230,8 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ObjectAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ObjectAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
default:
@@ -239,5 +240,4 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
}
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
-
} // ObjectIdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
index 7c6f70fe078..5610cd753b2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTr
* @generated
*/
public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements ObjectIdTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // ObjectIdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
index e97019eeb0a..71c89a093c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
* @generated
*/
public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {
+
/**
* The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
* <!-- begin-user-doc -->
@@ -115,11 +116,11 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public ITreeItemAxis getParent() {
- if (parent != null && parent.eIsProxy()) {
- InternalEObject oldParent = (InternalEObject) parent;
- parent = (ITreeItemAxis) eResolveProxy(oldParent);
- if (parent != oldParent) {
- if (eNotificationRequired()) {
+ if(parent != null && parent.eIsProxy()) {
+ InternalEObject oldParent = (InternalEObject)parent;
+ parent = (ITreeItemAxis)eResolveProxy(oldParent);
+ if(parent != oldParent) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));
}
}
@@ -146,9 +147,9 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
ITreeItemAxis oldParent = parent;
parent = newParent;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -165,20 +166,19 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public void setParent(ITreeItemAxis newParent) {
- if (newParent != parent) {
+ if(newParent != parent) {
NotificationChain msgs = null;
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- if (newParent != null) {
- msgs = ((InternalEObject) newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(newParent != null) {
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
}
}
@@ -204,7 +204,7 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
public void setExpanded(boolean newExpanded) {
boolean oldExpanded = expanded;
expanded = newExpanded;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
}
}
@@ -217,7 +217,7 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public EList<ITreeItemAxis> getChildren() {
- if (children == null) {
+ if(children == null) {
children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
}
return children;
@@ -232,14 +232,14 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
- if (parent != null) {
- msgs = ((InternalEObject) parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+ if(parent != null) {
+ msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
}
- return basicSetParent((ITreeItemAxis) otherEnd, msgs);
+ return basicSetParent((ITreeItemAxis)otherEnd, msgs);
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -252,11 +252,11 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
return basicSetParent(null, msgs);
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
- return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -269,9 +269,9 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
- if (resolve) {
+ if(resolve) {
return getParent();
}
return basicGetParent();
@@ -292,16 +292,16 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) newValue);
+ setParent((ITreeItemAxis)newValue);
return;
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
- setExpanded((Boolean) newValue);
+ setExpanded((Boolean)newValue);
return;
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
getChildren().clear();
- getChildren().addAll((Collection<? extends ITreeItemAxis>) newValue);
+ getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -315,9 +315,9 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
- setParent((ITreeItemAxis) null);
+ setParent((ITreeItemAxis)null);
return;
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
setExpanded(EXPANDED_EDEFAULT);
@@ -337,7 +337,7 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
return parent != null;
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
@@ -356,8 +356,8 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (derivedFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(derivedFeatureID) {
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
@@ -379,8 +379,8 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == ITreeItemAxis.class) {
- switch (baseFeatureID) {
+ if(baseClass == ITreeItemAxis.class) {
+ switch(baseFeatureID) {
case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:
return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT;
case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:
@@ -402,15 +402,13 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (expanded: "); //$NON-NLS-1$
result.append(expanded);
result.append(')');
return result.toString();
}
-
} // ObjectTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
index 985cc4fee8a..6adeed365d5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
@@ -47,6 +47,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -64,7 +65,7 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattableaxisAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisPackage.eINSTANCE;
}
}
@@ -80,11 +81,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -96,108 +97,108 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattableaxisSwitch<Adapter> modelSwitch =
- new NattableaxisSwitch<Adapter>() {
- @Override
- public Adapter caseIAxis(IAxis object) {
- return createIAxisAdapter();
- }
-
- @Override
- public Adapter caseITreeItemAxis(ITreeItemAxis object) {
- return createITreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseIdAxis(IdAxis object) {
- return createIdAxisAdapter();
- }
-
- @Override
- public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {
- return createIdTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseEObjectAxis(EObjectAxis object) {
- return createEObjectAxisAdapter();
- }
-
- @Override
- public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {
- return createEObjectTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseFeatureAxis(FeatureAxis object) {
- return createFeatureAxisAdapter();
- }
-
- @Override
- public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {
- return createFeatureTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseObjectAxis(ObjectAxis object) {
- return createObjectAxisAdapter();
- }
-
- @Override
- public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {
- return createObjectTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseFeatureIdAxis(FeatureIdAxis object) {
- return createFeatureIdAxisAdapter();
- }
-
- @Override
- public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {
- return createFeatureIdTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {
- return createEStructuralFeatureAxisAdapter();
- }
-
- @Override
- public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {
- return createEStructuralFeatureTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseObjectIdAxis(ObjectIdAxis object) {
- return createObjectIdAxisAdapter();
- }
-
- @Override
- public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {
- return createObjectIdTreeItemAxisAdapter();
- }
-
- @Override
- public Adapter caseAxisGroup(AxisGroup object) {
- return createAxisGroupAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattableaxisSwitch<Adapter> modelSwitch = new NattableaxisSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseIAxis(IAxis object) {
+ return createIAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseITreeItemAxis(ITreeItemAxis object) {
+ return createITreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseIdAxis(IdAxis object) {
+ return createIdAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {
+ return createIdTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseEObjectAxis(EObjectAxis object) {
+ return createEObjectAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {
+ return createEObjectTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureAxis(FeatureAxis object) {
+ return createFeatureAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {
+ return createFeatureTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseObjectAxis(ObjectAxis object) {
+ return createObjectAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {
+ return createObjectTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureIdAxis(FeatureIdAxis object) {
+ return createFeatureIdAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {
+ return createFeatureIdTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {
+ return createEStructuralFeatureAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {
+ return createEStructuralFeatureTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseObjectIdAxis(ObjectIdAxis object) {
+ return createObjectIdAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {
+ return createObjectIdTreeItemAxisAdapter();
+ }
+
+ @Override
+ public Adapter caseAxisGroup(AxisGroup object) {
+ return createAxisGroupAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -205,16 +206,15 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.
* <!-- begin-user-doc -->
@@ -231,7 +231,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+ * <em>ITree Item Axis</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.
@@ -261,7 +262,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis
+ * <em>Id Tree Item Axis</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.
@@ -276,7 +278,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis <em>EObject Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis
+ * <em>EObject Axis</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.
@@ -291,7 +294,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis
+ * <em>EObject Tree Item Axis</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.
@@ -306,7 +310,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis
+ * <em>Feature Axis</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.
@@ -321,7 +326,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis
+ * <em>Feature Tree Item Axis</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.
@@ -336,7 +342,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis
+ * <em>Object Axis</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.
@@ -351,7 +358,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis
+ * <em>Object Tree Item Axis</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.
@@ -366,7 +374,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis
+ * <em>Feature Id Axis</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.
@@ -381,7 +390,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis
+ * <em>Feature Id Tree Item Axis</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.
@@ -396,7 +406,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis
+ * <em>EStructural Feature Axis</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.
@@ -411,7 +422,9 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis
+ * <em>EStructural Feature Tree Item Axis</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.
@@ -426,7 +439,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis
+ * <em>Object Id Axis</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.
@@ -441,7 +455,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis
+ * <em>Object Id Tree Item Axis</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.
@@ -456,7 +471,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup
+ * <em>Axis 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.
@@ -486,7 +502,8 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -512,5 +529,4 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableaxisAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
index b92ce1172a0..3857c0d9549 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
@@ -50,6 +50,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -67,7 +68,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* @generated
*/
public NattableaxisSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisPackage.eINSTANCE;
}
}
@@ -96,367 +97,384 @@ public class NattableaxisSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattableaxisPackage.IAXIS: {
- IAxis iAxis = (IAxis) theEObject;
+ switch(classifierID) {
+ case NattableaxisPackage.IAXIS:
+ {
+ IAxis iAxis = (IAxis)theEObject;
T result = caseIAxis(iAxis);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.ITREE_ITEM_AXIS: {
- ITreeItemAxis iTreeItemAxis = (ITreeItemAxis) theEObject;
+ case NattableaxisPackage.ITREE_ITEM_AXIS:
+ {
+ ITreeItemAxis iTreeItemAxis = (ITreeItemAxis)theEObject;
T result = caseITreeItemAxis(iTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseIAxis(iTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.ID_AXIS: {
- IdAxis idAxis = (IdAxis) theEObject;
+ case NattableaxisPackage.ID_AXIS:
+ {
+ IdAxis idAxis = (IdAxis)theEObject;
T result = caseIdAxis(idAxis);
- if (result == null) {
+ if(result == null) {
result = caseIAxis(idAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(idAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(idAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.ID_TREE_ITEM_AXIS: {
- IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis) theEObject;
+ case NattableaxisPackage.ID_TREE_ITEM_AXIS:
+ {
+ IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis)theEObject;
T result = caseIdTreeItemAxis(idTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseIdAxis(idTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(idTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(idTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(idTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(idTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.EOBJECT_AXIS: {
- EObjectAxis eObjectAxis = (EObjectAxis) theEObject;
+ case NattableaxisPackage.EOBJECT_AXIS:
+ {
+ EObjectAxis eObjectAxis = (EObjectAxis)theEObject;
T result = caseEObjectAxis(eObjectAxis);
- if (result == null) {
+ if(result == null) {
result = caseObjectAxis(eObjectAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(eObjectAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(eObjectAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eObjectAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: {
- EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis) theEObject;
+ case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS:
+ {
+ EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis)theEObject;
T result = caseEObjectTreeItemAxis(eObjectTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseEObjectAxis(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseObjectAxis(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eObjectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.FEATURE_AXIS: {
- FeatureAxis featureAxis = (FeatureAxis) theEObject;
+ case NattableaxisPackage.FEATURE_AXIS:
+ {
+ FeatureAxis featureAxis = (FeatureAxis)theEObject;
T result = caseFeatureAxis(featureAxis);
- if (result == null) {
+ if(result == null) {
result = caseIAxis(featureAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS: {
- FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis) theEObject;
+ case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS:
+ {
+ FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis)theEObject;
T result = caseFeatureTreeItemAxis(featureTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseFeatureAxis(featureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(featureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(featureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.OBJECT_AXIS: {
- ObjectAxis objectAxis = (ObjectAxis) theEObject;
+ case NattableaxisPackage.OBJECT_AXIS:
+ {
+ ObjectAxis objectAxis = (ObjectAxis)theEObject;
T result = caseObjectAxis(objectAxis);
- if (result == null) {
+ if(result == null) {
result = caseIAxis(objectAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(objectAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(objectAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS: {
- ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis) theEObject;
+ case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS:
+ {
+ ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis)theEObject;
T result = caseObjectTreeItemAxis(objectTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseObjectAxis(objectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(objectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(objectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(objectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(objectTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.FEATURE_ID_AXIS: {
- FeatureIdAxis featureIdAxis = (FeatureIdAxis) theEObject;
+ case NattableaxisPackage.FEATURE_ID_AXIS:
+ {
+ FeatureIdAxis featureIdAxis = (FeatureIdAxis)theEObject;
T result = caseFeatureIdAxis(featureIdAxis);
- if (result == null) {
+ if(result == null) {
result = caseIdAxis(featureIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseFeatureAxis(featureIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(featureIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: {
- FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis) theEObject;
+ case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS:
+ {
+ FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis)theEObject;
T result = caseFeatureIdTreeItemAxis(featureIdTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseFeatureIdAxis(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIdAxis(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseFeatureAxis(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: {
- EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis) theEObject;
+ case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS:
+ {
+ EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis)theEObject;
T result = caseEStructuralFeatureAxis(eStructuralFeatureAxis);
- if (result == null) {
+ if(result == null) {
result = caseFeatureAxis(eStructuralFeatureAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(eStructuralFeatureAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(eStructuralFeatureAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eStructuralFeatureAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: {
- EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis) theEObject;
+ case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS:
+ {
+ EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis)theEObject;
T result = caseEStructuralFeatureTreeItemAxis(eStructuralFeatureTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseEStructuralFeatureAxis(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseFeatureAxis(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eStructuralFeatureTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.OBJECT_ID_AXIS: {
- ObjectIdAxis objectIdAxis = (ObjectIdAxis) theEObject;
+ case NattableaxisPackage.OBJECT_ID_AXIS:
+ {
+ ObjectIdAxis objectIdAxis = (ObjectIdAxis)theEObject;
T result = caseObjectIdAxis(objectIdAxis);
- if (result == null) {
+ if(result == null) {
result = caseIdAxis(objectIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseObjectAxis(objectIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(objectIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(objectIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(objectIdAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: {
- ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis) theEObject;
+ case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS:
+ {
+ ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis)theEObject;
T result = caseObjectIdTreeItemAxis(objectIdTreeItemAxis);
- if (result == null) {
+ if(result == null) {
result = caseObjectIdAxis(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseITreeItemAxis(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIdAxis(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseObjectAxis(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxis(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(objectIdTreeItemAxis);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisPackage.AXIS_GROUP: {
- AxisGroup axisGroup = (AxisGroup) theEObject;
+ case NattableaxisPackage.AXIS_GROUP:
+ {
+ AxisGroup axisGroup = (AxisGroup)theEObject;
T result = caseAxisGroup(axisGroup);
- if (result == null) {
+ if(result == null) {
result = caseIAxis(axisGroup);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(axisGroup);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(axisGroup);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -474,7 +492,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IAxis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -491,7 +509,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -508,7 +526,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -525,7 +543,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -542,7 +560,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -559,7 +577,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -576,7 +594,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -593,7 +611,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -610,7 +628,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Object Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -627,7 +645,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -644,7 +662,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -661,7 +679,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -678,7 +696,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -695,7 +713,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -712,7 +730,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -729,7 +747,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -746,7 +764,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -763,7 +781,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -780,7 +798,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -797,7 +815,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -806,5 +824,4 @@ public class NattableaxisSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableaxisSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
index d8201c1ce5d..76bb87bbaa9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
@@ -33,12 +33,18 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index
+ * Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display
+ * Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display
+ * Filter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display
+ * Index</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations
+ * <em>Owned Label Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations
+ * <em>Owned Axis Configurations</em>}</li>
* </ul>
* </p>
*
@@ -50,6 +56,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public interface AbstractHeaderAxisConfiguration extends StyledElement {
+
/**
* Returns the value of the '<em><b>Index Style</b></em>' attribute.
* The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.
@@ -69,12 +76,14 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
AxisIndexStyle getIndexStyle();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle
+ * <em>Index Style</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Index Style</em>' attribute.
+ * the new value of the '<em>Index Style</em>' attribute.
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
* @see #getIndexStyle()
* @generated
@@ -99,12 +108,14 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
boolean isDisplayLabel();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel
+ * <em>Display Label</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Label</em>' attribute.
+ * the new value of the '<em>Display Label</em>' attribute.
* @see #isDisplayLabel()
* @generated
*/
@@ -128,12 +139,14 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
boolean isDisplayFilter();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter
+ * <em>Display Filter</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Filter</em>' attribute.
+ * the new value of the '<em>Display Filter</em>' attribute.
* @see #isDisplayFilter()
* @generated
*/
@@ -157,12 +170,14 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
boolean isDisplayIndex();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex
+ * <em>Display Index</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Index</em>' attribute.
+ * the new value of the '<em>Display Index</em>' attribute.
* @see #isDisplayIndex()
* @generated
*/
@@ -199,5 +214,4 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
* @generated
*/
EList<IAxisConfiguration> getOwnedAxisConfigurations();
-
} // AbstractHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
index 98d03dfdba6..53bb643cb33 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
@@ -42,7 +42,6 @@ public enum AxisIndexStyle implements Enumerator {
* @ordered
*/
ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>NUMERIC</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -91,11 +90,7 @@ public enum AxisIndexStyle implements Enumerator {
*
* @generated
*/
- private static final AxisIndexStyle[] VALUES_ARRAY =
- new AxisIndexStyle[] {
- ALPHABETIC,
- NUMERIC,
- };
+ private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[]{ ALPHABETIC, NUMERIC, };
/**
* A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.
@@ -114,9 +109,9 @@ public enum AxisIndexStyle implements Enumerator {
* @generated
*/
public static AxisIndexStyle get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
AxisIndexStyle result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
+ if(result.toString().equals(literal)) {
return result;
}
}
@@ -131,9 +126,9 @@ public enum AxisIndexStyle implements Enumerator {
* @generated
*/
public static AxisIndexStyle getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
AxisIndexStyle result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
+ if(result.getName().equals(name)) {
return result;
}
}
@@ -148,7 +143,7 @@ public enum AxisIndexStyle implements Enumerator {
* @generated
*/
public static AxisIndexStyle get(int value) {
- switch (value) {
+ switch(value) {
case ALPHABETIC_VALUE:
return ALPHABETIC;
case NUMERIC_VALUE:
@@ -238,5 +233,4 @@ public enum AxisIndexStyle implements Enumerator {
public String toString() {
return literal;
}
-
} // AxisIndexStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
index c93279e5326..49b42e5b938 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
@@ -28,9 +28,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration
+ * <em>Local Header Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>
+ * Local Specific Configurations</em>}</li>
* </ul>
* </p>
*
@@ -39,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public interface AxisManagerConfiguration extends StyledElement {
+
/**
* Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.
* <!-- begin-user-doc -->
@@ -56,12 +60,14 @@ public interface AxisManagerConfiguration extends StyledElement {
ILabelProviderConfiguration getLocalHeaderLabelConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration
+ * <em>Local Header Label Configuration</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Local Header Label Configuration</em>' reference.
+ * the new value of the '<em>Local Header Label Configuration</em>' reference.
* @see #getLocalHeaderLabelConfiguration()
* @generated
*/
@@ -84,12 +90,14 @@ public interface AxisManagerConfiguration extends StyledElement {
AxisManagerRepresentation getAxisManager();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager
+ * <em>Axis Manager</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Axis Manager</em>' reference.
+ * the new value of the '<em>Axis Manager</em>' reference.
* @see #getAxisManager()
* @generated
*/
@@ -110,5 +118,4 @@ public interface AxisManagerConfiguration extends StyledElement {
* @generated
*/
EList<IAxisConfiguration> getLocalSpecificConfigurations();
-
} // AxisManagerConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
index 95fc8494a30..3993200e805 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
@@ -28,19 +28,25 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager
+ * Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label
+ * Provider Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>
+ * Header Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>
+ * Specific Axis Configurations</em>}</li>
* </ul>
* </p>
*
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyAxisManager'"
- * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"
+ * annotation=
+ * "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"
* @generated
*/
public interface AxisManagerRepresentation extends StyledElement {
+
/**
* Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -60,12 +66,14 @@ public interface AxisManagerRepresentation extends StyledElement {
String getAxisManagerId();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId
+ * <em>Axis Manager Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Axis Manager Id</em>' attribute.
+ * the new value of the '<em>Axis Manager Id</em>' attribute.
* @see #getAxisManagerId()
* @generated
*/
@@ -89,12 +97,14 @@ public interface AxisManagerRepresentation extends StyledElement {
String getLabelProviderContext();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext
+ * <em>Label Provider Context</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Label Provider Context</em>' attribute.
+ * the new value of the '<em>Label Provider Context</em>' attribute.
* @see #getLabelProviderContext()
* @generated
*/
@@ -117,12 +127,14 @@ public interface AxisManagerRepresentation extends StyledElement {
ILabelProviderConfiguration getHeaderLabelConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration
+ * <em>Header Label Configuration</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Header Label Configuration</em>' reference.
+ * the new value of the '<em>Header Label Configuration</em>' reference.
* @see #getHeaderLabelConfiguration()
* @generated
*/
@@ -143,5 +155,4 @@ public interface AxisManagerRepresentation extends StyledElement {
* @generated
*/
EList<IAxisConfiguration> getSpecificAxisConfigurations();
-
} // AxisManagerRepresentation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
index b5c4d1a47f8..8345cf0bcce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
@@ -26,7 +26,9 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature
+ * <em>Listen Feature</em>}</li>
* </ul>
* </p>
*
@@ -35,6 +37,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* @generated
*/
public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {
+
/**
* Returns the value of the '<em><b>Listen Feature</b></em>' reference.
* <!-- begin-user-doc -->
@@ -53,15 +56,16 @@ public interface EStructuralFeatureValueFillingConfiguration extends IFillingCon
EStructuralFeature getListenFeature();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature
+ * <em>Listen Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Listen Feature</em>' reference.
+ * the new value of the '<em>Listen Feature</em>' reference.
* @see #getListenFeature()
* @generated
*/
void setListenFeature(EStructuralFeature value);
-
} // EStructuralFeatureValueFillingConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
index 20c8e80be65..d7d9fd0408d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.
@@ -25,7 +24,8 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurat
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show
+ * Only Common Feature</em>}</li>
* </ul>
* </p>
*
@@ -34,6 +34,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurat
* @generated
*/
public interface FeatureAxisConfiguration extends IAxisConfiguration {
+
/**
* Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -51,15 +52,16 @@ public interface FeatureAxisConfiguration extends IAxisConfiguration {
boolean isShowOnlyCommonFeature();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature
+ * <em>Show Only Common Feature</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Show Only Common Feature</em>' attribute.
+ * the new value of the '<em>Show Only Common Feature</em>' attribute.
* @see #isShowOnlyCommonFeature()
* @generated
*/
void setShowOnlyCommonFeature(boolean value);
-
} // FeatureAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
index 45d561b6a65..e4deff020c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>IFilling Configuration</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
index 3140231d7ac..09c71a16106 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface IPasteConfiguration extends IAxisConfiguration {
+
/**
* Returns the value of the '<em><b>Post Actions</b></em>' attribute list.
* The list contents are of type {@link java.lang.String}.
@@ -71,15 +72,15 @@ public interface IPasteConfiguration extends IAxisConfiguration {
boolean isDetachedMode();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode
+ * <em>Detached Mode</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Detached Mode</em>' attribute.
+ * the new value of the '<em>Detached Mode</em>' attribute.
* @see #isDetachedMode()
* @generated
*/
void setDetachedMode(boolean value);
-
} // IPasteConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
index 6241b3c473a..8a50869161a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
@@ -26,7 +26,9 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations
+ * <em>Axis Manager Configurations</em>}</li>
* </ul>
* </p>
*
@@ -35,6 +37,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
/**
* Returns the value of the '<em><b>Axis Manager Configurations</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
@@ -50,5 +53,4 @@ public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisCon
* @generated
*/
EList<AxisManagerConfiguration> getAxisManagerConfigurations();
-
} // LocalTableHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
index 836c7e92ae2..70164c8e424 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableaxisconfigurationFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -132,5 +133,4 @@ public interface NattableaxisconfigurationFactory extends EFactory {
* @generated
*/
NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();
-
} // NattableaxisconfigurationFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
index 08a22ab8939..48890e49484 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public interface NattableaxisconfigurationPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -76,7 +77,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
NattableaxisconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl
+ * <em>Abstract Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -227,7 +230,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl
+ * <em>Axis Manager Representation</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -358,7 +363,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int AXIS_MANAGER_REPRESENTATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl
+ * <em>Axis Manager Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -479,7 +486,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int AXIS_MANAGER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl
+ * <em>Table Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -640,7 +649,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl
+ * <em>Local Table Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -801,7 +812,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration
+ * <em>IAxis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -892,7 +904,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int IAXIS_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl
+ * <em>Feature Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -993,7 +1007,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int FEATURE_AXIS_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration
+ * <em>IFilling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1084,7 +1099,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int IFILLING_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl
+ * <em>EStructural Feature Value Filling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1185,7 +1202,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION_OPERATION_COUNT = IFILLING_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl
+ * <em>IPaste Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1296,7 +1314,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int IPASTE_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl
+ * <em>Paste EObject Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1427,7 +1447,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int PASTE_EOBJECT_CONFIGURATION_OPERATION_COUNT = IPASTE_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl <em>Tree Filling Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl
+ * <em>Tree Filling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1568,7 +1590,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
int TREE_FILLING_CONFIGURATION_OPERATION_COUNT = IFILLING_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+ * <em>Axis Index Style</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1578,9 +1601,10 @@ public interface NattableaxisconfigurationPackage extends EPackage {
*/
int AXIS_INDEX_STYLE = 12;
-
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration
+ * <em>Abstract Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1591,7 +1615,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getAbstractHeaderAxisConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle
+ * <em>Index Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1603,7 +1629,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAbstractHeaderAxisConfiguration_IndexStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel
+ * <em>Display Label</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1615,7 +1643,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAbstractHeaderAxisConfiguration_DisplayLabel();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter
+ * <em>Display Filter</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1627,7 +1657,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAbstractHeaderAxisConfiguration_DisplayFilter();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex
+ * <em>Display Index</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1639,7 +1671,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAbstractHeaderAxisConfiguration_DisplayIndex();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations
+ * <em>Owned Label Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1651,7 +1685,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations
+ * <em>Owned Axis Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1663,7 +1699,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation
+ * <em>Axis Manager Representation</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1674,7 +1712,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getAxisManagerRepresentation();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId
+ * <em>Axis Manager Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1686,7 +1726,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAxisManagerRepresentation_AxisManagerId();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext
+ * <em>Label Provider Context</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1698,7 +1740,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getAxisManagerRepresentation_LabelProviderContext();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration
+ * <em>Header Label Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1710,7 +1754,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAxisManagerRepresentation_HeaderLabelConfiguration();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}'.
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations
+ * <em>Specific Axis Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1722,7 +1768,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAxisManagerRepresentation_SpecificAxisConfigurations();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration
+ * <em>Axis Manager Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1733,7 +1780,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getAxisManagerConfiguration();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration
+ * <em>Local Header Label Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1745,7 +1794,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAxisManagerConfiguration_LocalHeaderLabelConfiguration();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager
+ * <em>Axis Manager</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1757,7 +1808,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAxisManagerConfiguration_AxisManager();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}'.
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations
+ * <em>Local Specific Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1769,7 +1822,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getAxisManagerConfiguration_LocalSpecificConfigurations();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration
+ * <em>Table Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1780,7 +1835,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getTableHeaderAxisConfiguration();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers
+ * <em>Axis Managers</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1792,7 +1849,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getTableHeaderAxisConfiguration_AxisManagers();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration
+ * <em>Local Table Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1803,7 +1862,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getLocalTableHeaderAxisConfiguration();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations
+ * <em>Axis Manager Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1815,7 +1876,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration
+ * <em>IAxis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1826,7 +1888,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getIAxisConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration
+ * <em>Feature Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1837,7 +1900,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getFeatureAxisConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature
+ * <em>Show Only Common Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1849,7 +1914,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getFeatureAxisConfiguration_ShowOnlyCommonFeature();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration
+ * <em>IFilling Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1860,7 +1926,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getIFillingConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration
+ * <em>EStructural Feature Value Filling Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1871,7 +1939,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getEStructuralFeatureValueFillingConfiguration();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature
+ * <em>Listen Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1883,7 +1953,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getEStructuralFeatureValueFillingConfiguration_ListenFeature();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration
+ * <em>IPaste Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1894,7 +1965,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getIPasteConfiguration();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1906,7 +1978,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getIPasteConfiguration_PostActions();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1918,7 +1991,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getIPasteConfiguration_DetachedMode();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration
+ * <em>Paste EObject Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1929,7 +2004,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getPasteEObjectConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId
+ * <em>Pasted Element Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1941,7 +2018,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getPasteEObjectConfiguration_PastedElementId();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature
+ * <em>Paste Element Containement Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1953,7 +2032,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getPasteEObjectConfiguration_PasteElementContainementFeature();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration
+ * <em>Tree Filling Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1964,7 +2044,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass getTreeFillingConfiguration();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider
+ * <em>Axis Used As Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1976,7 +2058,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getTreeFillingConfiguration_AxisUsedAsAxisProvider();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration
+ * <em>Paste Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1988,7 +2072,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getTreeFillingConfiguration_PasteConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2000,7 +2085,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getTreeFillingConfiguration_Depth();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider
+ * <em>Label Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2012,7 +2099,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference getTreeFillingConfiguration_LabelProvider();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext
+ * <em>Label Provider Context</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2024,7 +2113,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute getTreeFillingConfiguration_LabelProviderContext();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+ * <em>Axis Index Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2059,8 +2149,11 @@ public interface NattableaxisconfigurationPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl
+ * <em>Abstract Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2125,7 +2218,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl
+ * <em>Axis Manager Representation</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2172,7 +2267,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS = eINSTANCE.getAxisManagerRepresentation_SpecificAxisConfigurations();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl
+ * <em>Axis Manager Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2210,7 +2307,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS = eINSTANCE.getAxisManagerConfiguration_LocalSpecificConfigurations();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl
+ * <em>Table Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2230,7 +2329,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS = eINSTANCE.getTableHeaderAxisConfiguration_AxisManagers();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl
+ * <em>Local Table Header Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2250,7 +2351,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS = eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration
+ * <em>IAxis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2261,7 +2363,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass IAXIS_CONFIGURATION = eINSTANCE.getIAxisConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl
+ * <em>Feature Axis Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2281,7 +2385,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE = eINSTANCE.getFeatureAxisConfiguration_ShowOnlyCommonFeature();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration
+ * <em>IFilling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2292,7 +2397,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EClass IFILLING_CONFIGURATION = eINSTANCE.getIFillingConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl
+ * <em>EStructural Feature Value Filling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2312,7 +2419,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE = eINSTANCE.getEStructuralFeatureValueFillingConfiguration_ListenFeature();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl
+ * <em>IPaste Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2341,7 +2450,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute IPASTE_CONFIGURATION__DETACHED_MODE = eINSTANCE.getIPasteConfiguration_DetachedMode();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl
+ * <em>Paste EObject Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2370,7 +2481,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EReference PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE = eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl <em>Tree Filling Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl
+ * <em>Tree Filling Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2426,7 +2539,8 @@ public interface NattableaxisconfigurationPackage extends EPackage {
EAttribute TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT = eINSTANCE.getTreeFillingConfiguration_LabelProviderContext();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+ * <em>Axis Index Style</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2435,7 +2549,5 @@ public interface NattableaxisconfigurationPackage extends EPackage {
* @generated
*/
EEnum AXIS_INDEX_STYLE = eINSTANCE.getAxisIndexStyle();
-
}
-
} // NattableaxisconfigurationPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
index 76c5a13c528..a04c49b00dd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
@@ -26,8 +26,11 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted
+ * Element Id</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature
+ * <em>Paste Element Containement Feature</em>}</li>
* </ul>
* </p>
*
@@ -36,6 +39,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* @generated
*/
public interface PasteEObjectConfiguration extends IPasteConfiguration {
+
/**
* Returns the value of the '<em><b>Pasted Element Id</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -53,12 +57,14 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
String getPastedElementId();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId
+ * <em>Pasted Element Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Pasted Element Id</em>' attribute.
+ * the new value of the '<em>Pasted Element Id</em>' attribute.
* @see #getPastedElementId()
* @generated
*/
@@ -81,15 +87,16 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
EStructuralFeature getPasteElementContainementFeature();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature
+ * <em>Paste Element Containement Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Paste Element Containement Feature</em>' reference.
+ * the new value of the '<em>Paste Element Containement Feature</em>' reference.
* @see #getPasteElementContainementFeature()
* @generated
*/
void setPasteElementContainementFeature(EStructuralFeature value);
-
} // PasteEObjectConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
index f8f125ef78b..4d5691c61c2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
@@ -26,16 +26,19 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis
+ * Managers</em>}</li>
* </ul>
* </p>
*
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='axisManagersIdUnique'"
- * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)'"
+ * annotation=
+ * "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)'"
* @generated
*/
public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
/**
* Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
@@ -51,5 +54,4 @@ public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfigur
* @generated
*/
EList<AxisManagerRepresentation> getAxisManagers();
-
} // TableHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
index 51e4eb32b65..b6b341e1963 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
@@ -23,11 +23,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis
+ * Used As Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste
+ * Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label
+ * Provider Context</em>}</li>
* </ul>
* </p>
*
@@ -36,11 +40,13 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
* @generated
*/
public interface TreeFillingConfiguration extends IFillingConfiguration {
+
/**
* Returns the value of the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description here...
+ * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description
+ * here...
* </p>
* <!-- end-user-doc -->
*
@@ -53,12 +59,14 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
IAxis getAxisUsedAsAxisProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}' containment reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider
+ * <em>Axis Used As Axis Provider</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.
+ * the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.
* @see #getAxisUsedAsAxisProvider()
* @generated
*/
@@ -81,12 +89,14 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
PasteEObjectConfiguration getPasteConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration
+ * <em>Paste Configuration</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Paste Configuration</em>' reference.
+ * the new value of the '<em>Paste Configuration</em>' reference.
* @see #getPasteConfiguration()
* @generated
*/
@@ -109,12 +119,13 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
int getDepth();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth
+ * <em>Depth</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Depth</em>' attribute.
+ * the new value of the '<em>Depth</em>' attribute.
* @see #getDepth()
* @generated
*/
@@ -137,12 +148,14 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
ILabelProviderConfiguration getLabelProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider
+ * <em>Label Provider</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Label Provider</em>' reference.
+ * the new value of the '<em>Label Provider</em>' reference.
* @see #getLabelProvider()
* @generated
*/
@@ -165,15 +178,16 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
String getLabelProviderContext();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext
+ * <em>Label Provider Context</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Label Provider Context</em>' attribute.
+ * the new value of the '<em>Label Provider Context</em>' attribute.
* @see #getLabelProviderContext()
* @generated
*/
void setLabelProviderContext(String value);
-
} // TreeFillingConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
index 46fb7456630..0fbe4c71cd1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
@@ -36,18 +36,27 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>Index Style</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter <em>Display Filter</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>Display Index</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>
+ * Index Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>
+ * Display Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter
+ * <em>Display Filter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>
+ * Display Index</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations
+ * <em>Owned Label Configurations</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations
+ * <em>Owned Axis Configurations</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementImpl implements AbstractHeaderAxisConfiguration {
+
/**
* The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
* <!-- begin-user-doc -->
@@ -200,7 +209,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
public void setIndexStyle(AxisIndexStyle newIndexStyle) {
AxisIndexStyle oldIndexStyle = indexStyle;
indexStyle = newIndexStyle == null ? INDEX_STYLE_EDEFAULT : newIndexStyle;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));
}
}
@@ -226,7 +235,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
public void setDisplayLabel(boolean newDisplayLabel) {
boolean oldDisplayLabel = displayLabel;
displayLabel = newDisplayLabel;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
}
}
@@ -252,7 +261,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
public void setDisplayFilter(boolean newDisplayFilter) {
boolean oldDisplayFilter = displayFilter;
displayFilter = newDisplayFilter;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER, oldDisplayFilter, displayFilter));
}
}
@@ -278,7 +287,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
public void setDisplayIndex(boolean newDisplayIndex) {
boolean oldDisplayIndex = displayIndex;
displayIndex = newDisplayIndex;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX, oldDisplayIndex, displayIndex));
}
}
@@ -291,7 +300,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public EList<ILabelProviderConfiguration> getOwnedLabelConfigurations() {
- if (ownedLabelConfigurations == null) {
+ if(ownedLabelConfigurations == null) {
ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
}
return ownedLabelConfigurations;
@@ -305,7 +314,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public EList<IAxisConfiguration> getOwnedAxisConfigurations() {
- if (ownedAxisConfigurations == null) {
+ if(ownedAxisConfigurations == null) {
ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
}
return ownedAxisConfigurations;
@@ -319,11 +328,11 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
- return ((InternalEList<?>) getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
- return ((InternalEList<?>) getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -336,7 +345,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
return getIndexStyle();
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
@@ -362,26 +371,26 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
- setIndexStyle((AxisIndexStyle) newValue);
+ setIndexStyle((AxisIndexStyle)newValue);
return;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
- setDisplayLabel((Boolean) newValue);
+ setDisplayLabel((Boolean)newValue);
return;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
- setDisplayFilter((Boolean) newValue);
+ setDisplayFilter((Boolean)newValue);
return;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
- setDisplayIndex((Boolean) newValue);
+ setDisplayIndex((Boolean)newValue);
return;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
getOwnedLabelConfigurations().clear();
- getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>) newValue);
+ getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>)newValue);
return;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
getOwnedAxisConfigurations().clear();
- getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>) newValue);
+ getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -395,7 +404,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
setIndexStyle(INDEX_STYLE_EDEFAULT);
return;
@@ -426,7 +435,7 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
return indexStyle != INDEX_STYLE_EDEFAULT;
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
@@ -451,10 +460,9 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (indexStyle: "); //$NON-NLS-1$
result.append(indexStyle);
@@ -467,5 +475,4 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
result.append(')');
return result.toString();
}
-
} // AbstractHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
index 80505e24d0e..52ea3c272e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
@@ -34,15 +34,21 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getAxisManager <em>Axis Manager</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalHeaderLabelConfiguration
+ * <em>Local Header Label Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getAxisManager <em>Axis
+ * Manager</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfigurations
+ * <em>Local Specific Configurations</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class AxisManagerConfigurationImpl extends StyledElementImpl implements AxisManagerConfiguration {
+
/**
* The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.
* <!-- begin-user-doc -->
@@ -105,11 +111,11 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {
- if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {
- InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject) localHeaderLabelConfiguration;
- localHeaderLabelConfiguration = (ILabelProviderConfiguration) eResolveProxy(oldLocalHeaderLabelConfiguration);
- if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {
- if (eNotificationRequired()) {
+ if(localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {
+ InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;
+ localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);
+ if(localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));
}
}
@@ -137,7 +143,7 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {
ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;
localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));
}
}
@@ -150,11 +156,11 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public AxisManagerRepresentation getAxisManager() {
- if (axisManager != null && axisManager.eIsProxy()) {
- InternalEObject oldAxisManager = (InternalEObject) axisManager;
- axisManager = (AxisManagerRepresentation) eResolveProxy(oldAxisManager);
- if (axisManager != oldAxisManager) {
- if (eNotificationRequired()) {
+ if(axisManager != null && axisManager.eIsProxy()) {
+ InternalEObject oldAxisManager = (InternalEObject)axisManager;
+ axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);
+ if(axisManager != oldAxisManager) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));
}
}
@@ -182,7 +188,7 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
public void setAxisManager(AxisManagerRepresentation newAxisManager) {
AxisManagerRepresentation oldAxisManager = axisManager;
axisManager = newAxisManager;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));
}
}
@@ -195,7 +201,7 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public EList<IAxisConfiguration> getLocalSpecificConfigurations() {
- if (localSpecificConfigurations == null) {
+ if(localSpecificConfigurations == null) {
localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);
}
return localSpecificConfigurations;
@@ -209,14 +215,14 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
- if (resolve) {
+ if(resolve) {
return getLocalHeaderLabelConfiguration();
}
return basicGetLocalHeaderLabelConfiguration();
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
- if (resolve) {
+ if(resolve) {
return getAxisManager();
}
return basicGetAxisManager();
@@ -235,16 +241,16 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
- setLocalHeaderLabelConfiguration((ILabelProviderConfiguration) newValue);
+ setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
- setAxisManager((AxisManagerRepresentation) newValue);
+ setAxisManager((AxisManagerRepresentation)newValue);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
getLocalSpecificConfigurations().clear();
- getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>) newValue);
+ getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -258,12 +264,12 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
- setLocalHeaderLabelConfiguration((ILabelProviderConfiguration) null);
+ setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)null);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
- setAxisManager((AxisManagerRepresentation) null);
+ setAxisManager((AxisManagerRepresentation)null);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
getLocalSpecificConfigurations().clear();
@@ -280,7 +286,7 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
return localHeaderLabelConfiguration != null;
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
@@ -290,5 +296,4 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
}
return super.eIsSet(featureID);
}
-
} // AxisManagerConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
index 052db682724..366a79ad978 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
@@ -33,16 +33,23 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getAxisManagerId <em>Axis Manager Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getAxisManagerId <em>Axis
+ * Manager Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getLabelProviderContext
+ * <em>Label Provider Context</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getHeaderLabelConfiguration
+ * <em>Header Label Configuration</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfigurations
+ * <em>Specific Axis Configurations</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class AxisManagerRepresentationImpl extends StyledElementImpl implements AxisManagerRepresentation {
+
/**
* The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.
* <!-- begin-user-doc -->
@@ -151,7 +158,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
public void setAxisManagerId(String newAxisManagerId) {
String oldAxisManagerId = axisManagerId;
axisManagerId = newAxisManagerId;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID, oldAxisManagerId, axisManagerId));
}
}
@@ -177,7 +184,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
public void setLabelProviderContext(String newLabelProviderContext) {
String oldLabelProviderContext = labelProviderContext;
labelProviderContext = newLabelProviderContext;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
}
}
@@ -190,11 +197,11 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public ILabelProviderConfiguration getHeaderLabelConfiguration() {
- if (headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {
- InternalEObject oldHeaderLabelConfiguration = (InternalEObject) headerLabelConfiguration;
- headerLabelConfiguration = (ILabelProviderConfiguration) eResolveProxy(oldHeaderLabelConfiguration);
- if (headerLabelConfiguration != oldHeaderLabelConfiguration) {
- if (eNotificationRequired()) {
+ if(headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {
+ InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;
+ headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);
+ if(headerLabelConfiguration != oldHeaderLabelConfiguration) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));
}
}
@@ -222,7 +229,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {
ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;
headerLabelConfiguration = newHeaderLabelConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));
}
}
@@ -235,7 +242,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public EList<IAxisConfiguration> getSpecificAxisConfigurations() {
- if (specificAxisConfigurations == null) {
+ if(specificAxisConfigurations == null) {
specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);
}
return specificAxisConfigurations;
@@ -249,13 +256,13 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
return getAxisManagerId();
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
return getLabelProviderContext();
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
- if (resolve) {
+ if(resolve) {
return getHeaderLabelConfiguration();
}
return basicGetHeaderLabelConfiguration();
@@ -274,19 +281,19 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
- setAxisManagerId((String) newValue);
+ setAxisManagerId((String)newValue);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
- setLabelProviderContext((String) newValue);
+ setLabelProviderContext((String)newValue);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
- setHeaderLabelConfiguration((ILabelProviderConfiguration) newValue);
+ setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
getSpecificAxisConfigurations().clear();
- getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>) newValue);
+ getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -300,7 +307,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
setAxisManagerId(AXIS_MANAGER_ID_EDEFAULT);
return;
@@ -308,7 +315,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
- setHeaderLabelConfiguration((ILabelProviderConfiguration) null);
+ setHeaderLabelConfiguration((ILabelProviderConfiguration)null);
return;
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
getSpecificAxisConfigurations().clear();
@@ -325,7 +332,7 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
return AXIS_MANAGER_ID_EDEFAULT == null ? axisManagerId != null : !AXIS_MANAGER_ID_EDEFAULT.equals(axisManagerId);
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
@@ -346,10 +353,9 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (axisManagerId: "); //$NON-NLS-1$
result.append(axisManagerId);
@@ -358,5 +364,4 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
result.append(')');
return result.toString();
}
-
} // AxisManagerRepresentationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
index cbf7a2026e0..44548be8a20 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
@@ -28,13 +28,16 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature
+ * <em>Listen Feature</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class EStructuralFeatureValueFillingConfigurationImpl extends StyledElementImpl implements EStructuralFeatureValueFillingConfiguration {
+
/**
* The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.
* <!-- begin-user-doc -->
@@ -75,11 +78,11 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
*/
@Override
public EStructuralFeature getListenFeature() {
- if (listenFeature != null && listenFeature.eIsProxy()) {
- InternalEObject oldListenFeature = (InternalEObject) listenFeature;
- listenFeature = (EStructuralFeature) eResolveProxy(oldListenFeature);
- if (listenFeature != oldListenFeature) {
- if (eNotificationRequired()) {
+ if(listenFeature != null && listenFeature.eIsProxy()) {
+ InternalEObject oldListenFeature = (InternalEObject)listenFeature;
+ listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);
+ if(listenFeature != oldListenFeature) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
}
}
@@ -107,7 +110,7 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
public void setListenFeature(EStructuralFeature newListenFeature) {
EStructuralFeature oldListenFeature = listenFeature;
listenFeature = newListenFeature;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
}
}
@@ -120,9 +123,9 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
- if (resolve) {
+ if(resolve) {
return getListenFeature();
}
return basicGetListenFeature();
@@ -138,9 +141,9 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
- setListenFeature((EStructuralFeature) newValue);
+ setListenFeature((EStructuralFeature)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -154,9 +157,9 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
- setListenFeature((EStructuralFeature) null);
+ setListenFeature((EStructuralFeature)null);
return;
}
super.eUnset(featureID);
@@ -170,11 +173,10 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
return listenFeature != null;
}
return super.eIsSet(featureID);
}
-
} // EStructuralFeatureValueFillingConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
index 4a0a610c412..a1063201cab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature
+ * <em>Show Only Common Feature</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class FeatureAxisConfigurationImpl extends StyledElementImpl implements FeatureAxisConfiguration {
+
/**
* The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.
* <!-- begin-user-doc -->
@@ -97,7 +99,7 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {
boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;
showOnlyCommonFeature = newShowOnlyCommonFeature;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE, oldShowOnlyCommonFeature, showOnlyCommonFeature));
}
}
@@ -110,7 +112,7 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
return isShowOnlyCommonFeature();
}
@@ -125,9 +127,9 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
- setShowOnlyCommonFeature((Boolean) newValue);
+ setShowOnlyCommonFeature((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -141,7 +143,7 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
setShowOnlyCommonFeature(SHOW_ONLY_COMMON_FEATURE_EDEFAULT);
return;
@@ -157,7 +159,7 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
return showOnlyCommonFeature != SHOW_ONLY_COMMON_FEATURE_EDEFAULT;
}
@@ -172,15 +174,13 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (showOnlyCommonFeature: "); //$NON-NLS-1$
result.append(showOnlyCommonFeature);
result.append(')');
return result.toString();
}
-
} // FeatureAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
index a7b82b19a0f..5292ec3ab5d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
@@ -30,14 +30,17 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached
+ * Mode</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class IPasteConfigurationImpl extends StyledElementImpl implements IPasteConfiguration {
+
/**
* The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -100,7 +103,7 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
*/
@Override
public EList<String> getPostActions() {
- if (postActions == null) {
+ if(postActions == null) {
postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);
}
return postActions;
@@ -127,7 +130,7 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
public void setDetachedMode(boolean newDetachedMode) {
boolean oldDetachedMode = detachedMode;
detachedMode = newDetachedMode;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE, oldDetachedMode, detachedMode));
}
}
@@ -140,7 +143,7 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
return getPostActions();
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
@@ -158,13 +161,13 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
getPostActions().clear();
- getPostActions().addAll((Collection<? extends String>) newValue);
+ getPostActions().addAll((Collection<? extends String>)newValue);
return;
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
- setDetachedMode((Boolean) newValue);
+ setDetachedMode((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -178,7 +181,7 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
getPostActions().clear();
return;
@@ -197,7 +200,7 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
return postActions != null && !postActions.isEmpty();
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
@@ -214,10 +217,9 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (postActions: "); //$NON-NLS-1$
result.append(postActions);
@@ -226,5 +228,4 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
result.append(')');
return result.toString();
}
-
} // IPasteConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
index 9bfdc8c546d..746d0204d93 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
@@ -31,13 +31,16 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations
+ * <em>Axis Manager Configurations</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements LocalTableHeaderAxisConfiguration {
+
/**
* The cached value of the '{@link #getAxisManagerConfigurations() <em>Axis Manager Configurations</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -78,7 +81,7 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
*/
@Override
public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {
- if (axisManagerConfigurations == null) {
+ if(axisManagerConfigurations == null) {
axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
}
return axisManagerConfigurations;
@@ -92,9 +95,9 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
- return ((InternalEList<?>) getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -107,7 +110,7 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
return getAxisManagerConfigurations();
}
@@ -123,10 +126,10 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
getAxisManagerConfigurations().clear();
- getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>) newValue);
+ getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +143,7 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
getAxisManagerConfigurations().clear();
return;
@@ -156,11 +159,10 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
return axisManagerConfigurations != null && !axisManagerConfigurations.isEmpty();
}
return super.eIsSet(featureID);
}
-
} // LocalTableHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
index 192af2ac090..2ed5988889e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* @generated
*/
public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -48,8 +49,8 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
public static NattableaxisconfigurationFactory init() {
try {
- NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);
- if (theNattableaxisconfigurationFactory != null) {
+ NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);
+ if(theNattableaxisconfigurationFactory != null) {
return theNattableaxisconfigurationFactory;
}
} catch (Exception exception) {
@@ -77,7 +78,7 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:
return createAxisManagerRepresentation();
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:
@@ -109,7 +110,7 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
@Override
public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
return createAxisIndexStyleFromString(eDataType, initialValue);
default:
@@ -125,7 +126,7 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
@Override
public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
return convertAxisIndexStyleToString(eDataType, instanceValue);
default:
@@ -249,8 +250,7 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {
AxisIndexStyle result = AxisIndexStyle.get(initialValue);
- if (result == null)
- {
+ if(result == null) {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return result;
@@ -274,7 +274,7 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
*/
@Override
public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {
- return (NattableaxisconfigurationPackage) getEPackage();
+ return (NattableaxisconfigurationPackage)getEPackage();
}
/**
@@ -288,5 +288,4 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
public static NattableaxisconfigurationPackage getPackage() {
return NattableaxisconfigurationPackage.eINSTANCE;
}
-
} // NattableaxisconfigurationFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
index f338234b84e..4f754ddf411 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
@@ -63,6 +63,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattableaxisconfigurationPackageImpl extends EPackageImpl implements NattableaxisconfigurationPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -168,10 +169,12 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
private EEnum axisIndexStyleEEnum = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#eNS_URI
@@ -194,8 +197,8 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattableaxisconfigurationPackage#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 -->
+ * This method is used to initialize {@link NattableaxisconfigurationPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -203,41 +206,24 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
* @generated
*/
public static NattableaxisconfigurationPackage init() {
- if (isInited) {
- return (NattableaxisconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+ if(isInited) {
+ return (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new NattableaxisconfigurationPackageImpl());
-
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisconfigurationPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisconfigurationPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -249,7 +235,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattableaxisconfigurationPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -261,21 +246,16 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theNattableaxisconfigurationPackage,
- new EValidator.Descriptor() {
- @Override
- public EValidator getEValidator() {
- return NattableaxisconfigurationValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theNattableaxisconfigurationPackage, new EValidator.Descriptor() {
+ @Override
+ public EValidator getEValidator() {
+ return NattableaxisconfigurationValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theNattableaxisconfigurationPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattableaxisconfigurationPackage.eNS_URI, theNattableaxisconfigurationPackage);
return theNattableaxisconfigurationPackage;
@@ -300,7 +280,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAbstractHeaderAxisConfiguration_IndexStyle() {
- return (EAttribute) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -311,7 +291,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAbstractHeaderAxisConfiguration_DisplayLabel() {
- return (EAttribute) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -322,7 +302,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAbstractHeaderAxisConfiguration_DisplayFilter() {
- return (EAttribute) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -333,7 +313,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAbstractHeaderAxisConfiguration_DisplayIndex() {
- return (EAttribute) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -344,7 +324,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations() {
- return (EReference) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(4);
+ return (EReference)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(4);
}
/**
@@ -355,7 +335,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations() {
- return (EReference) abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(5);
+ return (EReference)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(5);
}
/**
@@ -377,7 +357,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAxisManagerRepresentation_AxisManagerId() {
- return (EAttribute) axisManagerRepresentationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)axisManagerRepresentationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -388,7 +368,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getAxisManagerRepresentation_LabelProviderContext() {
- return (EAttribute) axisManagerRepresentationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)axisManagerRepresentationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -399,7 +379,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAxisManagerRepresentation_HeaderLabelConfiguration() {
- return (EReference) axisManagerRepresentationEClass.getEStructuralFeatures().get(2);
+ return (EReference)axisManagerRepresentationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -410,7 +390,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAxisManagerRepresentation_SpecificAxisConfigurations() {
- return (EReference) axisManagerRepresentationEClass.getEStructuralFeatures().get(3);
+ return (EReference)axisManagerRepresentationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -432,7 +412,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAxisManagerConfiguration_LocalHeaderLabelConfiguration() {
- return (EReference) axisManagerConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -443,7 +423,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAxisManagerConfiguration_AxisManager() {
- return (EReference) axisManagerConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -454,7 +434,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getAxisManagerConfiguration_LocalSpecificConfigurations() {
- return (EReference) axisManagerConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -476,7 +456,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getTableHeaderAxisConfiguration_AxisManagers() {
- return (EReference) tableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EReference)tableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -498,7 +478,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations() {
- return (EReference) localTableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EReference)localTableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -531,7 +511,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getFeatureAxisConfiguration_ShowOnlyCommonFeature() {
- return (EAttribute) featureAxisConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)featureAxisConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -564,7 +544,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getEStructuralFeatureValueFillingConfiguration_ListenFeature() {
- return (EReference) eStructuralFeatureValueFillingConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EReference)eStructuralFeatureValueFillingConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -586,7 +566,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getIPasteConfiguration_PostActions() {
- return (EAttribute) iPasteConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)iPasteConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -597,7 +577,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getIPasteConfiguration_DetachedMode() {
- return (EAttribute) iPasteConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)iPasteConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -619,7 +599,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getPasteEObjectConfiguration_PastedElementId() {
- return (EAttribute) pasteEObjectConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)pasteEObjectConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -630,7 +610,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getPasteEObjectConfiguration_PasteElementContainementFeature() {
- return (EReference) pasteEObjectConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EReference)pasteEObjectConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -652,7 +632,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getTreeFillingConfiguration_AxisUsedAsAxisProvider() {
- return (EReference) treeFillingConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EReference)treeFillingConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -663,7 +643,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getTreeFillingConfiguration_PasteConfiguration() {
- return (EReference) treeFillingConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EReference)treeFillingConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -674,7 +654,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getTreeFillingConfiguration_Depth() {
- return (EAttribute) treeFillingConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)treeFillingConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -685,7 +665,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EReference getTreeFillingConfiguration_LabelProvider() {
- return (EReference) treeFillingConfigurationEClass.getEStructuralFeatures().get(3);
+ return (EReference)treeFillingConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -696,7 +676,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public EAttribute getTreeFillingConfiguration_LabelProviderContext() {
- return (EAttribute) treeFillingConfigurationEClass.getEStructuralFeatures().get(4);
+ return (EAttribute)treeFillingConfigurationEClass.getEStructuralFeatures().get(4);
}
/**
@@ -718,7 +698,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
@Override
public NattableaxisconfigurationFactory getNattableaxisconfigurationFactory() {
- return (NattableaxisconfigurationFactory) getEFactoryInstance();
+ return (NattableaxisconfigurationFactory)getEFactoryInstance();
}
/**
@@ -738,11 +718,10 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
abstractHeaderAxisConfigurationEClass = createEClass(ABSTRACT_HEADER_AXIS_CONFIGURATION);
createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE);
@@ -751,49 +730,37 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX);
createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
-
axisManagerRepresentationEClass = createEClass(AXIS_MANAGER_REPRESENTATION);
createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID);
createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT);
createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION);
createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);
-
axisManagerConfigurationEClass = createEClass(AXIS_MANAGER_CONFIGURATION);
createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION);
createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER);
createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);
-
tableHeaderAxisConfigurationEClass = createEClass(TABLE_HEADER_AXIS_CONFIGURATION);
createEReference(tableHeaderAxisConfigurationEClass, TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
-
localTableHeaderAxisConfigurationEClass = createEClass(LOCAL_TABLE_HEADER_AXIS_CONFIGURATION);
createEReference(localTableHeaderAxisConfigurationEClass, LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
-
iAxisConfigurationEClass = createEClass(IAXIS_CONFIGURATION);
-
featureAxisConfigurationEClass = createEClass(FEATURE_AXIS_CONFIGURATION);
createEAttribute(featureAxisConfigurationEClass, FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE);
-
iFillingConfigurationEClass = createEClass(IFILLING_CONFIGURATION);
-
eStructuralFeatureValueFillingConfigurationEClass = createEClass(ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION);
createEReference(eStructuralFeatureValueFillingConfigurationEClass, ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE);
-
iPasteConfigurationEClass = createEClass(IPASTE_CONFIGURATION);
createEAttribute(iPasteConfigurationEClass, IPASTE_CONFIGURATION__POST_ACTIONS);
createEAttribute(iPasteConfigurationEClass, IPASTE_CONFIGURATION__DETACHED_MODE);
-
pasteEObjectConfigurationEClass = createEClass(PASTE_EOBJECT_CONFIGURATION);
createEAttribute(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID);
createEReference(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE);
-
treeFillingConfigurationEClass = createEClass(TREE_FILLING_CONFIGURATION);
createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);
createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION);
createEAttribute(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__DEPTH);
createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__LABEL_PROVIDER);
createEAttribute(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT);
-
// Create enums
axisIndexStyleEEnum = createEEnum(AXIS_INDEX_STYLE);
}
@@ -815,26 +782,21 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
- NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
- NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
- EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+ NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+ NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
abstractHeaderAxisConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
axisManagerRepresentationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
@@ -848,86 +810,49 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
iPasteConfigurationEClass.getESuperTypes().add(this.getIAxisConfiguration());
pasteEObjectConfigurationEClass.getESuperTypes().add(this.getIPasteConfiguration());
treeFillingConfigurationEClass.getESuperTypes().add(this.getIFillingConfiguration());
-
// Initialize classes, features, and operations; add parameters
initEClass(abstractHeaderAxisConfigurationEClass, AbstractHeaderAxisConfiguration.class, "AbstractHeaderAxisConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAbstractHeaderAxisConfiguration_IndexStyle(), this.getAxisIndexStyle(),
- "indexStyle", null, 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAbstractHeaderAxisConfiguration_DisplayLabel(), ecorePackage.getEBoolean(),
- "displayLabel", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getAbstractHeaderAxisConfiguration_DisplayFilter(), ecorePackage.getEBoolean(),
- "displayFilter", "false", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getAbstractHeaderAxisConfiguration_DisplayIndex(), ecorePackage.getEBoolean(),
- "displayIndex", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEReference(getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null,
- "ownedLabelConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), this.getIAxisConfiguration(), null,
- "ownedAxisConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getAbstractHeaderAxisConfiguration_IndexStyle(), this.getAxisIndexStyle(), "indexStyle", null, 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAbstractHeaderAxisConfiguration_DisplayLabel(), ecorePackage.getEBoolean(), "displayLabel", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getAbstractHeaderAxisConfiguration_DisplayFilter(), ecorePackage.getEBoolean(), "displayFilter", "false", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getAbstractHeaderAxisConfiguration_DisplayIndex(), ecorePackage.getEBoolean(), "displayIndex", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEReference(getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "ownedLabelConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), this.getIAxisConfiguration(), null, "ownedAxisConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(axisManagerRepresentationEClass, AxisManagerRepresentation.class, "AxisManagerRepresentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAxisManagerRepresentation_AxisManagerId(), ecorePackage.getEString(),
- "axisManagerId", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAxisManagerRepresentation_LabelProviderContext(), ecorePackage.getEString(),
- "labelProviderContext", null, 0, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAxisManagerRepresentation_HeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null,
- "headerLabelConfiguration", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAxisManagerRepresentation_SpecificAxisConfigurations(), this.getIAxisConfiguration(), null,
- "specificAxisConfigurations", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getAxisManagerRepresentation_AxisManagerId(), ecorePackage.getEString(), "axisManagerId", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAxisManagerRepresentation_LabelProviderContext(), ecorePackage.getEString(), "labelProviderContext", null, 0, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAxisManagerRepresentation_HeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "headerLabelConfiguration", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAxisManagerRepresentation_SpecificAxisConfigurations(), this.getIAxisConfiguration(), null, "specificAxisConfigurations", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(axisManagerConfigurationEClass, AxisManagerConfiguration.class, "AxisManagerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null,
- "localHeaderLabelConfiguration", null, 0, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAxisManagerConfiguration_AxisManager(), this.getAxisManagerRepresentation(), null,
- "axisManager", null, 1, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAxisManagerConfiguration_LocalSpecificConfigurations(), this.getIAxisConfiguration(), null,
- "localSpecificConfigurations", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "localHeaderLabelConfiguration", null, 0, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAxisManagerConfiguration_AxisManager(), this.getAxisManagerRepresentation(), null, "axisManager", null, 1, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAxisManagerConfiguration_LocalSpecificConfigurations(), this.getIAxisConfiguration(), null, "localSpecificConfigurations", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(tableHeaderAxisConfigurationEClass, TableHeaderAxisConfiguration.class, "TableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getTableHeaderAxisConfiguration_AxisManagers(), this.getAxisManagerRepresentation(), null,
- "axisManagers", null, 1, -1, TableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getTableHeaderAxisConfiguration_AxisManagers(), this.getAxisManagerRepresentation(), null, "axisManagers", null, 1, -1, TableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(localTableHeaderAxisConfigurationEClass, LocalTableHeaderAxisConfiguration.class, "LocalTableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), this.getAxisManagerConfiguration(), null,
- "axisManagerConfigurations", null, 0, -1, LocalTableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), this.getAxisManagerConfiguration(), null, "axisManagerConfigurations", null, 0, -1, LocalTableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(iAxisConfigurationEClass, IAxisConfiguration.class, "IAxisConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(featureAxisConfigurationEClass, FeatureAxisConfiguration.class, "FeatureAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFeatureAxisConfiguration_ShowOnlyCommonFeature(), ecorePackage.getEBoolean(),
- "showOnlyCommonFeature", null, 0, 1, FeatureAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getFeatureAxisConfiguration_ShowOnlyCommonFeature(), ecorePackage.getEBoolean(), "showOnlyCommonFeature", null, 0, 1, FeatureAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(iFillingConfigurationEClass, IFillingConfiguration.class, "IFillingConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(eStructuralFeatureValueFillingConfigurationEClass, EStructuralFeatureValueFillingConfiguration.class, "EStructuralFeatureValueFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEStructuralFeatureValueFillingConfiguration_ListenFeature(), ecorePackage.getEStructuralFeature(), null,
- "listenFeature", null, 1, 1, EStructuralFeatureValueFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getEStructuralFeatureValueFillingConfiguration_ListenFeature(), ecorePackage.getEStructuralFeature(), null, "listenFeature", null, 1, 1, EStructuralFeatureValueFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(iPasteConfigurationEClass, IPasteConfiguration.class, "IPasteConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIPasteConfiguration_PostActions(), ecorePackage.getEString(), "postActions", null, 0, -1, IPasteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getIPasteConfiguration_DetachedMode(), ecorePackage.getEBoolean(), "detachedMode", "true", 0, 1, IPasteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
initEClass(pasteEObjectConfigurationEClass, PasteEObjectConfiguration.class, "PasteEObjectConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getPasteEObjectConfiguration_PastedElementId(), ecorePackage.getEString(),
- "pastedElementId", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPasteEObjectConfiguration_PasteElementContainementFeature(), ecorePackage.getEStructuralFeature(), null,
- "pasteElementContainementFeature", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getPasteEObjectConfiguration_PastedElementId(), ecorePackage.getEString(), "pastedElementId", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPasteEObjectConfiguration_PasteElementContainementFeature(), ecorePackage.getEStructuralFeature(), null, "pasteElementContainementFeature", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(treeFillingConfigurationEClass, TreeFillingConfiguration.class, "TreeFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getTreeFillingConfiguration_AxisUsedAsAxisProvider(), theNattableaxisPackage.getIAxis(), null,
- "axisUsedAsAxisProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTreeFillingConfiguration_PasteConfiguration(), this.getPasteEObjectConfiguration(), null,
- "pasteConfiguration", null, 0, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTreeFillingConfiguration_AxisUsedAsAxisProvider(), theNattableaxisPackage.getIAxis(), null, "axisUsedAsAxisProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTreeFillingConfiguration_PasteConfiguration(), this.getPasteEObjectConfiguration(), null, "pasteConfiguration", null, 0, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getTreeFillingConfiguration_Depth(), theEcorePackage.getEInt(), "depth", null, 0, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTreeFillingConfiguration_LabelProvider(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null,
- "labelProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTreeFillingConfiguration_LabelProviderContext(), ecorePackage.getEString(),
- "labelProviderContext", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getTreeFillingConfiguration_LabelProvider(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "labelProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTreeFillingConfiguration_LabelProviderContext(), ecorePackage.getEString(), "labelProviderContext", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
// Initialize enums and add enum literals
initEEnum(axisIndexStyleEEnum, AxisIndexStyle.class, "AxisIndexStyle"); //$NON-NLS-1$
addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.ALPHABETIC);
addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.NUMERIC);
-
// Create annotations
// http://www.eclipse.org/emf/2002/Ecore
createEcoreAnnotations();
@@ -944,24 +869,16 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
protected void createEcoreAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
- addAnnotation(this,
- source,
- new String[] { "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(abstractHeaderAxisConfigurationEClass,
- source,
- new String[] { "constraints", "oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(axisManagerRepresentationEClass,
- source,
- new String[] { "constraints", "nonEmptyAxisManager" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableHeaderAxisConfigurationEClass,
- source,
- new String[] { "constraints", "axisManagersIdUnique" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(abstractHeaderAxisConfigurationEClass, source, new String[]{ "constraints", "oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(axisManagerRepresentationEClass, source, new String[]{ "constraints", "nonEmptyAxisManager" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableHeaderAxisConfigurationEClass, source, new String[]{ "constraints", "axisManagersIdUnique" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
/**
@@ -973,21 +890,12 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
*/
protected void createPivotAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$
- addAnnotation(
- abstractHeaderAxisConfigurationEClass,
- source,
- new String[] {
- "oneObjectLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1", //$NON-NLS-1$ //$NON-NLS-2$
- "oneFeatureLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(axisManagerRepresentationEClass,
- source,
- new String[] { "nonEmptyAxisManager", "not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableHeaderAxisConfigurationEClass,
- source,
- new String[] { "axisManagersIdUnique", "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(abstractHeaderAxisConfigurationEClass, source, new String[]{ "oneObjectLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1", //$NON-NLS-1$ //$NON-NLS-2$
+ "oneFeatureLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(axisManagerRepresentationEClass, source, new String[]{ "nonEmptyAxisManager", "not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableHeaderAxisConfigurationEClass, source, new String[]{ "axisManagersIdUnique", "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
-
} // NattableaxisconfigurationPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
index fe12aa6a47f..62410e1d14c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
@@ -27,14 +27,18 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPastedElementId <em>Pasted Element Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPastedElementId <em>
+ * Pasted Element Id</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPasteElementContainementFeature
+ * <em>Paste Element Containement Feature</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl implements PasteEObjectConfiguration {
+
/**
* The default value of the '{@link #getPastedElementId() <em>Pasted Element Id</em>}' attribute.
* <!-- begin-user-doc -->
@@ -110,7 +114,7 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
public void setPastedElementId(String newPastedElementId) {
String oldPastedElementId = pastedElementId;
pastedElementId = newPastedElementId;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID, oldPastedElementId, pastedElementId));
}
}
@@ -123,11 +127,11 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public EStructuralFeature getPasteElementContainementFeature() {
- if (pasteElementContainementFeature != null && pasteElementContainementFeature.eIsProxy()) {
- InternalEObject oldPasteElementContainementFeature = (InternalEObject) pasteElementContainementFeature;
- pasteElementContainementFeature = (EStructuralFeature) eResolveProxy(oldPasteElementContainementFeature);
- if (pasteElementContainementFeature != oldPasteElementContainementFeature) {
- if (eNotificationRequired()) {
+ if(pasteElementContainementFeature != null && pasteElementContainementFeature.eIsProxy()) {
+ InternalEObject oldPasteElementContainementFeature = (InternalEObject)pasteElementContainementFeature;
+ pasteElementContainementFeature = (EStructuralFeature)eResolveProxy(oldPasteElementContainementFeature);
+ if(pasteElementContainementFeature != oldPasteElementContainementFeature) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));
}
}
@@ -155,7 +159,7 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
public void setPasteElementContainementFeature(EStructuralFeature newPasteElementContainementFeature) {
EStructuralFeature oldPasteElementContainementFeature = pasteElementContainementFeature;
pasteElementContainementFeature = newPasteElementContainementFeature;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));
}
}
@@ -168,11 +172,11 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:
return getPastedElementId();
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:
- if (resolve) {
+ if(resolve) {
return getPasteElementContainementFeature();
}
return basicGetPasteElementContainementFeature();
@@ -188,12 +192,12 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:
- setPastedElementId((String) newValue);
+ setPastedElementId((String)newValue);
return;
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:
- setPasteElementContainementFeature((EStructuralFeature) newValue);
+ setPasteElementContainementFeature((EStructuralFeature)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -207,12 +211,12 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:
setPastedElementId(PASTED_ELEMENT_ID_EDEFAULT);
return;
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:
- setPasteElementContainementFeature((EStructuralFeature) null);
+ setPasteElementContainementFeature((EStructuralFeature)null);
return;
}
super.eUnset(featureID);
@@ -226,7 +230,7 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:
return PASTED_ELEMENT_ID_EDEFAULT == null ? pastedElementId != null : !PASTED_ELEMENT_ID_EDEFAULT.equals(pastedElementId);
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:
@@ -243,15 +247,13 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (pastedElementId: "); //$NON-NLS-1$
result.append(pastedElementId);
result.append(')');
return result.toString();
}
-
} // PasteEObjectConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
index 7c51c99c1ca..f18488a8ac3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
@@ -31,13 +31,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>Axis Managers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>
+ * Axis Managers</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements TableHeaderAxisConfiguration {
+
/**
* The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -78,7 +80,7 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
*/
@Override
public EList<AxisManagerRepresentation> getAxisManagers() {
- if (axisManagers == null) {
+ if(axisManagers == null) {
axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
}
return axisManagers;
@@ -92,9 +94,9 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
- return ((InternalEList<?>) getAxisManagers()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getAxisManagers()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -107,7 +109,7 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
return getAxisManagers();
}
@@ -123,10 +125,10 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
getAxisManagers().clear();
- getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>) newValue);
+ getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +142,7 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
getAxisManagers().clear();
return;
@@ -156,11 +158,10 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
return axisManagers != null && !axisManagers.isEmpty();
}
return super.eIsSet(featureID);
}
-
} // TableHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
index 5ca8603f3d3..9857670c2a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
@@ -31,17 +31,22 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>Paste Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider
+ * <em>Axis Used As Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>
+ * Paste Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getDepth <em>Depth</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label
+ * Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext
+ * <em>Label Provider Context</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class TreeFillingConfigurationImpl extends StyledElementImpl implements TreeFillingConfiguration {
+
/**
* The cached value of the '{@link #getAxisUsedAsAxisProvider() <em>Axis Used As Axis Provider</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -160,9 +165,9 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {
IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;
axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, oldAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -179,20 +184,19 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {
- if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {
+ if(newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {
NotificationChain msgs = null;
- if (axisUsedAsAxisProvider != null) {
- msgs = ((InternalEObject) axisUsedAsAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
+ if(axisUsedAsAxisProvider != null) {
+ msgs = ((InternalEObject)axisUsedAsAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
}
- if (newAxisUsedAsAxisProvider != null) {
- msgs = ((InternalEObject) newAxisUsedAsAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
+ if(newAxisUsedAsAxisProvider != null) {
+ msgs = ((InternalEObject)newAxisUsedAsAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
}
msgs = basicSetAxisUsedAsAxisProvider(newAxisUsedAsAxisProvider, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, newAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider));
}
}
@@ -205,11 +209,11 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public PasteEObjectConfiguration getPasteConfiguration() {
- if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {
- InternalEObject oldPasteConfiguration = (InternalEObject) pasteConfiguration;
- pasteConfiguration = (PasteEObjectConfiguration) eResolveProxy(oldPasteConfiguration);
- if (pasteConfiguration != oldPasteConfiguration) {
- if (eNotificationRequired()) {
+ if(pasteConfiguration != null && pasteConfiguration.eIsProxy()) {
+ InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;
+ pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);
+ if(pasteConfiguration != oldPasteConfiguration) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
}
}
@@ -237,7 +241,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {
PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;
pasteConfiguration = newPasteConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
}
}
@@ -263,7 +267,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
public void setDepth(int newDepth) {
int oldDepth = depth;
depth = newDepth;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH, oldDepth, depth));
}
}
@@ -276,11 +280,11 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public ILabelProviderConfiguration getLabelProvider() {
- if (labelProvider != null && labelProvider.eIsProxy()) {
- InternalEObject oldLabelProvider = (InternalEObject) labelProvider;
- labelProvider = (ILabelProviderConfiguration) eResolveProxy(oldLabelProvider);
- if (labelProvider != oldLabelProvider) {
- if (eNotificationRequired()) {
+ if(labelProvider != null && labelProvider.eIsProxy()) {
+ InternalEObject oldLabelProvider = (InternalEObject)labelProvider;
+ labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);
+ if(labelProvider != oldLabelProvider) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
}
}
@@ -308,7 +312,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {
ILabelProviderConfiguration oldLabelProvider = labelProvider;
labelProvider = newLabelProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
}
}
@@ -334,7 +338,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
public void setLabelProviderContext(String newLabelProviderContext) {
String oldLabelProviderContext = labelProviderContext;
labelProviderContext = newLabelProviderContext;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
}
}
@@ -347,7 +351,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
return basicSetAxisUsedAsAxisProvider(null, msgs);
}
@@ -362,18 +366,18 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
return getAxisUsedAsAxisProvider();
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
- if (resolve) {
+ if(resolve) {
return getPasteConfiguration();
}
return basicGetPasteConfiguration();
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
return getDepth();
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
- if (resolve) {
+ if(resolve) {
return getLabelProvider();
}
return basicGetLabelProvider();
@@ -391,21 +395,21 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
- setAxisUsedAsAxisProvider((IAxis) newValue);
+ setAxisUsedAsAxisProvider((IAxis)newValue);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
- setPasteConfiguration((PasteEObjectConfiguration) newValue);
+ setPasteConfiguration((PasteEObjectConfiguration)newValue);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
- setDepth((Integer) newValue);
+ setDepth((Integer)newValue);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
- setLabelProvider((ILabelProviderConfiguration) newValue);
+ setLabelProvider((ILabelProviderConfiguration)newValue);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
- setLabelProviderContext((String) newValue);
+ setLabelProviderContext((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -419,18 +423,18 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
- setAxisUsedAsAxisProvider((IAxis) null);
+ setAxisUsedAsAxisProvider((IAxis)null);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
- setPasteConfiguration((PasteEObjectConfiguration) null);
+ setPasteConfiguration((PasteEObjectConfiguration)null);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
setDepth(DEPTH_EDEFAULT);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
- setLabelProvider((ILabelProviderConfiguration) null);
+ setLabelProvider((ILabelProviderConfiguration)null);
return;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);
@@ -447,7 +451,7 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
return axisUsedAsAxisProvider != null;
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
@@ -470,10 +474,9 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (depth: "); //$NON-NLS-1$
result.append(depth);
@@ -482,5 +485,4 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
result.append(')');
return result.toString();
}
-
} // TreeFillingConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
index e4cf066d8e6..f2d6282312b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -59,7 +60,7 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
* @generated
*/
public NattableaxisconfigurationAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
}
}
@@ -75,11 +76,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -91,83 +92,83 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
*
* @generated
*/
- protected NattableaxisconfigurationSwitch<Adapter> modelSwitch =
- new NattableaxisconfigurationSwitch<Adapter>() {
- @Override
- public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {
- return createAbstractHeaderAxisConfigurationAdapter();
- }
-
- @Override
- public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {
- return createAxisManagerRepresentationAdapter();
- }
-
- @Override
- public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {
- return createAxisManagerConfigurationAdapter();
- }
-
- @Override
- public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {
- return createTableHeaderAxisConfigurationAdapter();
- }
-
- @Override
- public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {
- return createLocalTableHeaderAxisConfigurationAdapter();
- }
-
- @Override
- public Adapter caseIAxisConfiguration(IAxisConfiguration object) {
- return createIAxisConfigurationAdapter();
- }
-
- @Override
- public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {
- return createFeatureAxisConfigurationAdapter();
- }
-
- @Override
- public Adapter caseIFillingConfiguration(IFillingConfiguration object) {
- return createIFillingConfigurationAdapter();
- }
-
- @Override
- public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {
- return createEStructuralFeatureValueFillingConfigurationAdapter();
- }
-
- @Override
- public Adapter caseIPasteConfiguration(IPasteConfiguration object) {
- return createIPasteConfigurationAdapter();
- }
-
- @Override
- public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {
- return createPasteEObjectConfigurationAdapter();
- }
-
- @Override
- public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {
- return createTreeFillingConfigurationAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {
+ return createAbstractHeaderAxisConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {
+ return createAxisManagerRepresentationAdapter();
+ }
+
+ @Override
+ public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {
+ return createAxisManagerConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {
+ return createTableHeaderAxisConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {
+ return createLocalTableHeaderAxisConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseIAxisConfiguration(IAxisConfiguration object) {
+ return createIAxisConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {
+ return createFeatureAxisConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseIFillingConfiguration(IFillingConfiguration object) {
+ return createIFillingConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {
+ return createEStructuralFeatureValueFillingConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseIPasteConfiguration(IPasteConfiguration object) {
+ return createIPasteConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {
+ return createPasteEObjectConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {
+ return createTreeFillingConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -175,18 +176,19 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration
+ * <em>Abstract Header Axis 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.
@@ -201,7 +203,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation
+ * <em>Axis Manager Representation</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.
@@ -216,7 +220,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration
+ * <em>Axis Manager 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.
@@ -231,7 +237,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration
+ * <em>Table Header Axis 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.
@@ -246,7 +254,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration
+ * <em>Local Table Header Axis 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.
@@ -261,7 +271,8 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis 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.
@@ -276,7 +287,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration
+ * <em>Feature Axis 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.
@@ -291,7 +304,8 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling 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.
@@ -306,7 +320,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration
+ * <em>EStructural Feature Value Filling 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.
@@ -321,7 +337,8 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste 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.
@@ -336,7 +353,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration
+ * <em>Paste EObject 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.
@@ -351,7 +370,9 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration
+ * <em>Tree Filling 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.
@@ -381,7 +402,8 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -407,5 +429,4 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableaxisconfigurationAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
index 9ffda96b03c..a3065fe3c63 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
@@ -45,6 +45,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -62,7 +63,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* @generated
*/
public NattableaxisconfigurationSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
}
}
@@ -91,204 +92,216 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION: {
- AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration) theEObject;
+ switch(classifierID) {
+ case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:
+ {
+ AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration)theEObject;
T result = caseAbstractHeaderAxisConfiguration(abstractHeaderAxisConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(abstractHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(abstractHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: {
- AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation) theEObject;
+ case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:
+ {
+ AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation)theEObject;
T result = caseAxisManagerRepresentation(axisManagerRepresentation);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(axisManagerRepresentation);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(axisManagerRepresentation);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: {
- AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:
+ {
+ AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;
T result = caseAxisManagerConfiguration(axisManagerConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(axisManagerConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(axisManagerConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: {
- TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:
+ {
+ TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration)theEObject;
T result = caseTableHeaderAxisConfiguration(tableHeaderAxisConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseAbstractHeaderAxisConfiguration(tableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(tableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(tableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: {
- LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:
+ {
+ LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration)theEObject;
T result = caseLocalTableHeaderAxisConfiguration(localTableHeaderAxisConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseAbstractHeaderAxisConfiguration(localTableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(localTableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(localTableHeaderAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION: {
- IAxisConfiguration iAxisConfiguration = (IAxisConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:
+ {
+ IAxisConfiguration iAxisConfiguration = (IAxisConfiguration)theEObject;
T result = caseIAxisConfiguration(iAxisConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: {
- FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:
+ {
+ FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)theEObject;
T result = caseFeatureAxisConfiguration(featureAxisConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(featureAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureAxisConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION: {
- IFillingConfiguration iFillingConfiguration = (IFillingConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:
+ {
+ IFillingConfiguration iFillingConfiguration = (IFillingConfiguration)theEObject;
T result = caseIFillingConfiguration(iFillingConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(iFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: {
- EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:
+ {
+ EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration)theEObject;
T result = caseEStructuralFeatureValueFillingConfiguration(eStructuralFeatureValueFillingConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIFillingConfiguration(eStructuralFeatureValueFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(eStructuralFeatureValueFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(eStructuralFeatureValueFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eStructuralFeatureValueFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: {
- IPasteConfiguration iPasteConfiguration = (IPasteConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:
+ {
+ IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)theEObject;
T result = caseIPasteConfiguration(iPasteConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(iPasteConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iPasteConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iPasteConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: {
- PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:
+ {
+ PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)theEObject;
T result = casePasteEObjectConfiguration(pasteEObjectConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIPasteConfiguration(pasteEObjectConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(pasteEObjectConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(pasteEObjectConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(pasteEObjectConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: {
- TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration) theEObject;
+ case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:
+ {
+ TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)theEObject;
T result = caseTreeFillingConfiguration(treeFillingConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseIFillingConfiguration(treeFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseIAxisConfiguration(treeFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(treeFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(treeFillingConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -306,7 +319,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -323,7 +336,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -340,7 +353,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -357,7 +370,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -374,7 +387,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -391,7 +404,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -408,7 +421,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -425,7 +438,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -442,7 +455,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -459,7 +472,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -476,7 +489,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -493,7 +506,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -510,7 +523,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -527,7 +540,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -544,7 +557,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -553,5 +566,4 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableaxisconfigurationSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
index d457a7dac50..563bb2d3f5e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
@@ -43,6 +43,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
* @generated
*/
public class NattableaxisconfigurationValidator extends EObjectValidator {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -53,7 +54,8 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
public static final NattableaxisconfigurationValidator INSTANCE = new NattableaxisconfigurationValidator();
/**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+ * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+ * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -113,33 +115,33 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
*/
@Override
protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
- switch (classifierID) {
+ switch(classifierID) {
case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:
- return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration) value, diagnostics, context);
+ return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:
- return validateAxisManagerRepresentation((AxisManagerRepresentation) value, diagnostics, context);
+ return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);
case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:
- return validateAxisManagerConfiguration((AxisManagerConfiguration) value, diagnostics, context);
+ return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:
- return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration) value, diagnostics, context);
+ return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:
- return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration) value, diagnostics, context);
+ return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:
- return validateIAxisConfiguration((IAxisConfiguration) value, diagnostics, context);
+ return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:
- return validateFeatureAxisConfiguration((FeatureAxisConfiguration) value, diagnostics, context);
+ return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:
- return validateIFillingConfiguration((IFillingConfiguration) value, diagnostics, context);
+ return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:
- return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration) value, diagnostics, context);
+ return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:
- return validateIPasteConfiguration((IPasteConfiguration) value, diagnostics, context);
+ return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:
- return validatePasteEObjectConfiguration((PasteEObjectConfiguration) value, diagnostics, context);
+ return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:
- return validateTreeFillingConfiguration((TreeFillingConfiguration) value, diagnostics, context);
+ return validateTreeFillingConfiguration((TreeFillingConfiguration)value, diagnostics, context);
case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
- return validateAxisIndexStyle((AxisIndexStyle) value, diagnostics, context);
+ return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);
default:
return true;
}
@@ -152,35 +154,35 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(abstractHeaderAxisConfiguration, diagnostics, context)) {
+ if(!validate_NoCircularContainment(abstractHeaderAxisConfiguration, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(abstractHeaderAxisConfiguration, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);
}
return result;
@@ -203,15 +205,9 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,
- abstractHeaderAxisConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "oneObjectLabelConfigurationTypes", //$NON-NLS-1$
- ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION, abstractHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "oneObjectLabelConfigurationTypes", //$NON-NLS-1$
+ ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -231,15 +227,9 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,
- abstractHeaderAxisConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "oneFeatureLabelConfigurationTypes", //$NON-NLS-1$
- ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION, abstractHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "oneFeatureLabelConfigurationTypes", //$NON-NLS-1$
+ ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -249,32 +239,32 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateAxisManagerRepresentation(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) {
+ if(!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(axisManagerRepresentation, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(axisManagerRepresentation, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAxisManagerRepresentation_nonEmptyAxisManager(axisManagerRepresentation, diagnostics, context);
}
return result;
@@ -297,15 +287,9 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateAxisManagerRepresentation_nonEmptyAxisManager(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION,
- axisManagerRepresentation,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "nonEmptyAxisManager", //$NON-NLS-1$
- AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION, axisManagerRepresentation, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "nonEmptyAxisManager", //$NON-NLS-1$
+ AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -325,38 +309,38 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableHeaderAxisConfiguration(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) {
+ if(!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(tableHeaderAxisConfiguration, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);
}
return result;
@@ -379,15 +363,9 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableHeaderAxisConfiguration_axisManagersIdUnique(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION,
- tableHeaderAxisConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "axisManagersIdUnique", //$NON-NLS-1$
- TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION, tableHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "axisManagersIdUnique", //$NON-NLS-1$
+ TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -397,35 +375,35 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(localTableHeaderAxisConfiguration, diagnostics, context)) {
+ if(!validate_NoCircularContainment(localTableHeaderAxisConfiguration, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(localTableHeaderAxisConfiguration, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);
}
return result;
@@ -525,5 +503,4 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
// Ensure that you remove @generated or mark it @generated NOT
return super.getResourceLocator();
}
-
} // NattableaxisconfigurationValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
index 808e602b6b1..63d5159e415 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* @generated
*/
public interface AbstractAxisProvider extends TableNamedElement {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -45,5 +46,4 @@ public interface AbstractAxisProvider extends TableNamedElement {
* @generated
*/
EList<IAxis> getAxis();
-
} // AbstractAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
index 5f3e872ff36..bb8c51d45ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
* @generated
*/
public interface AxisProvider extends AbstractAxisProvider {
+
/**
* Returns the value of the '<em><b>Axis</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
@@ -52,5 +53,4 @@ public interface AxisProvider extends AbstractAxisProvider {
*/
@Override
EList<IAxis> getAxis();
-
} // AxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
index 096290de15e..610660f38f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.
@@ -35,6 +34,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
* @generated
*/
public interface IMasterAxisProvider extends AxisProvider {
+
/**
* Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -52,15 +52,15 @@ public interface IMasterAxisProvider extends AxisProvider {
boolean isDisconnectSlave();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave
+ * <em>Disconnect Slave</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Disconnect Slave</em>' attribute.
+ * the new value of the '<em>Disconnect Slave</em>' attribute.
* @see #isDisconnectSlave()
* @generated
*/
void setDisconnectSlave(boolean value);
-
} // IMasterAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
index 4df079abbe1..d009135208e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
index 5cccbe2ed79..aae3cec2be7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
index e7a38add824..0947becb5ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableaxisproviderFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -62,5 +63,4 @@ public interface NattableaxisproviderFactory extends EFactory {
* @generated
*/
NattableaxisproviderPackage getNattableaxisproviderPackage();
-
} // NattableaxisproviderFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
index ea868136c63..269ead2bc77 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
* @generated
*/
public interface NattableaxisproviderPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -74,7 +75,8 @@ public interface NattableaxisproviderPackage extends EPackage {
NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+ * <em>Abstract Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -195,7 +197,8 @@ public interface NattableaxisproviderPackage extends EPackage {
int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl
+ * <em>Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -326,7 +329,8 @@ public interface NattableaxisproviderPackage extends EPackage {
int AXIS_PROVIDER_OPERATION_COUNT = ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+ * <em>IMaster Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -467,7 +471,8 @@ public interface NattableaxisproviderPackage extends EPackage {
int IMASTER_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+ * <em>ISlave Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -598,7 +603,8 @@ public interface NattableaxisproviderPackage extends EPackage {
int ISLAVE_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl
+ * <em>Slave Object Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -729,7 +735,8 @@ public interface NattableaxisproviderPackage extends EPackage {
int SLAVE_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = ISLAVE_AXIS_PROVIDER_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl
+ * <em>Master Object Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -869,9 +876,9 @@ public interface NattableaxisproviderPackage extends EPackage {
*/
int MASTER_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = IMASTER_AXIS_PROVIDER_OPERATION_COUNT + 0;
-
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
+ * <em>Abstract Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -882,7 +889,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass getAbstractAxisProvider();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()
+ * <em>Get Axis</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -893,7 +901,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EOperation getAbstractAxisProvider__GetAxis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+ * <em>IMaster Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -904,7 +913,9 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass getIMasterAxisProvider();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}
+ * '.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -916,7 +927,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EAttribute getIMasterAxisProvider_DisconnectSlave();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+ * <em>ISlave Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -927,7 +939,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass getISlaveAxisProvider();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider
+ * <em>Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -938,7 +951,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass getAxisProvider();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -950,7 +964,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EReference getAxisProvider_Axis();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider
+ * <em>Slave Object Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -961,7 +976,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass getSlaveObjectAxisProvider();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider
+ * <em>Master Object Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -996,8 +1012,11 @@ public interface NattableaxisproviderPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+ * <em>Abstract Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1017,7 +1036,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EOperation ABSTRACT_AXIS_PROVIDER___GET_AXIS = eINSTANCE.getAbstractAxisProvider__GetAxis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+ * <em>IMaster Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1037,7 +1057,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EAttribute IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = eINSTANCE.getIMasterAxisProvider_DisconnectSlave();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+ * <em>ISlave Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1048,7 +1069,8 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass ISLAVE_AXIS_PROVIDER = eINSTANCE.getISlaveAxisProvider();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl
+ * <em>Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1068,7 +1090,9 @@ public interface NattableaxisproviderPackage extends EPackage {
EReference AXIS_PROVIDER__AXIS = eINSTANCE.getAxisProvider_Axis();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl
+ * <em>Slave Object Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1079,7 +1103,9 @@ public interface NattableaxisproviderPackage extends EPackage {
EClass SLAVE_OBJECT_AXIS_PROVIDER = eINSTANCE.getSlaveObjectAxisProvider();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl
+ * <em>Master Object Axis Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1088,7 +1114,5 @@ public interface NattableaxisproviderPackage extends EPackage {
* @generated
*/
EClass MASTER_OBJECT_AXIS_PROVIDER = eINSTANCE.getMasterObjectAxisProvider();
-
}
-
} // NattableaxisproviderPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
index 301f13250ed..afbb44746b7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
index 46a2411d59e..c46b60fe820 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
* @generated
*/
public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl implements AbstractAxisProvider {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -73,11 +74,10 @@ public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl imp
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:
return getAxis();
}
return super.eInvoke(operationID, arguments);
}
-
} // AbstractAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
index ef6d1468c49..629d41a71a3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
* @generated
*/
public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implements AxisProvider {
+
/**
* The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -78,7 +79,7 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
*/
@Override
public EList<IAxis> getAxis() {
- if (axis == null) {
+ if(axis == null) {
axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);
}
return axis;
@@ -92,9 +93,9 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
- return ((InternalEList<?>) getAxis()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -107,7 +108,7 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
return getAxis();
}
@@ -123,10 +124,10 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
getAxis().clear();
- getAxis().addAll((Collection<? extends IAxis>) newValue);
+ getAxis().addAll((Collection<? extends IAxis>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
getAxis().clear();
return;
@@ -156,11 +157,10 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
return axis != null && !axis.isEmpty();
}
return super.eIsSet(featureID);
}
-
} // AxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
index 8b45f0dbb2c..f8ce9d1aaca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
@@ -25,13 +25,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>Disconnect Slave</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>
+ * Disconnect Slave</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements MasterObjectAxisProvider {
+
/**
* The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +98,7 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
public void setDisconnectSlave(boolean newDisconnectSlave) {
boolean oldDisconnectSlave = disconnectSlave;
disconnectSlave = newDisconnectSlave;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));
}
}
@@ -109,7 +111,7 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
return isDisconnectSlave();
}
@@ -124,9 +126,9 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
- setDisconnectSlave((Boolean) newValue);
+ setDisconnectSlave((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +142,7 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
setDisconnectSlave(DISCONNECT_SLAVE_EDEFAULT);
return;
@@ -156,7 +158,7 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
return disconnectSlave != DISCONNECT_SLAVE_EDEFAULT;
}
@@ -171,15 +173,13 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (disconnectSlave: "); //$NON-NLS-1$
result.append(disconnectSlave);
result.append(')');
return result.toString();
}
-
} // MasterObjectAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
index 7889c5cd047..2b713364c7d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
* @generated
*/
public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -39,8 +40,8 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
*/
public static NattableaxisproviderFactory init() {
try {
- NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory) EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);
- if (theNattableaxisproviderFactory != null) {
+ NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);
+ if(theNattableaxisproviderFactory != null) {
return theNattableaxisproviderFactory;
}
} catch (Exception exception) {
@@ -68,7 +69,7 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER:
return createSlaveObjectAxisProvider();
case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER:
@@ -110,7 +111,7 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
*/
@Override
public NattableaxisproviderPackage getNattableaxisproviderPackage() {
- return (NattableaxisproviderPackage) getEPackage();
+ return (NattableaxisproviderPackage)getEPackage();
}
/**
@@ -124,5 +125,4 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
public static NattableaxisproviderPackage getPackage() {
return NattableaxisproviderPackage.eINSTANCE;
}
-
} // NattableaxisproviderFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
index cc8c637808a..b680fe8fb8d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
@@ -54,6 +54,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -103,10 +104,12 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
private EClass masterObjectAxisProviderEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI
@@ -129,8 +132,8 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattableaxisproviderPackage#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 -->
+ * This method is used to initialize {@link NattableaxisproviderPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -138,42 +141,24 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
* @generated
*/
public static NattableaxisproviderPackage init() {
- if (isInited) {
- return (NattableaxisproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+ if(isInited) {
+ return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new NattableaxisproviderPackageImpl());
-
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisproviderPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -185,7 +170,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattableaxisproviderPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -197,11 +181,8 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattableaxisproviderPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);
return theNattableaxisproviderPackage;
@@ -248,7 +229,7 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
*/
@Override
public EAttribute getIMasterAxisProvider_DisconnectSlave() {
- return (EAttribute) iMasterAxisProviderEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);
}
/**
@@ -281,7 +262,7 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
*/
@Override
public EReference getAxisProvider_Axis() {
- return (EReference) axisProviderEClass.getEStructuralFeatures().get(0);
+ return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);
}
/**
@@ -314,7 +295,7 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
*/
@Override
public NattableaxisproviderFactory getNattableaxisproviderFactory() {
- return (NattableaxisproviderFactory) getEFactoryInstance();
+ return (NattableaxisproviderFactory)getEFactoryInstance();
}
/**
@@ -334,25 +315,19 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);
createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);
-
iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);
createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);
-
iSlaveAxisProviderEClass = createEClass(ISLAVE_AXIS_PROVIDER);
-
axisProviderEClass = createEClass(AXIS_PROVIDER);
createEReference(axisProviderEClass, AXIS_PROVIDER__AXIS);
-
slaveObjectAxisProviderEClass = createEClass(SLAVE_OBJECT_AXIS_PROVIDER);
-
masterObjectAxisProviderEClass = createEClass(MASTER_OBJECT_AXIS_PROVIDER);
}
@@ -373,24 +348,19 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
- NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
-
+ NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+ NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());
@@ -398,23 +368,15 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
axisProviderEClass.getESuperTypes().add(this.getAbstractAxisProvider());
slaveObjectAxisProviderEClass.getESuperTypes().add(this.getISlaveAxisProvider());
masterObjectAxisProviderEClass.getESuperTypes().add(this.getIMasterAxisProvider());
-
// Initialize classes, features, and operations; add parameters
initEClass(abstractAxisProviderEClass, AbstractAxisProvider.class, "AbstractAxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEOperation(getAbstractAxisProvider__GetAxis(), theNattableaxisPackage.getIAxis(), "getAxis", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEClass(iMasterAxisProviderEClass, IMasterAxisProvider.class, "IMasterAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIMasterAxisProvider_DisconnectSlave(), ecorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
}
-
} // NattableaxisproviderPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
index 889331d9cd4..87359748495 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
* @generated
*/
public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements SlaveObjectAxisProvider {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -46,5 +47,4 @@ public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements Sla
protected EClass eStaticClass() {
return NattableaxisproviderPackage.Literals.SLAVE_OBJECT_AXIS_PROVIDER;
}
-
} // SlaveObjectAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
index 625f8d6b480..43cd3a9279a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -54,7 +55,7 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattableaxisproviderAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisproviderPackage.eINSTANCE;
}
}
@@ -70,11 +71,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -86,58 +87,58 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattableaxisproviderSwitch<Adapter> modelSwitch =
- new NattableaxisproviderSwitch<Adapter>() {
- @Override
- public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {
- return createAbstractAxisProviderAdapter();
- }
+ protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {
- @Override
- public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {
- return createIMasterAxisProviderAdapter();
- }
+ @Override
+ public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {
+ return createAbstractAxisProviderAdapter();
+ }
- @Override
- public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {
- return createISlaveAxisProviderAdapter();
- }
+ @Override
+ public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {
+ return createIMasterAxisProviderAdapter();
+ }
- @Override
- public Adapter caseAxisProvider(AxisProvider object) {
- return createAxisProviderAdapter();
- }
+ @Override
+ public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {
+ return createISlaveAxisProviderAdapter();
+ }
- @Override
- public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {
- return createSlaveObjectAxisProviderAdapter();
- }
+ @Override
+ public Adapter caseAxisProvider(AxisProvider object) {
+ return createAxisProviderAdapter();
+ }
+
+ @Override
+ public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {
+ return createSlaveObjectAxisProviderAdapter();
+ }
- @Override
- public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {
- return createMasterObjectAxisProviderAdapter();
- }
+ @Override
+ public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {
+ return createMasterObjectAxisProviderAdapter();
+ }
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
- @Override
- public Adapter caseTableNamedElement(TableNamedElement object) {
- return createTableNamedElementAdapter();
- }
+ @Override
+ public Adapter caseTableNamedElement(TableNamedElement object) {
+ return createTableNamedElementAdapter();
+ }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -145,18 +146,18 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</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.
@@ -171,7 +172,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</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.
@@ -186,7 +188,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+ * <em>ISlave Axis Provider</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.
@@ -201,7 +204,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider
+ * <em>Axis Provider</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.
@@ -216,7 +220,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</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.
@@ -231,7 +236,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</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.
@@ -261,7 +267,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -276,7 +283,8 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+ * <em>Table Named Element</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.
@@ -302,5 +310,4 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableaxisproviderAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
index 23a6d49d08c..90e08be17fd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableaxisproviderSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -57,7 +58,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* @generated
*/
public NattableaxisproviderSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableaxisproviderPackage.eINSTANCE;
}
}
@@ -86,138 +87,144 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {
- AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider) theEObject;
+ switch(classifierID) {
+ case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER:
+ {
+ AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;
T result = caseAbstractAxisProvider(abstractAxisProvider);
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(abstractAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(abstractAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(abstractAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER: {
- IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider) theEObject;
+ case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER:
+ {
+ IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider)theEObject;
T result = caseIMasterAxisProvider(iMasterAxisProvider);
- if (result == null) {
+ if(result == null) {
result = caseAxisProvider(iMasterAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAbstractAxisProvider(iMasterAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(iMasterAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iMasterAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iMasterAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER: {
- ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider) theEObject;
+ case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER:
+ {
+ ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider)theEObject;
T result = caseISlaveAxisProvider(iSlaveAxisProvider);
- if (result == null) {
+ if(result == null) {
result = caseAxisProvider(iSlaveAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAbstractAxisProvider(iSlaveAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(iSlaveAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iSlaveAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iSlaveAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisproviderPackage.AXIS_PROVIDER: {
- AxisProvider axisProvider = (AxisProvider) theEObject;
+ case NattableaxisproviderPackage.AXIS_PROVIDER:
+ {
+ AxisProvider axisProvider = (AxisProvider)theEObject;
T result = caseAxisProvider(axisProvider);
- if (result == null) {
+ if(result == null) {
result = caseAbstractAxisProvider(axisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(axisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(axisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(axisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: {
- SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider) theEObject;
+ case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER:
+ {
+ SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider)theEObject;
T result = caseSlaveObjectAxisProvider(slaveObjectAxisProvider);
- if (result == null) {
+ if(result == null) {
result = caseISlaveAxisProvider(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAxisProvider(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAbstractAxisProvider(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(slaveObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: {
- MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider) theEObject;
+ case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER:
+ {
+ MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider)theEObject;
T result = caseMasterObjectAxisProvider(masterObjectAxisProvider);
- if (result == null) {
+ if(result == null) {
result = caseIMasterAxisProvider(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAxisProvider(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseAbstractAxisProvider(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(masterObjectAxisProvider);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -235,7 +242,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -252,7 +259,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -269,7 +276,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -286,7 +293,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -303,7 +310,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -320,7 +327,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -337,7 +344,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -354,7 +361,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -371,7 +378,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -388,7 +395,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -397,5 +404,4 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableaxisproviderSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
index a82ba2398c5..a2d5d14f8a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
* @generated
*/
public interface Cell extends EModelElement {
+
/**
* Returns the value of the '<em><b>Column Wrapper</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -56,12 +57,13 @@ public interface Cell extends EModelElement {
ICellAxisWrapper getColumnWrapper();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'
+ * containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Column Wrapper</em>' containment reference.
+ * the new value of the '<em>Column Wrapper</em>' containment reference.
* @see #getColumnWrapper()
* @generated
*/
@@ -84,12 +86,13 @@ public interface Cell extends EModelElement {
ICellAxisWrapper getRowWrapper();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'
+ * containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Row Wrapper</em>' containment reference.
+ * the new value of the '<em>Row Wrapper</em>' containment reference.
* @see #getRowWrapper()
* @generated
*/
@@ -110,5 +113,4 @@ public interface Cell extends EModelElement {
* @generated
*/
EList<Problem> getProblems();
-
} // Cell
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
index 73704ba288b..ceed495b391 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface EObjectAxisWrapper extends ICellAxisWrapper {
+
/**
* Returns the value of the '<em><b>Element</b></em>' reference.
* <!-- begin-user-doc -->
@@ -53,15 +54,15 @@ public interface EObjectAxisWrapper extends ICellAxisWrapper {
EObject getElement();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}'
+ * reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Element</em>' reference.
+ * the new value of the '<em>Element</em>' reference.
* @see #getElement()
* @generated
*/
void setElement(EObject value);
-
} // EObjectAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
index 008109062f2..82fbecbdda4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.EModelElement;
* @generated
*/
public interface ICellAxisWrapper extends EModelElement {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -40,5 +41,4 @@ public interface ICellAxisWrapper extends EModelElement {
* @generated
*/
Object getElement();
-
} // ICellAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
index d1036bd7e9a..9df6471ee31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Id Axis Wrapper</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
* @generated
*/
public interface IdAxisWrapper extends ICellAxisWrapper {
+
/**
* Returns the value of the '<em><b>Element</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -52,15 +52,15 @@ public interface IdAxisWrapper extends ICellAxisWrapper {
String getElement();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Element</em>' attribute.
+ * the new value of the '<em>Element</em>' attribute.
* @see #getElement()
* @generated
*/
void setElement(String value);
-
} // IdAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
index c2136c66d32..5152ce60fde 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattablecellFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -72,5 +73,4 @@ public interface NattablecellFactory extends EFactory {
* @generated
*/
NattablecellPackage getNattablecellPackage();
-
} // NattablecellFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
index 8330d10a732..6ff9bf51bc2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.EcorePackage;
* @generated
*/
public interface NattablecellPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -155,7 +156,8 @@ public interface NattablecellPackage extends EPackage {
int CELL_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}
+ * ' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -216,7 +218,8 @@ public interface NattablecellPackage extends EPackage {
int ICELL_AXIS_WRAPPER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl
+ * <em>EObject Axis Wrapper</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -287,7 +290,8 @@ public interface NattablecellPackage extends EPackage {
int EOBJECT_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl
+ * <em>Id Axis Wrapper</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -357,7 +361,6 @@ public interface NattablecellPackage extends EPackage {
*/
int ID_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;
-
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.
* <!-- begin-user-doc -->
@@ -370,7 +373,8 @@ public interface NattablecellPackage extends EPackage {
EClass getCell();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -382,7 +386,8 @@ public interface NattablecellPackage extends EPackage {
EReference getCell_ColumnWrapper();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -394,7 +399,8 @@ public interface NattablecellPackage extends EPackage {
EReference getCell_RowWrapper();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -406,7 +412,8 @@ public interface NattablecellPackage extends EPackage {
EReference getCell_Problems();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+ * <em>ICell Axis Wrapper</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -417,7 +424,8 @@ public interface NattablecellPackage extends EPackage {
EClass getICellAxisWrapper();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement() <em>Get Element</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement()
+ * <em>Get Element</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -428,7 +436,8 @@ public interface NattablecellPackage extends EPackage {
EOperation getICellAxisWrapper__GetElement();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper
+ * <em>EObject Axis Wrapper</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -439,7 +448,8 @@ public interface NattablecellPackage extends EPackage {
EClass getEObjectAxisWrapper();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement
+ * <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -451,7 +461,8 @@ public interface NattablecellPackage extends EPackage {
EReference getEObjectAxisWrapper_Element();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper
+ * <em>Id Axis Wrapper</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -462,7 +473,8 @@ public interface NattablecellPackage extends EPackage {
EClass getIdAxisWrapper();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement
+ * <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -498,6 +510,7 @@ public interface NattablecellPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.
* <!-- begin-user-doc -->
@@ -537,7 +550,8 @@ public interface NattablecellPackage extends EPackage {
EReference CELL__PROBLEMS = eINSTANCE.getCell_Problems();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+ * <em>ICell Axis Wrapper</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -557,7 +571,8 @@ public interface NattablecellPackage extends EPackage {
EOperation ICELL_AXIS_WRAPPER___GET_ELEMENT = eINSTANCE.getICellAxisWrapper__GetElement();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl
+ * <em>EObject Axis Wrapper</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -577,7 +592,8 @@ public interface NattablecellPackage extends EPackage {
EReference EOBJECT_AXIS_WRAPPER__ELEMENT = eINSTANCE.getEObjectAxisWrapper_Element();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl
+ * <em>Id Axis Wrapper</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -595,7 +611,5 @@ public interface NattablecellPackage extends EPackage {
* @generated
*/
EAttribute ID_AXIS_WRAPPER__ELEMENT = eINSTANCE.getIdAxisWrapper_Element();
-
}
-
} // NattablecellPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
index 1fd15a3e05e..8180dd63749 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
* @generated
*/
public class CellImpl extends EModelElementImpl implements Cell {
+
/**
* The cached value of the '{@link #getColumnWrapper() <em>Column Wrapper</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -118,9 +119,9 @@ public class CellImpl extends EModelElementImpl implements Cell {
public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {
ICellAxisWrapper oldColumnWrapper = columnWrapper;
columnWrapper = newColumnWrapper;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -137,20 +138,19 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {
- if (newColumnWrapper != columnWrapper) {
+ if(newColumnWrapper != columnWrapper) {
NotificationChain msgs = null;
- if (columnWrapper != null) {
- msgs = ((InternalEObject) columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
+ if(columnWrapper != null) {
+ msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
}
- if (newColumnWrapper != null) {
- msgs = ((InternalEObject) newColumnWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
+ if(newColumnWrapper != null) {
+ msgs = ((InternalEObject)newColumnWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
}
msgs = basicSetColumnWrapper(newColumnWrapper, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, newColumnWrapper, newColumnWrapper));
}
}
@@ -175,9 +175,9 @@ public class CellImpl extends EModelElementImpl implements Cell {
public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {
ICellAxisWrapper oldRowWrapper = rowWrapper;
rowWrapper = newRowWrapper;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -194,20 +194,19 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public void setRowWrapper(ICellAxisWrapper newRowWrapper) {
- if (newRowWrapper != rowWrapper) {
+ if(newRowWrapper != rowWrapper) {
NotificationChain msgs = null;
- if (rowWrapper != null) {
- msgs = ((InternalEObject) rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
+ if(rowWrapper != null) {
+ msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
}
- if (newRowWrapper != null) {
- msgs = ((InternalEObject) newRowWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
+ if(newRowWrapper != null) {
+ msgs = ((InternalEObject)newRowWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
}
msgs = basicSetRowWrapper(newRowWrapper, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, newRowWrapper, newRowWrapper));
}
}
@@ -220,7 +219,7 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public EList<Problem> getProblems() {
- if (problems == null) {
+ if(problems == null) {
problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);
}
return problems;
@@ -234,13 +233,13 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.CELL__COLUMN_WRAPPER:
return basicSetColumnWrapper(null, msgs);
case NattablecellPackage.CELL__ROW_WRAPPER:
return basicSetRowWrapper(null, msgs);
case NattablecellPackage.CELL__PROBLEMS:
- return ((InternalEList<?>) getProblems()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getProblems()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -253,7 +252,7 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.CELL__COLUMN_WRAPPER:
return getColumnWrapper();
case NattablecellPackage.CELL__ROW_WRAPPER:
@@ -273,16 +272,16 @@ public class CellImpl extends EModelElementImpl implements Cell {
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.CELL__COLUMN_WRAPPER:
- setColumnWrapper((ICellAxisWrapper) newValue);
+ setColumnWrapper((ICellAxisWrapper)newValue);
return;
case NattablecellPackage.CELL__ROW_WRAPPER:
- setRowWrapper((ICellAxisWrapper) newValue);
+ setRowWrapper((ICellAxisWrapper)newValue);
return;
case NattablecellPackage.CELL__PROBLEMS:
getProblems().clear();
- getProblems().addAll((Collection<? extends Problem>) newValue);
+ getProblems().addAll((Collection<? extends Problem>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -296,12 +295,12 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.CELL__COLUMN_WRAPPER:
- setColumnWrapper((ICellAxisWrapper) null);
+ setColumnWrapper((ICellAxisWrapper)null);
return;
case NattablecellPackage.CELL__ROW_WRAPPER:
- setRowWrapper((ICellAxisWrapper) null);
+ setRowWrapper((ICellAxisWrapper)null);
return;
case NattablecellPackage.CELL__PROBLEMS:
getProblems().clear();
@@ -318,7 +317,7 @@ public class CellImpl extends EModelElementImpl implements Cell {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.CELL__COLUMN_WRAPPER:
return columnWrapper != null;
case NattablecellPackage.CELL__ROW_WRAPPER:
@@ -328,5 +327,4 @@ public class CellImpl extends EModelElementImpl implements Cell {
}
return super.eIsSet(featureID);
}
-
} // CellImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
index 7591806f979..8c472f28492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
* @generated
*/
public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObjectAxisWrapper {
+
/**
* The cached value of the '{@link #getElement() <em>Element</em>}' reference.
* <!-- begin-user-doc -->
@@ -75,11 +76,11 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
*/
@Override
public EObject getElement() {
- if (element != null && element.eIsProxy()) {
- InternalEObject oldElement = (InternalEObject) element;
+ if(element != null && element.eIsProxy()) {
+ InternalEObject oldElement = (InternalEObject)element;
element = eResolveProxy(oldElement);
- if (element != oldElement) {
- if (eNotificationRequired()) {
+ if(element != oldElement) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));
}
}
@@ -107,7 +108,7 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
public void setElement(EObject newElement) {
EObject oldElement = element;
element = newElement;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));
}
}
@@ -120,9 +121,9 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
- if (resolve) {
+ if(resolve) {
return getElement();
}
return basicGetElement();
@@ -138,9 +139,9 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
- setElement((EObject) newValue);
+ setElement((EObject)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -154,9 +155,9 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
- setElement((EObject) null);
+ setElement((EObject)null);
return;
}
super.eUnset(featureID);
@@ -170,11 +171,10 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
return element != null;
}
return super.eIsSet(featureID);
}
-
} // EObjectAxisWrapperImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
index ced25b75b25..36626ea1aea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
* @generated
*/
public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrapper {
+
/**
* The default value of the '{@link #getElement() <em>Element</em>}' attribute.
* <!-- begin-user-doc -->
@@ -97,7 +98,7 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
public void setElement(String newElement) {
String oldElement = element;
element = newElement;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT, oldElement, element));
}
}
@@ -110,7 +111,7 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
return getElement();
}
@@ -125,9 +126,9 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
- setElement((String) newValue);
+ setElement((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -141,7 +142,7 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
setElement(ELEMENT_EDEFAULT);
return;
@@ -157,7 +158,7 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
}
@@ -172,15 +173,13 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (element: "); //$NON-NLS-1$
result.append(element);
result.append(')');
return result.toString();
}
-
} // IdAxisWrapperImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
index 1d01aefdd6e..0480f32b2ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
* @generated
*/
public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -40,8 +41,8 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
*/
public static NattablecellFactory init() {
try {
- NattablecellFactory theNattablecellFactory = (NattablecellFactory) EPackage.Registry.INSTANCE.getEFactory(NattablecellPackage.eNS_URI);
- if (theNattablecellFactory != null) {
+ NattablecellFactory theNattablecellFactory = (NattablecellFactory)EPackage.Registry.INSTANCE.getEFactory(NattablecellPackage.eNS_URI);
+ if(theNattablecellFactory != null) {
return theNattablecellFactory;
}
} catch (Exception exception) {
@@ -69,7 +70,7 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattablecellPackage.CELL:
return createCell();
case NattablecellPackage.EOBJECT_AXIS_WRAPPER:
@@ -125,7 +126,7 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
*/
@Override
public NattablecellPackage getNattablecellPackage() {
- return (NattablecellPackage) getEPackage();
+ return (NattablecellPackage)getEPackage();
}
/**
@@ -139,5 +140,4 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
public static NattablecellPackage getPackage() {
return NattablecellPackage.eINSTANCE;
}
-
} // NattablecellFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
index 577e20f0cab..5bfb4bf6ef1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -85,10 +86,12 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
private EClass idAxisWrapperEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI
@@ -111,8 +114,8 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattablecellPackage#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
- * -->
+ * This method is used to initialize {@link NattablecellPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -120,41 +123,24 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
* @generated
*/
public static NattablecellPackage init() {
- if (isInited) {
- return (NattablecellPackage) EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
+ if(isInited) {
+ return (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablecellPackageImpl());
-
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablecellPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattablecellPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -166,7 +152,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
theNattableaxisPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattablecellPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -178,11 +163,8 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
theNattableaxisPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattablecellPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattablecellPackage.eNS_URI, theNattablecellPackage);
return theNattablecellPackage;
@@ -207,7 +189,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public EReference getCell_ColumnWrapper() {
- return (EReference) cellEClass.getEStructuralFeatures().get(0);
+ return (EReference)cellEClass.getEStructuralFeatures().get(0);
}
/**
@@ -218,7 +200,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public EReference getCell_RowWrapper() {
- return (EReference) cellEClass.getEStructuralFeatures().get(1);
+ return (EReference)cellEClass.getEStructuralFeatures().get(1);
}
/**
@@ -229,7 +211,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public EReference getCell_Problems() {
- return (EReference) cellEClass.getEStructuralFeatures().get(2);
+ return (EReference)cellEClass.getEStructuralFeatures().get(2);
}
/**
@@ -273,7 +255,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public EReference getEObjectAxisWrapper_Element() {
- return (EReference) eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);
+ return (EReference)eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);
}
/**
@@ -295,7 +277,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public EAttribute getIdAxisWrapper_Element() {
- return (EAttribute) idAxisWrapperEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)idAxisWrapperEClass.getEStructuralFeatures().get(0);
}
/**
@@ -306,7 +288,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
*/
@Override
public NattablecellFactory getNattablecellFactory() {
- return (NattablecellFactory) getEFactoryInstance();
+ return (NattablecellFactory)getEFactoryInstance();
}
/**
@@ -326,23 +308,19 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
cellEClass = createEClass(CELL);
createEReference(cellEClass, CELL__COLUMN_WRAPPER);
createEReference(cellEClass, CELL__ROW_WRAPPER);
createEReference(cellEClass, CELL__PROBLEMS);
-
iCellAxisWrapperEClass = createEClass(ICELL_AXIS_WRAPPER);
createEOperation(iCellAxisWrapperEClass, ICELL_AXIS_WRAPPER___GET_ELEMENT);
-
eObjectAxisWrapperEClass = createEClass(EOBJECT_AXIS_WRAPPER);
createEReference(eObjectAxisWrapperEClass, EOBJECT_AXIS_WRAPPER__ELEMENT);
-
idAxisWrapperEClass = createEClass(ID_AXIS_WRAPPER);
createEAttribute(idAxisWrapperEClass, ID_AXIS_WRAPPER__ELEMENT);
}
@@ -364,46 +342,34 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
- NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage) EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
-
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
cellEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
iCellAxisWrapperEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
eObjectAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());
idAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());
-
// Initialize classes, features, and operations; add parameters
initEClass(cellEClass, Cell.class, "Cell", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getCell_ColumnWrapper(), this.getICellAxisWrapper(), null, "columnWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getCell_RowWrapper(), this.getICellAxisWrapper(), null, "rowWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getCell_Problems(), theNattableproblemPackage.getProblem(), null, "problems", null, 0, -1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(iCellAxisWrapperEClass, ICellAxisWrapper.class, "ICellAxisWrapper", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEOperation(getICellAxisWrapper__GetElement(), ecorePackage.getEJavaObject(), "getElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEClass(eObjectAxisWrapperEClass, EObjectAxisWrapper.class, "EObjectAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEObjectAxisWrapper_Element(), ecorePackage.getEObject(), null,
- "element", null, 1, 1, EObjectAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getEObjectAxisWrapper_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(idAxisWrapperEClass, IdAxisWrapper.class, "IdAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIdAxisWrapper_Element(), ecorePackage.getEString(), "element", null, 0, 1, IdAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
}
-
} // NattablecellPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
index fe696ce84d7..9d36c2d03b5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
* @generated
*/
public class NattablecellAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -50,7 +51,7 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattablecellAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablecellPackage.eINSTANCE;
}
}
@@ -66,11 +67,11 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -82,38 +83,38 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattablecellSwitch<Adapter> modelSwitch =
- new NattablecellSwitch<Adapter>() {
- @Override
- public Adapter caseCell(Cell object) {
- return createCellAdapter();
- }
-
- @Override
- public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {
- return createICellAxisWrapperAdapter();
- }
-
- @Override
- public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {
- return createEObjectAxisWrapperAdapter();
- }
-
- @Override
- public Adapter caseIdAxisWrapper(IdAxisWrapper object) {
- return createIdAxisWrapperAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattablecellSwitch<Adapter> modelSwitch = new NattablecellSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseCell(Cell object) {
+ return createCellAdapter();
+ }
+
+ @Override
+ public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {
+ return createICellAxisWrapperAdapter();
+ }
+
+ @Override
+ public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {
+ return createEObjectAxisWrapperAdapter();
+ }
+
+ @Override
+ public Adapter caseIdAxisWrapper(IdAxisWrapper object) {
+ return createIdAxisWrapperAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -121,16 +122,15 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.
* <!-- begin-user-doc -->
@@ -147,7 +147,8 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+ * <em>ICell Axis Wrapper</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.
@@ -162,7 +163,8 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper
+ * <em>EObject Axis Wrapper</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.
@@ -177,7 +179,8 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper
+ * <em>Id Axis Wrapper</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.
@@ -218,5 +221,4 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattablecellAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
index 5084cffa3b7..287a027d5f1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
* @generated
*/
public class NattablecellSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -53,7 +54,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* @generated
*/
public NattablecellSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablecellPackage.eINSTANCE;
}
}
@@ -82,53 +83,57 @@ public class NattablecellSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattablecellPackage.CELL: {
- Cell cell = (Cell) theEObject;
+ switch(classifierID) {
+ case NattablecellPackage.CELL:
+ {
+ Cell cell = (Cell)theEObject;
T result = caseCell(cell);
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(cell);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablecellPackage.ICELL_AXIS_WRAPPER: {
- ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper) theEObject;
+ case NattablecellPackage.ICELL_AXIS_WRAPPER:
+ {
+ ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper)theEObject;
T result = caseICellAxisWrapper(iCellAxisWrapper);
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iCellAxisWrapper);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablecellPackage.EOBJECT_AXIS_WRAPPER: {
- EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper) theEObject;
+ case NattablecellPackage.EOBJECT_AXIS_WRAPPER:
+ {
+ EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper)theEObject;
T result = caseEObjectAxisWrapper(eObjectAxisWrapper);
- if (result == null) {
+ if(result == null) {
result = caseICellAxisWrapper(eObjectAxisWrapper);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(eObjectAxisWrapper);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablecellPackage.ID_AXIS_WRAPPER: {
- IdAxisWrapper idAxisWrapper = (IdAxisWrapper) theEObject;
+ case NattablecellPackage.ID_AXIS_WRAPPER:
+ {
+ IdAxisWrapper idAxisWrapper = (IdAxisWrapper)theEObject;
T result = caseIdAxisWrapper(idAxisWrapper);
- if (result == null) {
+ if(result == null) {
result = caseICellAxisWrapper(idAxisWrapper);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(idAxisWrapper);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -146,7 +151,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Cell</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -163,7 +168,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -180,7 +185,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -197,7 +202,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -214,7 +219,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -231,7 +236,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -240,5 +245,4 @@ public class NattablecellSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattablecellSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
index eb7b75fd101..78f02ab50d2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
@@ -44,7 +44,6 @@ public enum CellEditorDeclaration implements Enumerator {
* @ordered
*/
COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>ROW</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -55,7 +54,6 @@ public enum CellEditorDeclaration implements Enumerator {
* @ordered
*/
ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>CELL</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -119,12 +117,7 @@ public enum CellEditorDeclaration implements Enumerator {
*
* @generated
*/
- private static final CellEditorDeclaration[] VALUES_ARRAY =
- new CellEditorDeclaration[] {
- COLUMN,
- ROW,
- CELL,
- };
+ private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[]{ COLUMN, ROW, CELL, };
/**
* A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
@@ -143,9 +136,9 @@ public enum CellEditorDeclaration implements Enumerator {
* @generated
*/
public static CellEditorDeclaration get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
CellEditorDeclaration result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
+ if(result.toString().equals(literal)) {
return result;
}
}
@@ -160,9 +153,9 @@ public enum CellEditorDeclaration implements Enumerator {
* @generated
*/
public static CellEditorDeclaration getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
CellEditorDeclaration result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
+ if(result.getName().equals(name)) {
return result;
}
}
@@ -177,7 +170,7 @@ public enum CellEditorDeclaration implements Enumerator {
* @generated
*/
public static CellEditorDeclaration get(int value) {
- switch (value) {
+ switch(value) {
case COLUMN_VALUE:
return COLUMN;
case ROW_VALUE:
@@ -269,5 +262,4 @@ public enum CellEditorDeclaration implements Enumerator {
public String toString() {
return literal;
}
-
} // CellEditorDeclaration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
index a6f772c5ac0..dd75a79c4d0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableconfigurationFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -52,5 +53,4 @@ public interface NattableconfigurationFactory extends EFactory {
* @generated
*/
NattableconfigurationPackage getNattableconfigurationPackage();
-
} // NattableconfigurationFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
index ea2a03ac9ac..1d30a436bbc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public interface NattableconfigurationPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -76,7 +77,8 @@ public interface NattableconfigurationPackage extends EPackage {
NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl
+ * <em>Table Named Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -187,7 +189,8 @@ public interface NattableconfigurationPackage extends EPackage {
int TABLE_NAMED_ELEMENT_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
+ * <em>Table Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -398,7 +401,8 @@ public interface NattableconfigurationPackage extends EPackage {
int TABLE_CONFIGURATION_OPERATION_COUNT = TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+ * <em>Cell Editor Declaration</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -408,9 +412,9 @@ public interface NattableconfigurationPackage extends EPackage {
*/
int CELL_EDITOR_DECLARATION = 2;
-
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+ * <em>Table Named Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -421,7 +425,8 @@ public interface NattableconfigurationPackage extends EPackage {
EClass getTableNamedElement();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -433,7 +438,8 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute getTableNamedElement_Description();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -445,7 +451,8 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute getTableNamedElement_Name();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
+ * <em>Table Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -456,7 +463,8 @@ public interface NattableconfigurationPackage extends EPackage {
EClass getTableConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -468,7 +476,8 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute getTableConfiguration_Type();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -480,7 +489,8 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute getTableConfiguration_IconPath();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -492,7 +502,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_CreationTester();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration
+ * <em>Cell Editor Declaration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -504,7 +516,9 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute getTableConfiguration_CellEditorDeclaration();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration
+ * <em>Row Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -516,7 +530,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_RowHeaderAxisConfiguration();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}'.
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration
+ * <em>Column Header Axis Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -528,7 +544,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_ColumnHeaderAxisConfiguration();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders
+ * <em>Column Axis Providers</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -540,7 +558,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_ColumnAxisProviders();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders
+ * <em>Row Axis Providers</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -552,7 +572,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_RowAxisProviders();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider
+ * <em>Default Row Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -564,7 +586,9 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_DefaultRowAxisProvider();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}'.
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider
+ * <em>Default Column Axis Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -576,7 +600,8 @@ public interface NattableconfigurationPackage extends EPackage {
EReference getTableConfiguration_DefaultColumnAxisProvider();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+ * <em>Cell Editor Declaration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -611,8 +636,10 @@ public interface NattableconfigurationPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl
+ * <em>Table Named Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -641,7 +668,9 @@ public interface NattableconfigurationPackage extends EPackage {
EAttribute TABLE_NAMED_ELEMENT__NAME = eINSTANCE.getTableNamedElement_Name();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -742,7 +771,8 @@ public interface NattableconfigurationPackage extends EPackage {
EReference TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultColumnAxisProvider();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+ * <em>Cell Editor Declaration</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -751,7 +781,5 @@ public interface NattableconfigurationPackage extends EPackage {
* @generated
*/
EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();
-
}
-
} // NattableconfigurationPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
index 909f84e7c62..b0f45f45639 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
@@ -35,23 +35,32 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Abstract
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor
+ * Declaration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header
+ * Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column
+ * Header Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis
+ * Providers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row
+ * Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default
+ * Column Axis Provider</em>}</li>
* </ul>
* </p>
*
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"
+ * @model annotation=
+ * "http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"
* annotation=
* "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders->includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders->includes(defaultColumnAxisProvider)' typeNonNullNonEmpty='not (type.oclIsUndefined() or type = \'\')' iconPath='not (iconPath.oclIsUndefined() or iconPath = \'\')' defaultAxisProvidersTypes='not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"
* @generated
*/
public interface TableConfiguration extends TableNamedElement {
+
/**
* Returns the value of the '<em><b>Type</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -70,12 +79,13 @@ public interface TableConfiguration extends TableNamedElement {
String getType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}
+ * ' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Type</em>' attribute.
+ * the new value of the '<em>Type</em>' attribute.
* @see #getType()
* @generated
*/
@@ -98,12 +108,13 @@ public interface TableConfiguration extends TableNamedElement {
String getIconPath();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath
+ * <em>Icon Path</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Icon Path</em>' attribute.
+ * the new value of the '<em>Icon Path</em>' attribute.
* @see #getIconPath()
* @generated
*/
@@ -127,12 +138,13 @@ public interface TableConfiguration extends TableNamedElement {
AbstractTableTester getCreationTester();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester
+ * <em>Creation Tester</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Creation Tester</em>' containment reference.
+ * the new value of the '<em>Creation Tester</em>' containment reference.
* @see #getCreationTester()
* @generated
*/
@@ -160,12 +172,14 @@ public interface TableConfiguration extends TableNamedElement {
CellEditorDeclaration getCellEditorDeclaration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration
+ * <em>Cell Editor Declaration</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Cell Editor Declaration</em>' attribute.
+ * the new value of the '<em>Cell Editor Declaration</em>' attribute.
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
* @see #getCellEditorDeclaration()
* @generated
@@ -189,12 +203,14 @@ public interface TableConfiguration extends TableNamedElement {
TableHeaderAxisConfiguration getRowHeaderAxisConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}' containment reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration
+ * <em>Row Header Axis Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Row Header Axis Configuration</em>' containment reference.
+ * the new value of the '<em>Row Header Axis Configuration</em>' containment reference.
* @see #getRowHeaderAxisConfiguration()
* @generated
*/
@@ -217,12 +233,14 @@ public interface TableConfiguration extends TableNamedElement {
TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}' containment reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration
+ * <em>Column Header Axis Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Column Header Axis Configuration</em>' containment reference.
+ * the new value of the '<em>Column Header Axis Configuration</em>' containment reference.
* @see #getColumnHeaderAxisConfiguration()
* @generated
*/
@@ -277,12 +295,14 @@ public interface TableConfiguration extends TableNamedElement {
AbstractAxisProvider getDefaultRowAxisProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider
+ * <em>Default Row Axis Provider</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Default Row Axis Provider</em>' reference.
+ * the new value of the '<em>Default Row Axis Provider</em>' reference.
* @see #getDefaultRowAxisProvider()
* @generated
*/
@@ -305,15 +325,16 @@ public interface TableConfiguration extends TableNamedElement {
AbstractAxisProvider getDefaultColumnAxisProvider();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}' reference.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider
+ * <em>Default Column Axis Provider</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Default Column Axis Provider</em>' reference.
+ * the new value of the '<em>Default Column Axis Provider</em>' reference.
* @see #getDefaultColumnAxisProvider()
* @generated
*/
void setDefaultColumnAxisProvider(AbstractAxisProvider value);
-
} // TableConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
index fa483511888..ac0af0e694c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public interface TableNamedElement extends StyledElement {
+
/**
* Returns the value of the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -55,12 +56,13 @@ public interface TableNamedElement extends StyledElement {
String getDescription();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription
+ * <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Description</em>' attribute.
+ * the new value of the '<em>Description</em>' attribute.
* @see #getDescription()
* @generated
*/
@@ -83,15 +85,15 @@ public interface TableNamedElement extends StyledElement {
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Name</em>' attribute.
+ * the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setName(String value);
-
} // TableNamedElement
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
index 451b21b33fd..29c24aff285 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* @generated
*/
public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -40,8 +41,8 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
public static NattableconfigurationFactory init() {
try {
- NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);
- if (theNattableconfigurationFactory != null) {
+ NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);
+ if(theNattableconfigurationFactory != null) {
return theNattableconfigurationFactory;
}
} catch (Exception exception) {
@@ -69,7 +70,7 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattableconfigurationPackage.TABLE_CONFIGURATION:
return createTableConfiguration();
default:
@@ -85,7 +86,7 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
return createCellEditorDeclarationFromString(eDataType, initialValue);
default:
@@ -101,7 +102,7 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
return convertCellEditorDeclarationToString(eDataType, instanceValue);
default:
@@ -129,8 +130,7 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {
CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);
- if (result == null)
- {
+ if(result == null) {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return result;
@@ -154,7 +154,7 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public NattableconfigurationPackage getNattableconfigurationPackage() {
- return (NattableconfigurationPackage) getEPackage();
+ return (NattableconfigurationPackage)getEPackage();
}
/**
@@ -168,5 +168,4 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
public static NattableconfigurationPackage getPackage() {
return NattableconfigurationPackage.eINSTANCE;
}
-
} // NattableconfigurationFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
index ec93a8fa3a1..cdf0d3966a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
@@ -53,6 +53,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -78,10 +79,12 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
private EEnum cellEditorDeclarationEEnum = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI
@@ -104,8 +107,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattableconfigurationPackage#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 -->
+ * This method is used to initialize {@link NattableconfigurationPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -113,41 +116,24 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
* @generated
*/
public static NattableconfigurationPackage init() {
- if (isInited) {
- return (NattableconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+ if(isInited) {
+ return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new NattableconfigurationPackageImpl());
-
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattableconfigurationPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -159,7 +145,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattableconfigurationPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -171,21 +156,16 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theNattableconfigurationPackage,
- new EValidator.Descriptor() {
- @Override
- public EValidator getEValidator() {
- return NattableconfigurationValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theNattableconfigurationPackage, new EValidator.Descriptor() {
+ @Override
+ public EValidator getEValidator() {
+ return NattableconfigurationValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theNattableconfigurationPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);
return theNattableconfigurationPackage;
@@ -210,7 +190,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getTableNamedElement_Description() {
- return (EAttribute) tableNamedElementEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);
}
/**
@@ -221,7 +201,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getTableNamedElement_Name() {
- return (EAttribute) tableNamedElementEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);
}
/**
@@ -243,7 +223,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getTableConfiguration_Type() {
- return (EAttribute) tableConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -254,7 +234,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getTableConfiguration_IconPath() {
- return (EAttribute) tableConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -265,7 +245,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_CreationTester() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -276,7 +256,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getTableConfiguration_CellEditorDeclaration() {
- return (EAttribute) tableConfigurationEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -287,7 +267,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_RowHeaderAxisConfiguration() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(4);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);
}
/**
@@ -298,7 +278,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(5);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);
}
/**
@@ -309,7 +289,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_ColumnAxisProviders() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(6);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);
}
/**
@@ -320,7 +300,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_RowAxisProviders() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(7);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);
}
/**
@@ -331,7 +311,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_DefaultRowAxisProvider() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(8);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);
}
/**
@@ -342,7 +322,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public EReference getTableConfiguration_DefaultColumnAxisProvider() {
- return (EReference) tableConfigurationEClass.getEStructuralFeatures().get(9);
+ return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);
}
/**
@@ -364,7 +344,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
@Override
public NattableconfigurationFactory getNattableconfigurationFactory() {
- return (NattableconfigurationFactory) getEFactoryInstance();
+ return (NattableconfigurationFactory)getEFactoryInstance();
}
/**
@@ -384,16 +364,14 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
tableNamedElementEClass = createEClass(TABLE_NAMED_ELEMENT);
createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__DESCRIPTION);
createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__NAME);
-
tableConfigurationEClass = createEClass(TABLE_CONFIGURATION);
createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__TYPE);
createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__ICON_PATH);
@@ -405,7 +383,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);
createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);
-
// Create enums
cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);
}
@@ -427,61 +404,44 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
- NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage) EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
- NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
- NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
-
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+ NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+ NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+ NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
tableNamedElementEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
tableConfigurationEClass.getESuperTypes().add(this.getTableNamedElement());
-
// Initialize classes, features, and operations; add parameters
initEClass(tableNamedElementEClass, TableNamedElement.class, "TableNamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getTableNamedElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getTableNamedElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(tableConfigurationEClass, TableConfiguration.class, "TableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getTableConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getTableConfiguration_IconPath(), ecorePackage.getEString(), "iconPath", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null,
- "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(),
- "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null,
- "rowHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null,
- "columnHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "columnAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_RowAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "rowAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_DefaultRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "defaultRowAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTableConfiguration_DefaultColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null,
- "defaultColumnAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(), "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "rowHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTableConfiguration_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "columnHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTableConfiguration_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTableConfiguration_RowAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTableConfiguration_DefaultRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultRowAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTableConfiguration_DefaultColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultColumnAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
// Initialize enums and add enum literals
initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$
addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);
addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);
addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);
-
// Create annotations
// http://www.eclipse.org/emf/2002/Ecore
createEcoreAnnotations();
@@ -498,20 +458,14 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
protected void createEcoreAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
- addAnnotation(this,
- source,
- new String[] { "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
- "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableNamedElementEClass,
- source,
- new String[] { "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableConfigurationEClass,
- source,
- new String[] { "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableNamedElementEClass, source, new String[]{ "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableConfigurationEClass, source, new String[]{ "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
/**
@@ -523,18 +477,13 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
*/
protected void createPivotAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$
- addAnnotation(tableNamedElementEClass,
- source,
- new String[] { "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(tableConfigurationEClass,
- source,
- new String[] { "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
- "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
- "typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
- "iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
- "defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ addAnnotation(tableNamedElementEClass, source, new String[]{ "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(tableConfigurationEClass, source, new String[]{ "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+ "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+ "typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
+ "iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
+ "defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
+ });
}
-
} // NattableconfigurationPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
index 5eeba3fbb52..6f512c5c23e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
@@ -38,20 +38,29 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Abstract
* <ul>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getIconPath <em>Icon Path</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCreationTester <em>Creation Tester</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column Axis Providers</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis Providers</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCreationTester <em>Creation
+ * Tester</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell
+ * Editor Declaration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>
+ * Row Header Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration
+ * <em>Column Header Axis Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column
+ * Axis Providers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis
+ * Providers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>
+ * Default Row Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>
+ * Default Column Axis Provider</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class TableConfigurationImpl extends TableNamedElementImpl implements TableConfiguration {
+
/**
* The default value of the '{@link #getType() <em>Type</em>}' attribute.
* <!-- begin-user-doc -->
@@ -237,7 +246,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public void setType(String newType) {
String oldType = type;
type = newType;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));
}
}
@@ -263,7 +272,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public void setIconPath(String newIconPath) {
String oldIconPath = iconPath;
iconPath = newIconPath;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));
}
}
@@ -288,9 +297,9 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {
AbstractTableTester oldCreationTester = creationTester;
creationTester = newCreationTester;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -307,20 +316,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public void setCreationTester(AbstractTableTester newCreationTester) {
- if (newCreationTester != creationTester) {
+ if(newCreationTester != creationTester) {
NotificationChain msgs = null;
- if (creationTester != null) {
- msgs = ((InternalEObject) creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+ if(creationTester != null) {
+ msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
}
- if (newCreationTester != null) {
- msgs = ((InternalEObject) newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+ if(newCreationTester != null) {
+ msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
}
msgs = basicSetCreationTester(newCreationTester, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));
}
}
@@ -346,7 +354,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public void setCellEditorDeclaration(CellEditorDeclaration newCellEditorDeclaration) {
CellEditorDeclaration oldCellEditorDeclaration = cellEditorDeclaration;
cellEditorDeclaration = newCellEditorDeclaration == null ? CELL_EDITOR_DECLARATION_EDEFAULT : newCellEditorDeclaration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));
}
}
@@ -371,9 +379,9 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {
TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;
rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, oldRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -390,20 +398,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {
- if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {
+ if(newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {
NotificationChain msgs = null;
- if (rowHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(rowHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
}
- if (newRowHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) newRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(newRowHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)newRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
}
msgs = basicSetRowHeaderAxisConfiguration(newRowHeaderAxisConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, newRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration));
}
}
@@ -428,9 +435,9 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {
TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;
columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, oldColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration);
- if (msgs == null) {
+ if(msgs == null) {
msgs = notification;
} else {
msgs.add(notification);
@@ -447,20 +454,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {
- if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {
+ if(newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {
NotificationChain msgs = null;
- if (columnHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(columnHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
}
- if (newColumnHeaderAxisConfiguration != null) {
- msgs = ((InternalEObject) newColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+ if(newColumnHeaderAxisConfiguration != null) {
+ msgs = ((InternalEObject)newColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
}
msgs = basicSetColumnHeaderAxisConfiguration(newColumnHeaderAxisConfiguration, msgs);
- if (msgs != null) {
+ if(msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, newColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration));
}
}
@@ -473,7 +479,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public EList<AbstractAxisProvider> getColumnAxisProviders() {
- if (columnAxisProviders == null) {
+ if(columnAxisProviders == null) {
columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
}
return columnAxisProviders;
@@ -487,7 +493,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public EList<AbstractAxisProvider> getRowAxisProviders() {
- if (rowAxisProviders == null) {
+ if(rowAxisProviders == null) {
rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
}
return rowAxisProviders;
@@ -501,11 +507,11 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public AbstractAxisProvider getDefaultRowAxisProvider() {
- if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {
- InternalEObject oldDefaultRowAxisProvider = (InternalEObject) defaultRowAxisProvider;
- defaultRowAxisProvider = (AbstractAxisProvider) eResolveProxy(oldDefaultRowAxisProvider);
- if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {
- if (eNotificationRequired()) {
+ if(defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {
+ InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;
+ defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);
+ if(defaultRowAxisProvider != oldDefaultRowAxisProvider) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));
}
}
@@ -533,7 +539,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {
AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;
defaultRowAxisProvider = newDefaultRowAxisProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));
}
}
@@ -546,11 +552,11 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public AbstractAxisProvider getDefaultColumnAxisProvider() {
- if (defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {
- InternalEObject oldDefaultColumnAxisProvider = (InternalEObject) defaultColumnAxisProvider;
- defaultColumnAxisProvider = (AbstractAxisProvider) eResolveProxy(oldDefaultColumnAxisProvider);
- if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {
- if (eNotificationRequired()) {
+ if(defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {
+ InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;
+ defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);
+ if(defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
}
}
@@ -578,7 +584,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {
AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;
defaultColumnAxisProvider = newDefaultColumnAxisProvider;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
}
}
@@ -591,7 +597,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
return basicSetCreationTester(null, msgs);
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
@@ -599,9 +605,9 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
return basicSetColumnHeaderAxisConfiguration(null, msgs);
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
- return ((InternalEList<?>) getColumnAxisProviders()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getColumnAxisProviders()).basicRemove(otherEnd, msgs);
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
- return ((InternalEList<?>) getRowAxisProviders()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getRowAxisProviders()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -614,7 +620,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
return getType();
case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
@@ -632,12 +638,12 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
return getRowAxisProviders();
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
- if (resolve) {
+ if(resolve) {
return getDefaultRowAxisProvider();
}
return basicGetDefaultRowAxisProvider();
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
- if (resolve) {
+ if(resolve) {
return getDefaultColumnAxisProvider();
}
return basicGetDefaultColumnAxisProvider();
@@ -654,38 +660,38 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
- setType((String) newValue);
+ setType((String)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
- setIconPath((String) newValue);
+ setIconPath((String)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
- setCreationTester((AbstractTableTester) newValue);
+ setCreationTester((AbstractTableTester)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
- setCellEditorDeclaration((CellEditorDeclaration) newValue);
+ setCellEditorDeclaration((CellEditorDeclaration)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
- setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration) newValue);
+ setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
- setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration) newValue);
+ setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
getColumnAxisProviders().clear();
- getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>) newValue);
+ getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
getRowAxisProviders().clear();
- getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>) newValue);
+ getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
- setDefaultRowAxisProvider((AbstractAxisProvider) newValue);
+ setDefaultRowAxisProvider((AbstractAxisProvider)newValue);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
- setDefaultColumnAxisProvider((AbstractAxisProvider) newValue);
+ setDefaultColumnAxisProvider((AbstractAxisProvider)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -699,7 +705,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
setType(TYPE_EDEFAULT);
return;
@@ -707,16 +713,16 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
setIconPath(ICON_PATH_EDEFAULT);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
- setCreationTester((AbstractTableTester) null);
+ setCreationTester((AbstractTableTester)null);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
setCellEditorDeclaration(CELL_EDITOR_DECLARATION_EDEFAULT);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
- setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration) null);
+ setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
- setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration) null);
+ setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
getColumnAxisProviders().clear();
@@ -725,10 +731,10 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
getRowAxisProviders().clear();
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
- setDefaultRowAxisProvider((AbstractAxisProvider) null);
+ setDefaultRowAxisProvider((AbstractAxisProvider)null);
return;
case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
- setDefaultColumnAxisProvider((AbstractAxisProvider) null);
+ setDefaultColumnAxisProvider((AbstractAxisProvider)null);
return;
}
super.eUnset(featureID);
@@ -742,7 +748,7 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
@@ -775,10 +781,9 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (type: "); //$NON-NLS-1$
result.append(type);
@@ -789,5 +794,4 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
result.append(')');
return result.toString();
}
-
} // TableConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
index 78cf288db40..3573092e9ed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* @generated
*/
public abstract class TableNamedElementImpl extends StyledElementImpl implements TableNamedElement {
+
/**
* The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
@@ -120,7 +121,7 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
public void setDescription(String newDescription) {
String oldDescription = description;
description = newDescription;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));
}
}
@@ -146,7 +147,7 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
public void setName(String newName) {
String oldName = name;
name = newName;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME, oldName, name));
}
}
@@ -159,7 +160,7 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
return getDescription();
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
@@ -176,12 +177,12 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
- setDescription((String) newValue);
+ setDescription((String)newValue);
return;
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
- setName((String) newValue);
+ setName((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -195,7 +196,7 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
setDescription(DESCRIPTION_EDEFAULT);
return;
@@ -214,7 +215,7 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
@@ -231,10 +232,9 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (description: "); //$NON-NLS-1$
result.append(description);
@@ -243,5 +243,4 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
result.append(')');
return result.toString();
}
-
} // TableNamedElementImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
index b37c9e78db9..3a245ffd42b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -49,7 +50,7 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattableconfigurationAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableconfigurationPackage.eINSTANCE;
}
}
@@ -65,11 +66,11 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -81,33 +82,33 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattableconfigurationSwitch<Adapter> modelSwitch =
- new NattableconfigurationSwitch<Adapter>() {
- @Override
- public Adapter caseTableNamedElement(TableNamedElement object) {
- return createTableNamedElementAdapter();
- }
-
- @Override
- public Adapter caseTableConfiguration(TableConfiguration object) {
- return createTableConfigurationAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseTableNamedElement(TableNamedElement object) {
+ return createTableNamedElementAdapter();
+ }
+
+ @Override
+ public Adapter caseTableConfiguration(TableConfiguration object) {
+ return createTableConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -115,18 +116,18 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+ * <em>Table Named Element</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.
@@ -141,7 +142,8 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table 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.
@@ -171,7 +173,8 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -197,5 +200,4 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableconfigurationAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
index ae4ec189af0..b881afeb993 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableconfigurationSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -52,7 +53,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* @generated
*/
public NattableconfigurationSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableconfigurationPackage.eINSTANCE;
}
}
@@ -81,34 +82,36 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattableconfigurationPackage.TABLE_NAMED_ELEMENT: {
- TableNamedElement tableNamedElement = (TableNamedElement) theEObject;
+ switch(classifierID) {
+ case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:
+ {
+ TableNamedElement tableNamedElement = (TableNamedElement)theEObject;
T result = caseTableNamedElement(tableNamedElement);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(tableNamedElement);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(tableNamedElement);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableconfigurationPackage.TABLE_CONFIGURATION: {
- TableConfiguration tableConfiguration = (TableConfiguration) theEObject;
+ case NattableconfigurationPackage.TABLE_CONFIGURATION:
+ {
+ TableConfiguration tableConfiguration = (TableConfiguration)theEObject;
T result = caseTableConfiguration(tableConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(tableConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(tableConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(tableConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -126,7 +129,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -143,7 +146,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -160,7 +163,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -177,7 +180,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -194,7 +197,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -203,5 +206,4 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableconfigurationSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
index ffb3e782c7c..62f04725f78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* @generated
*/
public class NattableconfigurationValidator extends EObjectValidator {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -43,7 +44,8 @@ public class NattableconfigurationValidator extends EObjectValidator {
public static final NattableconfigurationValidator INSTANCE = new NattableconfigurationValidator();
/**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+ * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+ * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -103,13 +105,13 @@ public class NattableconfigurationValidator extends EObjectValidator {
*/
@Override
protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
- switch (classifierID) {
+ switch(classifierID) {
case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:
- return validateTableNamedElement((TableNamedElement) value, diagnostics, context);
+ return validateTableNamedElement((TableNamedElement)value, diagnostics, context);
case NattableconfigurationPackage.TABLE_CONFIGURATION:
- return validateTableConfiguration((TableConfiguration) value, diagnostics, context);
+ return validateTableConfiguration((TableConfiguration)value, diagnostics, context);
case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
- return validateCellEditorDeclaration((CellEditorDeclaration) value, diagnostics, context);
+ return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);
default:
return true;
}
@@ -122,32 +124,32 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableNamedElement(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) {
+ if(!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(tableNamedElement, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(tableNamedElement, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableNamedElement_nonEmptyName(tableNamedElement, diagnostics, context);
}
return result;
@@ -170,15 +172,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableNamedElement_nonEmptyName(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT,
- tableNamedElement,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "nonEmptyName", //$NON-NLS-1$
- TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT, tableNamedElement, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "nonEmptyName", //$NON-NLS-1$
+ TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -188,47 +184,47 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) {
+ if(!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(tableConfiguration, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableNamedElement_nonEmptyName(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableConfiguration_defaultAxisProvidersTypes(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableConfiguration_typeNonNullNonEmpty(tableConfiguration, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTableConfiguration_iconPath(tableConfiguration, diagnostics, context);
}
return result;
@@ -251,15 +247,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration_defaultRowAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
- tableConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$
- TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$
+ TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -279,15 +269,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
- tableConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$
- TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$
+ TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -307,15 +291,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration_defaultAxisProvidersTypes(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
- tableConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "defaultAxisProvidersTypes", //$NON-NLS-1$
- TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "defaultAxisProvidersTypes", //$NON-NLS-1$
+ TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -335,15 +313,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration_typeNonNullNonEmpty(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
- tableConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "typeNonNullNonEmpty", //$NON-NLS-1$
- TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "typeNonNullNonEmpty", //$NON-NLS-1$
+ TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -363,15 +335,9 @@ public class NattableconfigurationValidator extends EObjectValidator {
* @generated
*/
public boolean validateTableConfiguration_iconPath(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
- tableConfiguration,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "iconPath", //$NON-NLS-1$
- TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "iconPath", //$NON-NLS-1$
+ TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -398,5 +364,4 @@ public class NattableconfigurationValidator extends EObjectValidator {
// Ensure that you remove @generated or mark it @generated NOT
return super.getResourceLocator();
}
-
} // NattableconfigurationValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
index 3a5e2e41eef..00774330e21 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
@@ -33,10 +32,14 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display
+ * Is Derived</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>
+ * Display Multiplicity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name
+ * </em>}</li>
* </ul>
* </p>
*
@@ -45,6 +48,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
* @generated
*/
public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {
+
/**
* Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.
* The default value is <code>"true"</code>.
@@ -63,12 +67,14 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
boolean isDisplayIsDerived();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived
+ * <em>Display Is Derived</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Is Derived</em>' attribute.
+ * the new value of the '<em>Display Is Derived</em>' attribute.
* @see #isDisplayIsDerived()
* @generated
*/
@@ -92,12 +98,14 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
boolean isDisplayType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType
+ * <em>Display Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Type</em>' attribute.
+ * the new value of the '<em>Display Type</em>' attribute.
* @see #isDisplayType()
* @generated
*/
@@ -121,12 +129,14 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
boolean isDisplayMultiplicity();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity
+ * <em>Display Multiplicity</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Multiplicity</em>' attribute.
+ * the new value of the '<em>Display Multiplicity</em>' attribute.
* @see #isDisplayMultiplicity()
* @generated
*/
@@ -150,15 +160,16 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
boolean isDisplayName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName
+ * <em>Display Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Name</em>' attribute.
+ * the new value of the '<em>Display Name</em>' attribute.
* @see #isDisplayName()
* @generated
*/
void setDisplayName(boolean value);
-
} // FeatureLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
index 9af4e7b5aaa..488328fe3f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattablelabelproviderFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -62,5 +63,4 @@ public interface NattablelabelproviderFactory extends EFactory {
* @generated
*/
NattablelabelproviderPackage getNattablelabelproviderPackage();
-
} // NattablelabelproviderFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
index b24a44c3508..3428adc55e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public interface NattablelabelproviderPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -72,7 +73,8 @@ public interface NattablelabelproviderPackage extends EPackage {
NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+ * <em>ILabel Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -163,7 +165,9 @@ public interface NattablelabelproviderPackage extends EPackage {
int ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+ * <em>Object Label Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -274,7 +278,9 @@ public interface NattablelabelproviderPackage extends EPackage {
int OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
+ * The meta object id for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+ * <em>Feature Label Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -424,9 +430,9 @@ public interface NattablelabelproviderPackage extends EPackage {
*/
int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
-
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+ * <em>ILabel Provider Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -437,7 +443,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EClass getILabelProviderConfiguration();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+ * <em>Feature Label Provider Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -448,7 +456,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EClass getFeatureLabelProviderConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived
+ * <em>Display Is Derived</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -460,7 +470,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType
+ * <em>Display Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -472,7 +484,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute getFeatureLabelProviderConfiguration_DisplayType();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity
+ * <em>Display Multiplicity</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -484,7 +498,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName
+ * <em>Display Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -496,7 +512,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute getFeatureLabelProviderConfiguration_DisplayName();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+ * Returns the meta object for class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+ * <em>Object Label Provider Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -507,7 +525,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EClass getObjectLabelProviderConfiguration();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon
+ * <em>Display Icon</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -519,7 +539,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute getObjectLabelProviderConfiguration_DisplayIcon();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel
+ * <em>Display Label</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -555,8 +577,11 @@ public interface NattablelabelproviderPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+ * <em>ILabel Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -567,7 +592,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EClass ILABEL_PROVIDER_CONFIGURATION = eINSTANCE.getILabelProviderConfiguration();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+ * <em>Feature Label Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -614,7 +641,9 @@ public interface NattablelabelproviderPackage extends EPackage {
EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
+ * The meta object literal for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+ * <em>Object Label Provider Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -641,7 +670,5 @@ public interface NattablelabelproviderPackage extends EPackage {
* @generated
*/
EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
-
}
-
} // NattablelabelproviderPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
index 536420d416d..e7d96b17b3e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
@@ -29,8 +28,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display
+ * Label</em>}</li>
* </ul>
* </p>
*
@@ -39,6 +40,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
* @generated
*/
public interface ObjectLabelProviderConfiguration extends ILabelProviderConfiguration {
+
/**
* Returns the value of the '<em><b>Display Icon</b></em>' attribute.
* The default value is <code>"true"</code>.
@@ -57,12 +59,14 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
boolean isDisplayIcon();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon
+ * <em>Display Icon</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Icon</em>' attribute.
+ * the new value of the '<em>Display Icon</em>' attribute.
* @see #isDisplayIcon()
* @generated
*/
@@ -86,15 +90,16 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
boolean isDisplayLabel();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
+ * Sets the value of the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel
+ * <em>Display Label</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Label</em>' attribute.
+ * the new value of the '<em>Display Label</em>' attribute.
* @see #isDisplayLabel()
* @generated
*/
void setDisplayLabel(boolean value);
-
} // ObjectLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
index 41c2a2c499f..8b409e02873 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
@@ -25,16 +25,22 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived <em>Display Is Derived</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived
+ * <em>Display Is Derived</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>
+ * Display Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity
+ * <em>Display Multiplicity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>
+ * Display Name</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {
+
/**
* The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
* <!-- begin-user-doc -->
@@ -165,7 +171,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
public void setDisplayIsDerived(boolean newDisplayIsDerived) {
boolean oldDisplayIsDerived = displayIsDerived;
displayIsDerived = newDisplayIsDerived;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));
}
}
@@ -191,7 +197,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
public void setDisplayType(boolean newDisplayType) {
boolean oldDisplayType = displayType;
displayType = newDisplayType;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));
}
}
@@ -217,7 +223,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {
boolean oldDisplayMultiplicity = displayMultiplicity;
displayMultiplicity = newDisplayMultiplicity;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));
}
}
@@ -243,7 +249,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
public void setDisplayName(boolean newDisplayName) {
boolean oldDisplayName = displayName;
displayName = newDisplayName;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));
}
}
@@ -256,7 +262,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
return isDisplayIsDerived();
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
@@ -277,18 +283,18 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
- setDisplayIsDerived((Boolean) newValue);
+ setDisplayIsDerived((Boolean)newValue);
return;
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
- setDisplayType((Boolean) newValue);
+ setDisplayType((Boolean)newValue);
return;
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
- setDisplayMultiplicity((Boolean) newValue);
+ setDisplayMultiplicity((Boolean)newValue);
return;
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
- setDisplayName((Boolean) newValue);
+ setDisplayName((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -302,7 +308,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);
return;
@@ -327,7 +333,7 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
@@ -348,10 +354,9 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (displayIsDerived: "); //$NON-NLS-1$
result.append(displayIsDerived);
@@ -364,5 +369,4 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
result.append(')');
return result.toString();
}
-
} // FeatureLabelProviderConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
index 536812d3402..615a5b4fc46 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
* @generated
*/
public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -39,8 +40,8 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
*/
public static NattablelabelproviderFactory init() {
try {
- NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory) EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);
- if (theNattablelabelproviderFactory != null) {
+ NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);
+ if(theNattablelabelproviderFactory != null) {
return theNattablelabelproviderFactory;
}
} catch (Exception exception) {
@@ -68,7 +69,7 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION:
return createFeatureLabelProviderConfiguration();
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION:
@@ -110,7 +111,7 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
*/
@Override
public NattablelabelproviderPackage getNattablelabelproviderPackage() {
- return (NattablelabelproviderPackage) getEPackage();
+ return (NattablelabelproviderPackage)getEPackage();
}
/**
@@ -124,5 +125,4 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
public static NattablelabelproviderPackage getPackage() {
return NattablelabelproviderPackage.eINSTANCE;
}
-
} // NattablelabelproviderFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
index fe3765347a0..a787a84cdc8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -74,10 +75,12 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
private EClass objectLabelProviderConfigurationEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI
@@ -100,8 +103,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattablelabelproviderPackage#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 -->
+ * This method is used to initialize {@link NattablelabelproviderPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -109,41 +112,24 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
* @generated
*/
public static NattablelabelproviderPackage init() {
- if (isInited) {
- return (NattablelabelproviderPackage) EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+ if(isInited) {
+ return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new NattablelabelproviderPackageImpl());
-
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattablelabelproviderPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -155,7 +141,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattablelabelproviderPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -167,11 +152,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattablelabelproviderPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);
return theNattablelabelproviderPackage;
@@ -207,7 +189,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {
- return (EAttribute) featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -218,7 +200,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {
- return (EAttribute) featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -229,7 +211,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {
- return (EAttribute) featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -240,7 +222,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {
- return (EAttribute) featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -262,7 +244,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {
- return (EAttribute) objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -273,7 +255,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {
- return (EAttribute) objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -284,7 +266,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
*/
@Override
public NattablelabelproviderFactory getNattablelabelproviderFactory() {
- return (NattablelabelproviderFactory) getEFactoryInstance();
+ return (NattablelabelproviderFactory)getEFactoryInstance();
}
/**
@@ -304,20 +286,17 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
iLabelProviderConfigurationEClass = createEClass(ILABEL_PROVIDER_CONFIGURATION);
-
featureLabelProviderConfigurationEClass = createEClass(FEATURE_LABEL_PROVIDER_CONFIGURATION);
createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED);
createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);
createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);
createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);
-
objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);
createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);
createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);
@@ -340,46 +319,31 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
-
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
iLabelProviderConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());
objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelProviderConfiguration());
-
// Initialize classes, features, and operations; add parameters
initEClass(iLabelProviderConfigurationEClass, ILabelProviderConfiguration.class, "ILabelProviderConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(featureLabelProviderConfigurationEClass, FeatureLabelProviderConfiguration.class, "FeatureLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), ecorePackage.getEBoolean(),
- "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(),
- "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(),
- "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(),
- "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
+ initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), ecorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.getEBoolean(),
- "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), ecorePackage.getEBoolean(),
- "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), ecorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
}
-
} // NattablelabelproviderPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
index 7ed1d221ab0..fb361c96b5b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
@@ -26,14 +26,17 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayIcon <em>Display Icon</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayIcon <em>
+ * Display Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayLabel <em>
+ * Display Label</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl implements ObjectLabelProviderConfiguration {
+
/**
* The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
* <!-- begin-user-doc -->
@@ -120,7 +123,7 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
public void setDisplayIcon(boolean newDisplayIcon) {
boolean oldDisplayIcon = displayIcon;
displayIcon = newDisplayIcon;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));
}
}
@@ -146,7 +149,7 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
public void setDisplayLabel(boolean newDisplayLabel) {
boolean oldDisplayLabel = displayLabel;
displayLabel = newDisplayLabel;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
}
}
@@ -159,7 +162,7 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
return isDisplayIcon();
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
@@ -176,12 +179,12 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
- setDisplayIcon((Boolean) newValue);
+ setDisplayIcon((Boolean)newValue);
return;
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
- setDisplayLabel((Boolean) newValue);
+ setDisplayLabel((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -195,7 +198,7 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
setDisplayIcon(DISPLAY_ICON_EDEFAULT);
return;
@@ -214,7 +217,7 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
return displayIcon != DISPLAY_ICON_EDEFAULT;
case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
@@ -231,10 +234,9 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (displayIcon: "); //$NON-NLS-1$
result.append(displayIcon);
@@ -243,5 +245,4 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
result.append(')');
return result.toString();
}
-
} // ObjectLabelProviderConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
index 01ce4aefe5d..b7ce343d4ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -50,7 +51,7 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattablelabelproviderAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablelabelproviderPackage.eINSTANCE;
}
}
@@ -66,11 +67,11 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -82,38 +83,38 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattablelabelproviderSwitch<Adapter> modelSwitch =
- new NattablelabelproviderSwitch<Adapter>() {
- @Override
- public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {
- return createILabelProviderConfigurationAdapter();
- }
-
- @Override
- public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
- return createFeatureLabelProviderConfigurationAdapter();
- }
-
- @Override
- public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
- return createObjectLabelProviderConfigurationAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {
+ return createILabelProviderConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
+ return createFeatureLabelProviderConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
+ return createObjectLabelProviderConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -121,18 +122,19 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+ * <em>ILabel Provider 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.
@@ -147,7 +149,9 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+ * <em>Feature Label Provider 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.
@@ -162,7 +166,9 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+ * <em>Object Label Provider 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.
@@ -192,7 +198,8 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -218,5 +225,4 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattablelabelproviderAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
index 00e569f6466..3d1fb528c48 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattablelabelproviderSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -53,7 +54,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* @generated
*/
public NattablelabelproviderSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablelabelproviderPackage.eINSTANCE;
}
}
@@ -82,54 +83,57 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION: {
- ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration) theEObject;
+ switch(classifierID) {
+ case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION:
+ {
+ ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration)theEObject;
T result = caseILabelProviderConfiguration(iLabelProviderConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(iLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(iLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {
- FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration) theEObject;
+ case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION:
+ {
+ FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;
T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseILabelProviderConfiguration(featureLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(featureLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(featureLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {
- ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration) theEObject;
+ case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION:
+ {
+ ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;
T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);
- if (result == null) {
+ if(result == null) {
result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(objectLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(objectLabelProviderConfiguration);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -147,7 +151,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -164,7 +168,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -181,7 +185,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -198,7 +202,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -215,7 +219,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -232,7 +236,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -241,5 +245,4 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattablelabelproviderSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
index 9b1478a8978..43156080998 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattableproblemFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -62,5 +63,4 @@ public interface NattableproblemFactory extends EFactory {
* @generated
*/
NattableproblemPackage getNattableproblemPackage();
-
} // NattableproblemFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
index fd0f68419b2..0cc9e3efef3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
* @generated
*/
public interface NattableproblemPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -183,7 +184,8 @@ public interface NattableproblemPackage extends EPackage {
int PROBLEM_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl
+ * <em>String Resolution Problem</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -313,7 +315,6 @@ public interface NattableproblemPackage extends EPackage {
*/
int STRING_RESOLUTION_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;
-
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.
* <!-- begin-user-doc -->
@@ -326,7 +327,8 @@ public interface NattableproblemPackage extends EPackage {
EClass getProblem();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem
+ * <em>String Resolution Problem</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -337,7 +339,8 @@ public interface NattableproblemPackage extends EPackage {
EClass getStringResolutionProblem();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -349,7 +352,9 @@ public interface NattableproblemPackage extends EPackage {
EAttribute getStringResolutionProblem_ValueAsString();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString
+ * <em>Unresolved String</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -385,8 +390,10 @@ public interface NattableproblemPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl
+ * <em>Problem</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -397,7 +404,8 @@ public interface NattableproblemPackage extends EPackage {
EClass PROBLEM = eINSTANCE.getProblem();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl
+ * <em>String Resolution Problem</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -424,7 +432,5 @@ public interface NattableproblemPackage extends EPackage {
* @generated
*/
EAttribute STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = eINSTANCE.getStringResolutionProblem_UnresolvedString();
-
}
-
} // NattableproblemPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
index 4ddcfbf155b..3da22140ecf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
@@ -27,7 +27,8 @@ import org.eclipse.emf.common.util.EList;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String
+ * </em>}</li>
* </ul>
* </p>
*
@@ -36,6 +37,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface StringResolutionProblem extends Problem {
+
/**
* Returns the value of the '<em><b>Value As String</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -53,12 +55,13 @@ public interface StringResolutionProblem extends Problem {
String getValueAsString();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString
+ * <em>Value As String</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Value As String</em>' attribute.
+ * the new value of the '<em>Value As String</em>' attribute.
* @see #getValueAsString()
* @generated
*/
@@ -79,5 +82,4 @@ public interface StringResolutionProblem extends Problem {
* @generated
*/
EList<String> getUnresolvedString();
-
} // StringResolutionProblem
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
index f3916723ff7..6bcf4e7c20e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
* @generated
*/
public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -39,8 +40,8 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
*/
public static NattableproblemFactory init() {
try {
- NattableproblemFactory theNattableproblemFactory = (NattableproblemFactory) EPackage.Registry.INSTANCE.getEFactory(NattableproblemPackage.eNS_URI);
- if (theNattableproblemFactory != null) {
+ NattableproblemFactory theNattableproblemFactory = (NattableproblemFactory)EPackage.Registry.INSTANCE.getEFactory(NattableproblemPackage.eNS_URI);
+ if(theNattableproblemFactory != null) {
return theNattableproblemFactory;
}
} catch (Exception exception) {
@@ -68,7 +69,7 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattableproblemPackage.PROBLEM:
return createProblem();
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM:
@@ -110,7 +111,7 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
*/
@Override
public NattableproblemPackage getNattableproblemPackage() {
- return (NattableproblemPackage) getEPackage();
+ return (NattableproblemPackage)getEPackage();
}
/**
@@ -124,5 +125,4 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
public static NattableproblemPackage getPackage() {
return NattableproblemPackage.eINSTANCE;
}
-
} // NattableproblemFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
index a8a71df4e49..f875bb19b01 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -65,10 +66,12 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
private EClass stringResolutionProblemEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI
@@ -91,8 +94,8 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattableproblemPackage#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
- * -->
+ * This method is used to initialize {@link NattableproblemPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -100,41 +103,24 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
* @generated
*/
public static NattableproblemPackage init() {
- if (isInited) {
- return (NattableproblemPackage) EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
+ if(isInited) {
+ return (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableproblemPackageImpl());
-
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableproblemPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattableproblemPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -146,7 +132,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
theNattableaxisPackage.createPackageContents();
theNattablecellPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattableproblemPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -158,11 +143,8 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
theNattableaxisPackage.initializePackageContents();
theNattablecellPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattableproblemPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattableproblemPackage.eNS_URI, theNattableproblemPackage);
return theNattableproblemPackage;
@@ -198,7 +180,7 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
*/
@Override
public EAttribute getStringResolutionProblem_ValueAsString() {
- return (EAttribute) stringResolutionProblemEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(0);
}
/**
@@ -209,7 +191,7 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
*/
@Override
public EAttribute getStringResolutionProblem_UnresolvedString() {
- return (EAttribute) stringResolutionProblemEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(1);
}
/**
@@ -220,7 +202,7 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
*/
@Override
public NattableproblemFactory getNattableproblemFactory() {
- return (NattableproblemFactory) getEFactoryInstance();
+ return (NattableproblemFactory)getEFactoryInstance();
}
/**
@@ -240,14 +222,12 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
problemEClass = createEClass(PROBLEM);
-
stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);
createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);
createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
@@ -270,34 +250,25 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
-
+ NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
problemEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
stringResolutionProblemEClass.getESuperTypes().add(this.getProblem());
-
// Initialize classes, features, and operations; add parameters
initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(stringResolutionProblemEClass, StringResolutionProblem.class, "StringResolutionProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getStringResolutionProblem_ValueAsString(), ecorePackage.getEString(), "valueAsString", null, 1, 1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getStringResolutionProblem_UnresolvedString(), ecorePackage.getEString(),
- "unresolvedString", null, 1, -1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getStringResolutionProblem_UnresolvedString(), ecorePackage.getEString(), "unresolvedString", null, 1, -1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
}
-
} // NattableproblemPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
index abb56b955b0..734e4d0f3df 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
* @generated
*/
public class ProblemImpl extends TableNamedElementImpl implements Problem {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -47,5 +48,4 @@ public class ProblemImpl extends TableNamedElementImpl implements Problem {
protected EClass eStaticClass() {
return NattableproblemPackage.Literals.PROBLEM;
}
-
} // ProblemImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
index 4b711f1c442..1e48a92364a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
@@ -29,14 +29,17 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved String</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved
+ * String</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class StringResolutionProblemImpl extends ProblemImpl implements StringResolutionProblem {
+
/**
* The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.
* <!-- begin-user-doc -->
@@ -112,7 +115,7 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
public void setValueAsString(String newValueAsString) {
String oldValueAsString = valueAsString;
valueAsString = newValueAsString;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING, oldValueAsString, valueAsString));
}
}
@@ -125,7 +128,7 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
*/
@Override
public EList<String> getUnresolvedString() {
- if (unresolvedString == null) {
+ if(unresolvedString == null) {
unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
}
return unresolvedString;
@@ -139,7 +142,7 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
return getValueAsString();
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
@@ -157,13 +160,13 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
- setValueAsString((String) newValue);
+ setValueAsString((String)newValue);
return;
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
getUnresolvedString().clear();
- getUnresolvedString().addAll((Collection<? extends String>) newValue);
+ getUnresolvedString().addAll((Collection<? extends String>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -177,7 +180,7 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
setValueAsString(VALUE_AS_STRING_EDEFAULT);
return;
@@ -196,7 +199,7 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
return VALUE_AS_STRING_EDEFAULT == null ? valueAsString != null : !VALUE_AS_STRING_EDEFAULT.equals(valueAsString);
case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
@@ -213,10 +216,9 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (valueAsString: "); //$NON-NLS-1$
result.append(valueAsString);
@@ -225,5 +227,4 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
result.append(')');
return result.toString();
}
-
} // StringResolutionProblemImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
index 9beef92faab..7b8d164eefa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -50,7 +51,7 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattableproblemAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableproblemPackage.eINSTANCE;
}
}
@@ -66,11 +67,11 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -82,38 +83,38 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattableproblemSwitch<Adapter> modelSwitch =
- new NattableproblemSwitch<Adapter>() {
- @Override
- public Adapter caseProblem(Problem object) {
- return createProblemAdapter();
- }
-
- @Override
- public Adapter caseStringResolutionProblem(StringResolutionProblem object) {
- return createStringResolutionProblemAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter caseTableNamedElement(TableNamedElement object) {
- return createTableNamedElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattableproblemSwitch<Adapter> modelSwitch = new NattableproblemSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseProblem(Problem object) {
+ return createProblemAdapter();
+ }
+
+ @Override
+ public Adapter caseStringResolutionProblem(StringResolutionProblem object) {
+ return createStringResolutionProblemAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter caseTableNamedElement(TableNamedElement object) {
+ return createTableNamedElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -121,18 +122,18 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
+ * <em>Problem</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.
@@ -147,7 +148,8 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem
+ * <em>String Resolution Problem</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.
@@ -177,7 +179,8 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -192,7 +195,8 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+ * <em>Table Named Element</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.
@@ -218,5 +222,4 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableproblemAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
index 6f6d2a54d86..04ba7bd6572 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableproblemSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -53,7 +54,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* @generated
*/
public NattableproblemSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattableproblemPackage.eINSTANCE;
}
}
@@ -82,40 +83,42 @@ public class NattableproblemSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattableproblemPackage.PROBLEM: {
- Problem problem = (Problem) theEObject;
+ switch(classifierID) {
+ case NattableproblemPackage.PROBLEM:
+ {
+ Problem problem = (Problem)theEObject;
T result = caseProblem(problem);
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(problem);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(problem);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(problem);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: {
- StringResolutionProblem stringResolutionProblem = (StringResolutionProblem) theEObject;
+ case NattableproblemPackage.STRING_RESOLUTION_PROBLEM:
+ {
+ StringResolutionProblem stringResolutionProblem = (StringResolutionProblem)theEObject;
T result = caseStringResolutionProblem(stringResolutionProblem);
- if (result == null) {
+ if(result == null) {
result = caseProblem(stringResolutionProblem);
}
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(stringResolutionProblem);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(stringResolutionProblem);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(stringResolutionProblem);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -133,7 +136,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Problem</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -150,7 +153,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -167,7 +170,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -184,7 +187,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -201,7 +204,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -218,7 +221,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -227,5 +230,4 @@ public class NattableproblemSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableproblemSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
index 288c43b6d28..a70405bc349 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface BooleanListValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.
* The list contents are of type {@link java.lang.Boolean}.
@@ -50,5 +51,4 @@ public interface BooleanListValueStyle extends NamedStyle {
* @generated
*/
EList<Boolean> getBooleanListValue();
-
} // BooleanListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
index 5edd2dfcc9a..a04e05bb75b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Boolean Value Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface BooleanValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -51,15 +51,15 @@ public interface BooleanValueStyle extends NamedStyle {
boolean isBooleanValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue
+ * <em>Boolean Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Boolean Value</em>' attribute.
+ * the new value of the '<em>Boolean Value</em>' attribute.
* @see #isBooleanValue()
* @generated
*/
void setBooleanValue(boolean value);
-
} // BooleanValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
index d2dc7b96600..578dee36d56 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
@@ -42,7 +42,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>TOP CENTER</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -53,7 +52,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
TOP_CENTER(2, "TOP_CENTER", "TOP_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>TOP RIGHT</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -64,7 +62,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
TOP_RIGHT(3, "TOP_RIGHT", "TOP_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>MIDDLE LEFT</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -75,7 +72,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
MIDDLE_LEFT(4, "MIDDLE_LEFT", "MIDDLE_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>MIDDLE CENTER</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -86,7 +82,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
MIDDLE_CENTER(5, "MIDDLE_CENTER", "MIDDLE_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>MIDDLE RIGHT</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -97,7 +92,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
MIDDLE_RIGHT(6, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>BOTTOM LEFT</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -108,7 +102,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
BOTTOM_LEFT(7, "BOTTOM_LEFT", "BOTTOM_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>BOTTOM CENTER</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -119,7 +112,6 @@ public enum CellTextAlignment implements Enumerator {
* @ordered
*/
BOTTOM_CENTER(8, "BOTTOM_CENTER", "BOTTOM_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>BOTTOM RIGHT</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -273,18 +265,7 @@ public enum CellTextAlignment implements Enumerator {
*
* @generated
*/
- private static final CellTextAlignment[] VALUES_ARRAY =
- new CellTextAlignment[] {
- TOP_LEFT,
- TOP_CENTER,
- TOP_RIGHT,
- MIDDLE_LEFT,
- MIDDLE_CENTER,
- MIDDLE_RIGHT,
- BOTTOM_LEFT,
- BOTTOM_CENTER,
- BOTTOM_RIGHT,
- };
+ private static final CellTextAlignment[] VALUES_ARRAY = new CellTextAlignment[]{ TOP_LEFT, TOP_CENTER, TOP_RIGHT, MIDDLE_LEFT, MIDDLE_CENTER, MIDDLE_RIGHT, BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT, };
/**
* A public read-only list of all the '<em><b>Cell Text Alignment</b></em>' enumerators.
@@ -303,9 +284,9 @@ public enum CellTextAlignment implements Enumerator {
* @generated
*/
public static CellTextAlignment get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
CellTextAlignment result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
+ if(result.toString().equals(literal)) {
return result;
}
}
@@ -320,9 +301,9 @@ public enum CellTextAlignment implements Enumerator {
* @generated
*/
public static CellTextAlignment getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
CellTextAlignment result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
+ if(result.getName().equals(name)) {
return result;
}
}
@@ -337,7 +318,7 @@ public enum CellTextAlignment implements Enumerator {
* @generated
*/
public static CellTextAlignment get(int value) {
- switch (value) {
+ switch(value) {
case TOP_LEFT_VALUE:
return TOP_LEFT;
case TOP_CENTER_VALUE:
@@ -441,5 +422,4 @@ public enum CellTextAlignment implements Enumerator {
public String toString() {
return literal;
}
-
} // CellTextAlignment
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
index 0ab198d019f..f35343245c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Cell Text Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface CellTextStyle extends Style {
+
/**
* Returns the value of the '<em><b>Alignment</b></em>' attribute.
* The default value is <code>"MIDDLE_LEFT"</code>.
@@ -54,16 +54,16 @@ public interface CellTextStyle extends Style {
CellTextAlignment getAlignment();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Alignment</em>' attribute.
+ * the new value of the '<em>Alignment</em>' attribute.
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
* @see #getAlignment()
* @generated
*/
void setAlignment(CellTextAlignment value);
-
} // CellTextStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
index e71e044755f..1ef0a3f7006 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
@@ -39,7 +39,6 @@ public enum DisplayStyle implements Enumerator {
* @ordered
*/
NORMAL(0, "NORMAL", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -50,7 +49,6 @@ public enum DisplayStyle implements Enumerator {
* @ordered
*/
HIERARCHIC_SINGLE_TREE_COLUMN(1, "HIERARCHIC_SINGLE_TREE_COLUMN", "HIERARCHIC_SINGLE_TREE_COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
-
/**
* The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -81,7 +79,8 @@ public enum DisplayStyle implements Enumerator {
* The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...
+ * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+ * here...
* </p>
* <!-- end-user-doc -->
*
@@ -96,7 +95,8 @@ public enum DisplayStyle implements Enumerator {
* The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...
+ * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+ * here...
* </p>
* <!-- end-user-doc -->
*
@@ -114,12 +114,7 @@ public enum DisplayStyle implements Enumerator {
*
* @generated
*/
- private static final DisplayStyle[] VALUES_ARRAY =
- new DisplayStyle[] {
- NORMAL,
- HIERARCHIC_SINGLE_TREE_COLUMN,
- HIERARCHIC_MULTI_TREE_COLUMN,
- };
+ private static final DisplayStyle[] VALUES_ARRAY = new DisplayStyle[]{ NORMAL, HIERARCHIC_SINGLE_TREE_COLUMN, HIERARCHIC_MULTI_TREE_COLUMN, };
/**
* A public read-only list of all the '<em><b>Display Style</b></em>' enumerators.
@@ -138,9 +133,9 @@ public enum DisplayStyle implements Enumerator {
* @generated
*/
public static DisplayStyle get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
DisplayStyle result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
+ if(result.toString().equals(literal)) {
return result;
}
}
@@ -155,9 +150,9 @@ public enum DisplayStyle implements Enumerator {
* @generated
*/
public static DisplayStyle getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
DisplayStyle result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
+ if(result.getName().equals(name)) {
return result;
}
}
@@ -172,7 +167,7 @@ public enum DisplayStyle implements Enumerator {
* @generated
*/
public static DisplayStyle get(int value) {
- switch (value) {
+ switch(value) {
case NORMAL_VALUE:
return NORMAL;
case HIERARCHIC_SINGLE_TREE_COLUMN_VALUE:
@@ -264,5 +259,4 @@ public enum DisplayStyle implements Enumerator {
public String toString() {
return literal;
}
-
} // DisplayStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
index 42ee110cf6f..60fcccabab9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface DoubleListValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Double List Value</b></em>' attribute list.
* The list contents are of type {@link java.lang.Double}.
@@ -50,5 +51,4 @@ public interface DoubleListValueStyle extends NamedStyle {
* @generated
*/
EList<Double> getDoubleListValue();
-
} // DoubleListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
index 7f520731322..f11fa2a5fe7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Double Value Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface DoubleValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Double Value</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -51,15 +51,15 @@ public interface DoubleValueStyle extends NamedStyle {
double getDoubleValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue
+ * <em>Double Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Double Value</em>' attribute.
+ * the new value of the '<em>Double Value</em>' attribute.
* @see #getDoubleValue()
* @generated
*/
void setDoubleValue(double value);
-
} // DoubleValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java
new file mode 100755
index 00000000000..2f36665e918
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectListValueStyle()
+ * @model
+ * @generated
+ */
+public interface EObjectListValueStyle extends NamedStyle {
+
+ /**
+ * Returns the value of the '<em><b>EObject Value</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>EObject Value</em>' reference list isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>EObject Value</em>' reference list.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectListValueStyle_EObjectValue()
+ * @model
+ * @generated
+ */
+ EList<EObject> getEObjectValue();
+} // EObjectListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java
new file mode 100755
index 00000000000..6f19cb724a1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectValueStyle()
+ * @model
+ * @generated
+ */
+public interface EObjectValueStyle extends NamedStyle {
+
+ /**
+ * Returns the value of the '<em><b>EObject Value</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>EObject Value</em>' reference isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>EObject Value</em>' reference.
+ * @see #setEObjectValue(EObject)
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectValueStyle_EObjectValue()
+ * @model
+ * @generated
+ */
+ EObject getEObjectValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue
+ * <em>EObject Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>EObject Value</em>' reference.
+ * @see #getEObjectValue()
+ * @generated
+ */
+ void setEObjectValue(EObject value);
+} // EObjectValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
index 63d1b4b2245..291f981f39f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Font Style</b></em>'.
@@ -40,6 +39,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface FontStyle extends Style {
+
/**
* Returns the value of the '<em><b>Font Color</b></em>' attribute.
* The default value is <code>"0"</code>.
@@ -58,12 +58,13 @@ public interface FontStyle extends Style {
int getFontColor();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Font Color</em>' attribute.
+ * the new value of the '<em>Font Color</em>' attribute.
* @see #getFontColor()
* @generated
*/
@@ -87,12 +88,13 @@ public interface FontStyle extends Style {
String getFontName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Font Name</em>' attribute.
+ * the new value of the '<em>Font Name</em>' attribute.
* @see #getFontName()
* @generated
*/
@@ -116,12 +118,13 @@ public interface FontStyle extends Style {
int getFontHeight();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Font Height</em>' attribute.
+ * the new value of the '<em>Font Height</em>' attribute.
* @see #getFontHeight()
* @generated
*/
@@ -150,7 +153,7 @@ public interface FontStyle extends Style {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Bold</em>' attribute.
+ * the new value of the '<em>Bold</em>' attribute.
* @see #isBold()
* @generated
*/
@@ -179,7 +182,7 @@ public interface FontStyle extends Style {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Italic</em>' attribute.
+ * the new value of the '<em>Italic</em>' attribute.
* @see #isItalic()
* @generated
*/
@@ -203,12 +206,13 @@ public interface FontStyle extends Style {
boolean isUnderline();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Underline</em>' attribute.
+ * the new value of the '<em>Underline</em>' attribute.
* @see #isUnderline()
* @generated
*/
@@ -232,15 +236,15 @@ public interface FontStyle extends Style {
boolean isStrikeThrough();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough
+ * <em>Strike Through</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Strike Through</em>' attribute.
+ * the new value of the '<em>Strike Through</em>' attribute.
* @see #isStrikeThrough()
* @generated
*/
void setStrikeThrough(boolean value);
-
} // FontStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
index f77557ad96d..7bf222fd538 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface IntListValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Int List Value</b></em>' attribute list.
* The list contents are of type {@link java.lang.Integer}.
@@ -50,5 +51,4 @@ public interface IntListValueStyle extends NamedStyle {
* @generated
*/
EList<Integer> getIntListValue();
-
} // IntListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
index c762bcc3a01..98790886c86 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Int Value Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface IntValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>Int Value</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -51,15 +51,15 @@ public interface IntValueStyle extends NamedStyle {
int getIntValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Int Value</em>' attribute.
+ * the new value of the '<em>Int Value</em>' attribute.
* @see #getIntValue()
* @generated
*/
void setIntValue(int value);
-
} // IntValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
index 5831e966e51..88be211a75e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Named Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface NamedStyle extends Style {
+
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -56,10 +56,9 @@ public interface NamedStyle extends Style {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Name</em>' attribute.
+ * the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setName(String value);
-
} // NamedStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
index 3e198f68eba..c54c5f3ec33 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattablestyleFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -154,6 +155,26 @@ public interface NattablestyleFactory extends EFactory {
TableDisplayStyle createTableDisplayStyle();
/**
+ * Returns a new object of class '<em>EObject Value Style</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>EObject Value Style</em>'.
+ * @generated
+ */
+ EObjectValueStyle createEObjectValueStyle();
+
+ /**
+ * Returns a new object of class '<em>EObject List Value Style</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>EObject List Value Style</em>'.
+ * @generated
+ */
+ EObjectListValueStyle createEObjectListValueStyle();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -162,5 +183,4 @@ public interface NattablestyleFactory extends EFactory {
* @generated
*/
NattablestylePackage getNattablestylePackage();
-
} // NattablestyleFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
index bcd67c20ac6..1d27af912db 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.EcorePackage;
* @generated
*/
public interface NattablestylePackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -126,7 +127,8 @@ public interface NattablestylePackage extends EPackage {
int STYLE_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -187,7 +189,8 @@ public interface NattablestylePackage extends EPackage {
int NAMED_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}'
+ * class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -308,7 +311,8 @@ public interface NattablestylePackage extends EPackage {
int FONT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl
+ * <em>Cell Text Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -369,7 +373,8 @@ public interface NattablestylePackage extends EPackage {
int CELL_TEXT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl
+ * <em>Int Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -440,7 +445,8 @@ public interface NattablestylePackage extends EPackage {
int INT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl
+ * <em>Int List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -511,7 +517,8 @@ public interface NattablestylePackage extends EPackage {
int INT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl
+ * <em>Boolean Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -582,7 +589,8 @@ public interface NattablestylePackage extends EPackage {
int BOOLEAN_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl
+ * <em>Boolean List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -653,7 +661,8 @@ public interface NattablestylePackage extends EPackage {
int BOOLEAN_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl
+ * <em>Double Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -724,7 +733,8 @@ public interface NattablestylePackage extends EPackage {
int DOUBLE_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl
+ * <em>Double List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -795,7 +805,8 @@ public interface NattablestylePackage extends EPackage {
int DOUBLE_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl
+ * <em>String Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -866,7 +877,8 @@ public interface NattablestylePackage extends EPackage {
int STRING_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl
+ * <em>String List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -937,7 +949,8 @@ public interface NattablestylePackage extends EPackage {
int STRING_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl
+ * <em>Styled Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1028,7 +1041,8 @@ public interface NattablestylePackage extends EPackage {
int STYLED_ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl
+ * <em>Table Display Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1089,7 +1103,152 @@ public interface NattablestylePackage extends EPackage {
int TABLE_DISPLAY_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+ * <em>EObject Value Style</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()
+ * @generated
+ */
+ int EOBJECT_VALUE_STYLE = 14;
+
+ /**
+ * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+ /**
+ * The feature id for the '<em><b>EObject Value</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>EObject Value Style</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+ /**
+ * The operation id for the '<em>Get EAnnotation</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+ /**
+ * The number of operations of the '<em>EObject Value Style</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+ * <em>EObject List Value Style</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()
+ * @generated
+ */
+ int EOBJECT_LIST_VALUE_STYLE = 15;
+
+ /**
+ * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+ /**
+ * The feature id for the '<em><b>EObject Value</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>EObject List Value Style</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+ /**
+ * The operation id for the '<em>Get EAnnotation</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+ /**
+ * The number of operations of the '<em>EObject List Value Style</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EOBJECT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+ * <em>Cell Text Alignment</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1097,7 +1256,7 @@ public interface NattablestylePackage extends EPackage {
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()
* @generated
*/
- int CELL_TEXT_ALIGNMENT = 14;
+ int CELL_TEXT_ALIGNMENT = 16;
/**
* The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.
@@ -1108,8 +1267,7 @@ public interface NattablestylePackage extends EPackage {
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()
* @generated
*/
- int DISPLAY_STYLE = 15;
-
+ int DISPLAY_STYLE = 17;
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.
@@ -1134,7 +1292,8 @@ public interface NattablestylePackage extends EPackage {
EClass getNamedStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName
+ * <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1157,7 +1316,8 @@ public interface NattablestylePackage extends EPackage {
EClass getFontStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor
+ * <em>Font Color</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1169,7 +1329,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_FontColor();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName
+ * <em>Font Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1181,7 +1342,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_FontName();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight
+ * <em>Font Height</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1193,7 +1355,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_FontHeight();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold
+ * <em>Bold</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1205,7 +1368,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_Bold();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic
+ * <em>Italic</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1217,7 +1381,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_Italic();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline
+ * <em>Underline</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1229,7 +1394,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_Underline();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough
+ * <em>Strike Through</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1241,7 +1407,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getFontStyle_StrikeThrough();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle
+ * <em>Cell Text Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1252,7 +1419,8 @@ public interface NattablestylePackage extends EPackage {
EClass getCellTextStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment
+ * <em>Alignment</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1264,7 +1432,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getCellTextStyle_Alignment();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle
+ * <em>Int Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1275,7 +1444,8 @@ public interface NattablestylePackage extends EPackage {
EClass getIntValueStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue
+ * <em>Int Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1287,7 +1457,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getIntValueStyle_IntValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle
+ * <em>Int List Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1298,7 +1469,8 @@ public interface NattablestylePackage extends EPackage {
EClass getIntListValueStyle();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1310,7 +1482,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getIntListValueStyle_IntListValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle
+ * <em>Boolean Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1321,7 +1494,8 @@ public interface NattablestylePackage extends EPackage {
EClass getBooleanValueStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1333,7 +1507,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getBooleanValueStyle_BooleanValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle
+ * <em>Boolean List Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1344,7 +1519,8 @@ public interface NattablestylePackage extends EPackage {
EClass getBooleanListValueStyle();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1356,7 +1532,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getBooleanListValueStyle_BooleanListValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle
+ * <em>Double Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1367,7 +1544,8 @@ public interface NattablestylePackage extends EPackage {
EClass getDoubleValueStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1379,7 +1557,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getDoubleValueStyle_DoubleValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle
+ * <em>Double List Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1390,7 +1569,8 @@ public interface NattablestylePackage extends EPackage {
EClass getDoubleListValueStyle();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1402,7 +1582,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getDoubleListValueStyle_DoubleListValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle
+ * <em>String Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1413,7 +1594,8 @@ public interface NattablestylePackage extends EPackage {
EClass getStringValueStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1425,7 +1607,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getStringValueStyle_StringValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle
+ * <em>String List Value Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1436,7 +1619,8 @@ public interface NattablestylePackage extends EPackage {
EClass getStringListValueStyle();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1448,7 +1632,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute getStringListValueStyle_StringListValue();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1459,7 +1644,8 @@ public interface NattablestylePackage extends EPackage {
EClass getStyledElement();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1471,18 +1657,23 @@ public interface NattablestylePackage extends EPackage {
EReference getStyledElement_Styles();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String) <em>Get Named Style</em>}' operation.
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)
+ * <em>Get Named Style</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @return the meta object for the '<em>Get Named Style</em>' operation.
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass,
+ * java.lang.String)
* @generated
*/
EOperation getStyledElement__GetNamedStyle__EClass_String();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}' operation.
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}
+ * ' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1493,7 +1684,9 @@ public interface NattablestylePackage extends EPackage {
EOperation getStyledElement__GetStyle__EClass();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass) <em>Create Style</em>}' operation.
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass)
+ * <em>Create Style</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1504,7 +1697,8 @@ public interface NattablestylePackage extends EPackage {
EOperation getStyledElement__CreateStyle__EClass();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle
+ * <em>Table Display Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1515,7 +1709,8 @@ public interface NattablestylePackage extends EPackage {
EClass getTableDisplayStyle();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.
+ * Returns the meta object for the attribute '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1527,7 +1722,58 @@ public interface NattablestylePackage extends EPackage {
EAttribute getTableDisplayStyle_DisplayStyle();
/**
- * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+ * <em>EObject Value Style</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>EObject Value Style</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+ * @generated
+ */
+ EClass getEObjectValueStyle();
+
+ /**
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>EObject Value</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue()
+ * @see #getEObjectValueStyle()
+ * @generated
+ */
+ EReference getEObjectValueStyle_EObjectValue();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+ * <em>EObject List Value Style</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>EObject List Value Style</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+ * @generated
+ */
+ EClass getEObjectListValueStyle();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>EObject Value</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue()
+ * @see #getEObjectListValueStyle()
+ * @generated
+ */
+ EReference getEObjectListValueStyle_EObjectValue();
+
+ /**
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+ * <em>Cell Text Alignment</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1573,6 +1819,7 @@ public interface NattablestylePackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.
* <!-- begin-user-doc -->
@@ -1585,7 +1832,8 @@ public interface NattablestylePackage extends EPackage {
EClass STYLE = eINSTANCE.getStyle();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl
+ * <em>Named Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1605,7 +1853,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute NAMED_STYLE__NAME = eINSTANCE.getNamedStyle_Name();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl
+ * <em>Font Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1679,7 +1928,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute FONT_STYLE__STRIKE_THROUGH = eINSTANCE.getFontStyle_StrikeThrough();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl
+ * <em>Cell Text Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1699,7 +1949,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute CELL_TEXT_STYLE__ALIGNMENT = eINSTANCE.getCellTextStyle_Alignment();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl
+ * <em>Int Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1719,7 +1970,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute INT_VALUE_STYLE__INT_VALUE = eINSTANCE.getIntValueStyle_IntValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl
+ * <em>Int List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1739,7 +1991,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute INT_LIST_VALUE_STYLE__INT_LIST_VALUE = eINSTANCE.getIntListValueStyle_IntListValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl
+ * <em>Boolean Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1759,7 +2012,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = eINSTANCE.getBooleanValueStyle_BooleanValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl
+ * <em>Boolean List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1779,7 +2033,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = eINSTANCE.getBooleanListValueStyle_BooleanListValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl
+ * <em>Double Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1799,7 +2054,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute DOUBLE_VALUE_STYLE__DOUBLE_VALUE = eINSTANCE.getDoubleValueStyle_DoubleValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl
+ * <em>Double List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1819,7 +2075,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = eINSTANCE.getDoubleListValueStyle_DoubleListValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl
+ * <em>String Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1839,7 +2096,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute STRING_VALUE_STYLE__STRING_VALUE = eINSTANCE.getStringValueStyle_StringValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl
+ * <em>String List Value Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1859,7 +2117,8 @@ public interface NattablestylePackage extends EPackage {
EAttribute STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = eINSTANCE.getStringListValueStyle_StringListValue();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl
+ * <em>Styled Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1906,7 +2165,8 @@ public interface NattablestylePackage extends EPackage {
EOperation STYLED_ELEMENT___CREATE_STYLE__ECLASS = eINSTANCE.getStyledElement__CreateStyle__EClass();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl
+ * <em>Table Display Style</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1926,7 +2186,50 @@ public interface NattablestylePackage extends EPackage {
EAttribute TABLE_DISPLAY_STYLE__DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle_DisplayStyle();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+ * <em>EObject Value Style</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()
+ * @generated
+ */
+ EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();
+
+ /**
+ * The meta object literal for the '<em><b>EObject Value</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference EOBJECT_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectValueStyle_EObjectValue();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+ * <em>EObject List Value Style</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()
+ * @generated
+ */
+ EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();
+
+ /**
+ * The meta object literal for the '<em><b>EObject Value</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectListValueStyle_EObjectValue();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+ * <em>Cell Text Alignment</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1937,7 +2240,8 @@ public interface NattablestylePackage extends EPackage {
EEnum CELL_TEXT_ALIGNMENT = eINSTANCE.getCellTextAlignment();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+ * <em>Display Style</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1946,7 +2250,5 @@ public interface NattablestylePackage extends EPackage {
* @generated
*/
EEnum DISPLAY_STYLE = eINSTANCE.getDisplayStyle();
-
}
-
} // NattablestylePackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
index 4417f343529..179454375c5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface StringListValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>String List Value</b></em>' attribute list.
* The list contents are of type {@link java.lang.String}.
@@ -50,5 +51,4 @@ public interface StringListValueStyle extends NamedStyle {
* @generated
*/
EList<String> getStringListValue();
-
} // StringListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
index ffb23ad6901..492269aa1bf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>String Value Style</b></em>'.
@@ -34,6 +33,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface StringValueStyle extends NamedStyle {
+
/**
* Returns the value of the '<em><b>String Value</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -51,15 +51,15 @@ public interface StringValueStyle extends NamedStyle {
String getStringValue();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue
+ * <em>String Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>String Value</em>' attribute.
+ * the new value of the '<em>String Value</em>' attribute.
* @see #getStringValue()
* @generated
*/
void setStringValue(String value);
-
} // StringValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
index 1e5811bea24..111aab2184b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.ecore.EModelElement;
* @generated
*/
public interface StyledElement extends EModelElement {
+
/**
* Returns the value of the '<em><b>Styles</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style}.
@@ -75,5 +76,4 @@ public interface StyledElement extends EModelElement {
* @generated
*/
Style createStyle(EClass eClass);
-
} // StyledElement
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
index 50e9d9fd88b..84d850df394 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Table Display Style</b></em>'.
@@ -30,6 +29,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
* @generated
*/
public interface TableDisplayStyle extends Style {
+
/**
* Returns the value of the '<em><b>Display Style</b></em>' attribute.
* The default value is <code>"NORMAL"</code>.
@@ -50,16 +50,16 @@ public interface TableDisplayStyle extends Style {
DisplayStyle getDisplayStyle();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle
+ * <em>Display Style</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Display Style</em>' attribute.
+ * the new value of the '<em>Display Style</em>' attribute.
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
* @see #getDisplayStyle()
* @generated
*/
void setDisplayStyle(DisplayStyle value);
-
} // TableDisplayStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
index 992e2b1b455..43e5a5ceeb7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List
+ * Value</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {
+
/**
* The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -74,7 +76,7 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
*/
@Override
public EList<Boolean> getBooleanListValue() {
- if (booleanListValue == null) {
+ if(booleanListValue == null) {
booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
}
return booleanListValue;
@@ -88,7 +90,7 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
return getBooleanListValue();
}
@@ -104,10 +106,10 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
getBooleanListValue().clear();
- getBooleanListValue().addAll((Collection<? extends Boolean>) newValue);
+ getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -121,7 +123,7 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
getBooleanListValue().clear();
return;
@@ -137,7 +139,7 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
return booleanListValue != null && !booleanListValue.isEmpty();
}
@@ -152,15 +154,13 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (booleanListValue: "); //$NON-NLS-1$
result.append(booleanListValue);
result.append(')');
return result.toString();
}
-
} // BooleanListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
index 14d2b7516af..052713ac142 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {
+
/**
* The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +97,7 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
public void setBooleanValue(boolean newBooleanValue) {
boolean oldBooleanValue = booleanValue;
booleanValue = newBooleanValue;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE, oldBooleanValue, booleanValue));
}
}
@@ -109,7 +110,7 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
return isBooleanValue();
}
@@ -124,9 +125,9 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
- setBooleanValue((Boolean) newValue);
+ setBooleanValue((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
return;
@@ -156,7 +157,7 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
return booleanValue != BOOLEAN_VALUE_EDEFAULT;
}
@@ -171,15 +172,13 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (booleanValue: "); //$NON-NLS-1$
result.append(booleanValue);
result.append(')');
return result.toString();
}
-
} // BooleanValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
index 0da82b21889..5ecd894130a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyle {
+
/**
* The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
* <!-- begin-user-doc -->
@@ -98,7 +99,7 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
public void setAlignment(CellTextAlignment newAlignment) {
CellTextAlignment oldAlignment = alignment;
alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT, oldAlignment, alignment));
}
}
@@ -111,7 +112,7 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
return getAlignment();
}
@@ -126,9 +127,9 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
- setAlignment((CellTextAlignment) newValue);
+ setAlignment((CellTextAlignment)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -142,7 +143,7 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
setAlignment(ALIGNMENT_EDEFAULT);
return;
@@ -158,7 +159,7 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
return alignment != ALIGNMENT_EDEFAULT;
}
@@ -173,15 +174,13 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alignment: "); //$NON-NLS-1$
result.append(alignment);
result.append(')');
return result.toString();
}
-
} // CellTextStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
index 64bb349420c..e327725d680 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value
+ * </em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {
+
/**
* The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -74,7 +76,7 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
*/
@Override
public EList<Double> getDoubleListValue() {
- if (doubleListValue == null) {
+ if(doubleListValue == null) {
doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
}
return doubleListValue;
@@ -88,7 +90,7 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
return getDoubleListValue();
}
@@ -104,10 +106,10 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
getDoubleListValue().clear();
- getDoubleListValue().addAll((Collection<? extends Double>) newValue);
+ getDoubleListValue().addAll((Collection<? extends Double>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -121,7 +123,7 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
getDoubleListValue().clear();
return;
@@ -137,7 +139,7 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
return doubleListValue != null && !doubleListValue.isEmpty();
}
@@ -152,15 +154,13 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (doubleListValue: "); //$NON-NLS-1$
result.append(doubleListValue);
result.append(')');
return result.toString();
}
-
} // DoubleListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
index 538fcab3131..7204b463371 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {
+
/**
* The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +97,7 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
public void setDoubleValue(double newDoubleValue) {
double oldDoubleValue = doubleValue;
doubleValue = newDoubleValue;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE, oldDoubleValue, doubleValue));
}
}
@@ -109,7 +110,7 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
return getDoubleValue();
}
@@ -124,9 +125,9 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
- setDoubleValue((Double) newValue);
+ setDoubleValue((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
setDoubleValue(DOUBLE_VALUE_EDEFAULT);
return;
@@ -156,7 +157,7 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
return doubleValue != DOUBLE_VALUE_EDEFAULT;
}
@@ -171,15 +172,13 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (doubleValue: "); //$NON-NLS-1$
result.append(doubleValue);
result.append(')');
return result.toString();
}
-
} // DoubleValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java
new file mode 100755
index 00000000000..ed836907548
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObjectListValueStyle {
+
+ /**
+ * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getEObjectValue()
+ * @generated
+ * @ordered
+ */
+ protected EList<EObject> eObjectValue;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected EObjectListValueStyleImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return NattablestylePackage.Literals.EOBJECT_LIST_VALUE_STYLE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EList<EObject> getEObjectValue() {
+ if(eObjectValue == null) {
+ eObjectValue = new EObjectResolvingEList<EObject>(EObject.class, this, NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);
+ }
+ return eObjectValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+ return getEObjectValue();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+ getEObjectValue().clear();
+ getEObjectValue().addAll((Collection<? extends EObject>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+ getEObjectValue().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+ return eObjectValue != null && !eObjectValue.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+} // EObjectListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java
new file mode 100755
index 00000000000..a61ecfb8442
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValueStyle {
+
+ /**
+ * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getEObjectValue()
+ * @generated
+ * @ordered
+ */
+ protected EObject eObjectValue;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected EObjectValueStyleImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return NattablestylePackage.Literals.EOBJECT_VALUE_STYLE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EObject getEObjectValue() {
+ if(eObjectValue != null && eObjectValue.eIsProxy()) {
+ InternalEObject oldEObjectValue = (InternalEObject)eObjectValue;
+ eObjectValue = eResolveProxy(oldEObjectValue);
+ if(eObjectValue != oldEObjectValue) {
+ if(eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
+ }
+ }
+ }
+ return eObjectValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EObject basicGetEObjectValue() {
+ return eObjectValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setEObjectValue(EObject newEObjectValue) {
+ EObject oldEObjectValue = eObjectValue;
+ eObjectValue = newEObjectValue;
+ if(eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+ if(resolve) {
+ return getEObjectValue();
+ }
+ return basicGetEObjectValue();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+ setEObjectValue((EObject)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+ setEObjectValue((EObject)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch(featureID) {
+ case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+ return eObjectValue != null;
+ }
+ return super.eIsSet(featureID);
+ }
+} // EObjectValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
index 176ba6ca6d3..868f58d4c82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class FontStyleImpl extends EModelElementImpl implements FontStyle {
+
/**
* The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
* <!-- begin-user-doc -->
@@ -235,7 +236,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setFontColor(int newFontColor) {
int oldFontColor = fontColor;
fontColor = newFontColor;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));
}
}
@@ -261,7 +262,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setFontName(String newFontName) {
String oldFontName = fontName;
fontName = newFontName;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));
}
}
@@ -287,7 +288,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setFontHeight(int newFontHeight) {
int oldFontHeight = fontHeight;
fontHeight = newFontHeight;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));
}
}
@@ -313,7 +314,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setBold(boolean newBold) {
boolean oldBold = bold;
bold = newBold;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));
}
}
@@ -339,7 +340,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setItalic(boolean newItalic) {
boolean oldItalic = italic;
italic = newItalic;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));
}
}
@@ -365,7 +366,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setUnderline(boolean newUnderline) {
boolean oldUnderline = underline;
underline = newUnderline;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));
}
}
@@ -391,7 +392,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
public void setStrikeThrough(boolean newStrikeThrough) {
boolean oldStrikeThrough = strikeThrough;
strikeThrough = newStrikeThrough;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__STRIKE_THROUGH, oldStrikeThrough, strikeThrough));
}
}
@@ -404,7 +405,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.FONT_STYLE__FONT_COLOR:
return getFontColor();
case NattablestylePackage.FONT_STYLE__FONT_NAME:
@@ -431,27 +432,27 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.FONT_STYLE__FONT_COLOR:
- setFontColor((Integer) newValue);
+ setFontColor((Integer)newValue);
return;
case NattablestylePackage.FONT_STYLE__FONT_NAME:
- setFontName((String) newValue);
+ setFontName((String)newValue);
return;
case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
- setFontHeight((Integer) newValue);
+ setFontHeight((Integer)newValue);
return;
case NattablestylePackage.FONT_STYLE__BOLD:
- setBold((Boolean) newValue);
+ setBold((Boolean)newValue);
return;
case NattablestylePackage.FONT_STYLE__ITALIC:
- setItalic((Boolean) newValue);
+ setItalic((Boolean)newValue);
return;
case NattablestylePackage.FONT_STYLE__UNDERLINE:
- setUnderline((Boolean) newValue);
+ setUnderline((Boolean)newValue);
return;
case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
- setStrikeThrough((Boolean) newValue);
+ setStrikeThrough((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -465,7 +466,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.FONT_STYLE__FONT_COLOR:
setFontColor(FONT_COLOR_EDEFAULT);
return;
@@ -499,7 +500,7 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.FONT_STYLE__FONT_COLOR:
return fontColor != FONT_COLOR_EDEFAULT;
case NattablestylePackage.FONT_STYLE__FONT_NAME:
@@ -526,10 +527,9 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (fontColor: "); //$NON-NLS-1$
result.append(fontColor);
@@ -548,5 +548,4 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
result.append(')');
return result.toString();
}
-
} // FontStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
index 25f85dcaf49..edbac3801d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {
+
/**
* The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -74,7 +75,7 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
*/
@Override
public EList<Integer> getIntListValue() {
- if (intListValue == null) {
+ if(intListValue == null) {
intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
}
return intListValue;
@@ -88,7 +89,7 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
return getIntListValue();
}
@@ -104,10 +105,10 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
getIntListValue().clear();
- getIntListValue().addAll((Collection<? extends Integer>) newValue);
+ getIntListValue().addAll((Collection<? extends Integer>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -121,7 +122,7 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
getIntListValue().clear();
return;
@@ -137,7 +138,7 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
return intListValue != null && !intListValue.isEmpty();
}
@@ -152,15 +153,13 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (intListValue: "); //$NON-NLS-1$
result.append(intListValue);
result.append(')');
return result.toString();
}
-
} // IntListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
index 0c3590e33f0..3f41ea70bf5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
+
/**
* The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +97,7 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
public void setIntValue(int newIntValue) {
int oldIntValue = intValue;
intValue = newIntValue;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.INT_VALUE_STYLE__INT_VALUE, oldIntValue, intValue));
}
}
@@ -109,7 +110,7 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
return getIntValue();
}
@@ -124,9 +125,9 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
- setIntValue((Integer) newValue);
+ setIntValue((Integer)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
setIntValue(INT_VALUE_EDEFAULT);
return;
@@ -156,7 +157,7 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
return intValue != INT_VALUE_EDEFAULT;
}
@@ -171,15 +172,13 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (intValue: "); //$NON-NLS-1$
result.append(intValue);
result.append(')');
return result.toString();
}
-
} // IntValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
index 6c0a06c1763..6066f0dcd6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
+
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
@@ -97,7 +98,7 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
public void setName(String newName) {
String oldName = name;
name = newName;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.NAMED_STYLE__NAME, oldName, name));
}
}
@@ -110,7 +111,7 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.NAMED_STYLE__NAME:
return getName();
}
@@ -125,9 +126,9 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.NAMED_STYLE__NAME:
- setName((String) newValue);
+ setName((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -141,7 +142,7 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.NAMED_STYLE__NAME:
setName(NAME_EDEFAULT);
return;
@@ -157,7 +158,7 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.NAMED_STYLE__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
}
@@ -172,15 +173,13 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: "); //$NON-NLS-1$
result.append(name);
result.append(')');
return result.toString();
}
-
} // NamedStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
index 0cc249d2ebc..8aae9c97c12 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
@@ -25,6 +25,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextS
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
@@ -43,6 +45,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
* @generated
*/
public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -52,8 +55,8 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
public static NattablestyleFactory init() {
try {
- NattablestyleFactory theNattablestyleFactory = (NattablestyleFactory) EPackage.Registry.INSTANCE.getEFactory(NattablestylePackage.eNS_URI);
- if (theNattablestyleFactory != null) {
+ NattablestyleFactory theNattablestyleFactory = (NattablestyleFactory)EPackage.Registry.INSTANCE.getEFactory(NattablestylePackage.eNS_URI);
+ if(theNattablestyleFactory != null) {
return theNattablestyleFactory;
}
} catch (Exception exception) {
@@ -81,7 +84,7 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattablestylePackage.NAMED_STYLE:
return createNamedStyle();
case NattablestylePackage.FONT_STYLE:
@@ -106,6 +109,10 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
return createStringListValueStyle();
case NattablestylePackage.TABLE_DISPLAY_STYLE:
return createTableDisplayStyle();
+ case NattablestylePackage.EOBJECT_VALUE_STYLE:
+ return createEObjectValueStyle();
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE:
+ return createEObjectListValueStyle();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -119,7 +126,7 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
@Override
public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattablestylePackage.CELL_TEXT_ALIGNMENT:
return createCellTextAlignmentFromString(eDataType, initialValue);
case NattablestylePackage.DISPLAY_STYLE:
@@ -137,7 +144,7 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
@Override
public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case NattablestylePackage.CELL_TEXT_ALIGNMENT:
return convertCellTextAlignmentToString(eDataType, instanceValue);
case NattablestylePackage.DISPLAY_STYLE:
@@ -297,10 +304,33 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*
* @generated
*/
+ @Override
+ public EObjectValueStyle createEObjectValueStyle() {
+ EObjectValueStyleImpl eObjectValueStyle = new EObjectValueStyleImpl();
+ return eObjectValueStyle;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EObjectListValueStyle createEObjectListValueStyle() {
+ EObjectListValueStyleImpl eObjectListValueStyle = new EObjectListValueStyleImpl();
+ return eObjectListValueStyle;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
public CellTextAlignment createCellTextAlignmentFromString(EDataType eDataType, String initialValue) {
CellTextAlignment result = CellTextAlignment.get(initialValue);
- if (result == null)
- {
+ if(result == null) {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return result;
@@ -324,8 +354,7 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
public DisplayStyle createDisplayStyleFromString(EDataType eDataType, String initialValue) {
DisplayStyle result = DisplayStyle.get(initialValue);
- if (result == null)
- {
+ if(result == null) {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return result;
@@ -349,7 +378,7 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
*/
@Override
public NattablestylePackage getNattablestylePackage() {
- return (NattablestylePackage) getEPackage();
+ return (NattablestylePackage)getEPackage();
}
/**
@@ -363,5 +392,4 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
public static NattablestylePackage getPackage() {
return NattablestylePackage.eINSTANCE;
}
-
} // NattablestyleFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
index cd630084497..b7c46187bec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
@@ -43,6 +43,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextS
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
@@ -65,6 +67,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
* @generated
*/
public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -183,6 +186,22 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*
* @generated
*/
+ private EClass eObjectValueStyleEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass eObjectListValueStyleEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EEnum cellTextAlignmentEEnum = null;
/**
@@ -194,10 +213,12 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
private EEnum displayStyleEEnum = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI
@@ -220,8 +241,8 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattablestylePackage#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
- * -->
+ * This method is used to initialize {@link NattablestylePackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -229,41 +250,24 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
* @generated
*/
public static NattablestylePackage init() {
- if (isInited) {
- return (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+ if(isInited) {
+ return (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
}
-
// Obtain or create and register package
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablestylePackageImpl());
-
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablestylePackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattablestylePackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -275,7 +279,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
theNattableaxisPackage.createPackageContents();
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
-
// Initialize created meta-data
theNattablestylePackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -287,11 +290,8 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
theNattableaxisPackage.initializePackageContents();
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattablestylePackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattablestylePackage.eNS_URI, theNattablestylePackage);
return theNattablestylePackage;
@@ -327,7 +327,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getNamedStyle_Name() {
- return (EAttribute) namedStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -349,7 +349,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_FontColor() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -360,7 +360,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_FontName() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);
}
/**
@@ -371,7 +371,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_FontHeight() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);
}
/**
@@ -382,7 +382,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_Bold() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);
}
/**
@@ -393,7 +393,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_Italic() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(4);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);
}
/**
@@ -404,7 +404,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_Underline() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(5);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);
}
/**
@@ -415,7 +415,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getFontStyle_StrikeThrough() {
- return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(6);
+ return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);
}
/**
@@ -437,7 +437,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getCellTextStyle_Alignment() {
- return (EAttribute) cellTextStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)cellTextStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -459,7 +459,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getIntValueStyle_IntValue() {
- return (EAttribute) intValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -481,7 +481,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getIntListValueStyle_IntListValue() {
- return (EAttribute) intListValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -503,7 +503,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getBooleanValueStyle_BooleanValue() {
- return (EAttribute) booleanValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -525,7 +525,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getBooleanListValueStyle_BooleanListValue() {
- return (EAttribute) booleanListValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -547,7 +547,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getDoubleValueStyle_DoubleValue() {
- return (EAttribute) doubleValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -569,7 +569,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getDoubleListValueStyle_DoubleListValue() {
- return (EAttribute) doubleListValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -591,7 +591,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getStringValueStyle_StringValue() {
- return (EAttribute) stringValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -613,7 +613,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getStringListValueStyle_StringListValue() {
- return (EAttribute) stringListValueStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -635,7 +635,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EReference getStyledElement_Styles() {
- return (EReference) styledElementEClass.getEStructuralFeatures().get(0);
+ return (EReference)styledElementEClass.getEStructuralFeatures().get(0);
}
/**
@@ -690,7 +690,51 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public EAttribute getTableDisplayStyle_DisplayStyle() {
- return (EAttribute) tableDisplayStyleEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)tableDisplayStyleEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EClass getEObjectValueStyle() {
+ return eObjectValueStyleEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EReference getEObjectValueStyle_EObjectValue() {
+ return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EClass getEObjectListValueStyle() {
+ return eObjectListValueStyleEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EReference getEObjectListValueStyle_EObjectValue() {
+ return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);
}
/**
@@ -723,7 +767,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
*/
@Override
public NattablestyleFactory getNattablestyleFactory() {
- return (NattablestyleFactory) getEFactoryInstance();
+ return (NattablestyleFactory)getEFactoryInstance();
}
/**
@@ -743,17 +787,14 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
styleEClass = createEClass(STYLE);
-
namedStyleEClass = createEClass(NAMED_STYLE);
createEAttribute(namedStyleEClass, NAMED_STYLE__NAME);
-
fontStyleEClass = createEClass(FONT_STYLE);
createEAttribute(fontStyleEClass, FONT_STYLE__FONT_COLOR);
createEAttribute(fontStyleEClass, FONT_STYLE__FONT_NAME);
@@ -762,43 +803,35 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
createEAttribute(fontStyleEClass, FONT_STYLE__ITALIC);
createEAttribute(fontStyleEClass, FONT_STYLE__UNDERLINE);
createEAttribute(fontStyleEClass, FONT_STYLE__STRIKE_THROUGH);
-
cellTextStyleEClass = createEClass(CELL_TEXT_STYLE);
createEAttribute(cellTextStyleEClass, CELL_TEXT_STYLE__ALIGNMENT);
-
intValueStyleEClass = createEClass(INT_VALUE_STYLE);
createEAttribute(intValueStyleEClass, INT_VALUE_STYLE__INT_VALUE);
-
intListValueStyleEClass = createEClass(INT_LIST_VALUE_STYLE);
createEAttribute(intListValueStyleEClass, INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
-
booleanValueStyleEClass = createEClass(BOOLEAN_VALUE_STYLE);
createEAttribute(booleanValueStyleEClass, BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE);
-
booleanListValueStyleEClass = createEClass(BOOLEAN_LIST_VALUE_STYLE);
createEAttribute(booleanListValueStyleEClass, BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
-
doubleValueStyleEClass = createEClass(DOUBLE_VALUE_STYLE);
createEAttribute(doubleValueStyleEClass, DOUBLE_VALUE_STYLE__DOUBLE_VALUE);
-
doubleListValueStyleEClass = createEClass(DOUBLE_LIST_VALUE_STYLE);
createEAttribute(doubleListValueStyleEClass, DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
-
stringValueStyleEClass = createEClass(STRING_VALUE_STYLE);
createEAttribute(stringValueStyleEClass, STRING_VALUE_STYLE__STRING_VALUE);
-
stringListValueStyleEClass = createEClass(STRING_LIST_VALUE_STYLE);
createEAttribute(stringListValueStyleEClass, STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
-
styledElementEClass = createEClass(STYLED_ELEMENT);
createEReference(styledElementEClass, STYLED_ELEMENT__STYLES);
createEOperation(styledElementEClass, STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING);
createEOperation(styledElementEClass, STYLED_ELEMENT___GET_STYLE__ECLASS);
createEOperation(styledElementEClass, STYLED_ELEMENT___CREATE_STYLE__ECLASS);
-
tableDisplayStyleEClass = createEClass(TABLE_DISPLAY_STYLE);
createEAttribute(tableDisplayStyleEClass, TABLE_DISPLAY_STYLE__DISPLAY_STYLE);
-
+ eObjectValueStyleEClass = createEClass(EOBJECT_VALUE_STYLE);
+ createEReference(eObjectValueStyleEClass, EOBJECT_VALUE_STYLE__EOBJECT_VALUE);
+ eObjectListValueStyleEClass = createEClass(EOBJECT_LIST_VALUE_STYLE);
+ createEReference(eObjectListValueStyleEClass, EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);
// Create enums
cellTextAlignmentEEnum = createEEnum(CELL_TEXT_ALIGNMENT);
displayStyleEEnum = createEEnum(DISPLAY_STYLE);
@@ -821,23 +854,18 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
namedStyleEClass.getESuperTypes().add(this.getStyle());
@@ -853,13 +881,12 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
stringListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
styledElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
tableDisplayStyleEClass.getESuperTypes().add(this.getStyle());
-
+ eObjectValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+ eObjectListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
// Initialize classes, features, and operations; add parameters
initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
@@ -868,52 +895,39 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
initEClass(cellTextStyleEClass, CellTextStyle.class, "CellTextStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getCellTextStyle_Alignment(), this.getCellTextAlignment(), "alignment", "MIDDLE_LEFT", 0, 1, CellTextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIntValueStyle_IntValue(), ecorePackage.getEInt(), "intValue", null, 0, 1, IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getIntListValueStyle_IntListValue(), ecorePackage.getEInt(), "intListValue", null, 0, -1, IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getBooleanValueStyle_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getBooleanListValueStyle_BooleanListValue(), ecorePackage.getEBooleanObject(),
- "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getBooleanListValueStyle_BooleanListValue(), ecorePackage.getEBooleanObject(), "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getDoubleValueStyle_DoubleValue(), ecorePackage.getEDouble(), "doubleValue", null, 0, 1, DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDoubleListValueStyle_DoubleListValue(), ecorePackage.getEDoubleObject(),
- "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
+ initEAttribute(getDoubleListValueStyle_DoubleListValue(), ecorePackage.getEDoubleObject(), "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getStringValueStyle_StringValue(), ecorePackage.getEString(), "stringValue", null, 0, 1, StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getStringListValueStyle_StringListValue(), ecorePackage.getEString(), "stringListValue", null, 0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(styledElementEClass, StyledElement.class, "StyledElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getStyledElement_Styles(), this.getStyle(), null, "styles", null, 0, -1, StyledElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
EOperation op = initEOperation(getStyledElement__GetNamedStyle__EClass_String(), this.getNamedStyle(), "getNamedStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
op = initEOperation(getStyledElement__GetStyle__EClass(), this.getStyle(), "getStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
op = initEOperation(getStyledElement__CreateStyle__EClass(), this.getStyle(), "createStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEClass(tableDisplayStyleEClass, TableDisplayStyle.class, "TableDisplayStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getTableDisplayStyle_DisplayStyle(), this.getDisplayStyle(), "displayStyle", "NORMAL", 1, 1, TableDisplayStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
+ initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEObjectValueStyle_EObjectValue(), ecorePackage.getEObject(), null, "eObjectValue", null, 0, 1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEObjectListValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
// Initialize enums and add enum literals
initEEnum(cellTextAlignmentEEnum, CellTextAlignment.class, "CellTextAlignment"); //$NON-NLS-1$
addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_LEFT);
@@ -925,11 +939,9 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_LEFT);
addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_CENTER);
addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_RIGHT);
-
initEEnum(displayStyleEEnum, DisplayStyle.class, "DisplayStyle"); //$NON-NLS-1$
addEEnumLiteral(displayStyleEEnum, DisplayStyle.NORMAL);
addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN);
addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN);
}
-
} // NattablestylePackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
index d7cfa555e4c..eb3a7955b62 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringLis
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value
+ * </em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {
+
/**
* The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -74,7 +76,7 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
*/
@Override
public EList<String> getStringListValue() {
- if (stringListValue == null) {
+ if(stringListValue == null) {
stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
}
return stringListValue;
@@ -88,7 +90,7 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
return getStringListValue();
}
@@ -104,10 +106,10 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
getStringListValue().clear();
- getStringListValue().addAll((Collection<? extends String>) newValue);
+ getStringListValue().addAll((Collection<? extends String>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -121,7 +123,7 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
getStringListValue().clear();
return;
@@ -137,7 +139,7 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
return stringListValue != null && !stringListValue.isEmpty();
}
@@ -152,15 +154,13 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (stringListValue: "); //$NON-NLS-1$
result.append(stringListValue);
result.append(')');
return result.toString();
}
-
} // StringListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
index 99540fe8d96..6cc4845895b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringVal
* @generated
*/
public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {
+
/**
* The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +97,7 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
public void setStringValue(String newStringValue) {
String oldStringValue = stringValue;
stringValue = newStringValue;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE, oldStringValue, stringValue));
}
}
@@ -109,7 +110,7 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
return getStringValue();
}
@@ -124,9 +125,9 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
- setStringValue((String) newValue);
+ setStringValue((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
setStringValue(STRING_VALUE_EDEFAULT);
return;
@@ -156,7 +157,7 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);
}
@@ -171,15 +172,13 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (stringValue: "); //$NON-NLS-1$
result.append(stringValue);
result.append(')');
return result.toString();
}
-
} // StringValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
index b99c6bf2e3b..1fe454b0a76 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
@@ -83,7 +83,7 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public EList<Style> getStyles() {
- if (styles == null) {
+ if(styles == null) {
styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);
}
return styles;
@@ -97,12 +97,12 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public NamedStyle getNamedStyle(EClass eClass, String name) {
- if (eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
- for (Iterator i = getStyles().iterator(); i.hasNext();) {
- Style style = (Style) i.next();
- if (style.eClass() == eClass || eClass.isInstance(style)) {
- if (style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {
- return (NamedStyle) style;
+ if(eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+ for(Iterator i = getStyles().iterator(); i.hasNext();) {
+ Style style = (Style)i.next();
+ if(style.eClass() == eClass || eClass.isInstance(style)) {
+ if(style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {
+ return (NamedStyle)style;
}
}
}
@@ -118,14 +118,14 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public Style getStyle(EClass eClass) {
- if (eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
- if (eClass.isSuperTypeOf(eClass())) {
- return (Style) this;
+ if(eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
+ if(eClass.isSuperTypeOf(eClass())) {
+ return (Style)this;
}
- if (eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {
- for (Iterator<?> i = getStyles().iterator(); i.hasNext();) {
- Style style = (Style) i.next();
- if (style.eClass() == eClass || eClass.isInstance(style)) {
+ if(eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {
+ for(Iterator<?> i = getStyles().iterator(); i.hasNext();) {
+ Style style = (Style)i.next();
+ if(style.eClass() == eClass || eClass.isInstance(style)) {
return style;
}
}
@@ -142,7 +142,7 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public Style createStyle(EClass eClass) {
- Style newStyle = (Style) eClass.getEPackage().getEFactoryInstance().create(eClass);
+ Style newStyle = (Style)eClass.getEPackage().getEFactoryInstance().create(eClass);
getStyles().add(newStyle);
return newStyle;
}
@@ -155,9 +155,9 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STYLED_ELEMENT__STYLES:
- return ((InternalEList<?>) getStyles()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getStyles()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -170,7 +170,7 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STYLED_ELEMENT__STYLES:
return getStyles();
}
@@ -186,10 +186,10 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STYLED_ELEMENT__STYLES:
getStyles().clear();
- getStyles().addAll((Collection<? extends Style>) newValue);
+ getStyles().addAll((Collection<? extends Style>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -203,7 +203,7 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STYLED_ELEMENT__STYLES:
getStyles().clear();
return;
@@ -219,7 +219,7 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.STYLED_ELEMENT__STYLES:
return styles != null && !styles.isEmpty();
}
@@ -234,13 +234,13 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING:
- return getNamedStyle((EClass) arguments.get(0), (String) arguments.get(1));
+ return getNamedStyle((EClass)arguments.get(0), (String)arguments.get(1));
case NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS:
- return getStyle((EClass) arguments.get(0));
+ return getStyle((EClass)arguments.get(0));
case NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS:
- return createStyle((EClass) arguments.get(0));
+ return createStyle((EClass)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
index bca223b0ebd..fcf38ad1779 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
* @generated
*/
public class TableDisplayStyleImpl extends EModelElementImpl implements TableDisplayStyle {
+
/**
* The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.
* <!-- begin-user-doc -->
@@ -98,7 +99,7 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
public void setDisplayStyle(DisplayStyle newDisplayStyle) {
DisplayStyle oldDisplayStyle = displayStyle;
displayStyle = newDisplayStyle == null ? DISPLAY_STYLE_EDEFAULT : newDisplayStyle;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE, oldDisplayStyle, displayStyle));
}
}
@@ -111,7 +112,7 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
return getDisplayStyle();
}
@@ -126,9 +127,9 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
- setDisplayStyle((DisplayStyle) newValue);
+ setDisplayStyle((DisplayStyle)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -142,7 +143,7 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
setDisplayStyle(DISPLAY_STYLE_EDEFAULT);
return;
@@ -158,7 +159,7 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
return displayStyle != DISPLAY_STYLE_EDEFAULT;
}
@@ -173,15 +174,13 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (displayStyle: "); //$NON-NLS-1$
result.append(displayStyle);
result.append(')');
return result.toString();
}
-
} // TableDisplayStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
index 917c47cd337..f8775abec36 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
@@ -22,6 +22,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanVa
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
@@ -43,6 +45,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
* @generated
*/
public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -60,7 +63,7 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattablestyleAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablestylePackage.eINSTANCE;
}
}
@@ -76,11 +79,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -92,88 +95,98 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattablestyleSwitch<Adapter> modelSwitch =
- new NattablestyleSwitch<Adapter>() {
- @Override
- public Adapter caseStyle(Style object) {
- return createStyleAdapter();
- }
-
- @Override
- public Adapter caseNamedStyle(NamedStyle object) {
- return createNamedStyleAdapter();
- }
-
- @Override
- public Adapter caseFontStyle(FontStyle object) {
- return createFontStyleAdapter();
- }
-
- @Override
- public Adapter caseCellTextStyle(CellTextStyle object) {
- return createCellTextStyleAdapter();
- }
-
- @Override
- public Adapter caseIntValueStyle(IntValueStyle object) {
- return createIntValueStyleAdapter();
- }
-
- @Override
- public Adapter caseIntListValueStyle(IntListValueStyle object) {
- return createIntListValueStyleAdapter();
- }
-
- @Override
- public Adapter caseBooleanValueStyle(BooleanValueStyle object) {
- return createBooleanValueStyleAdapter();
- }
-
- @Override
- public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {
- return createBooleanListValueStyleAdapter();
- }
-
- @Override
- public Adapter caseDoubleValueStyle(DoubleValueStyle object) {
- return createDoubleValueStyleAdapter();
- }
-
- @Override
- public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {
- return createDoubleListValueStyleAdapter();
- }
-
- @Override
- public Adapter caseStringValueStyle(StringValueStyle object) {
- return createStringValueStyleAdapter();
- }
-
- @Override
- public Adapter caseStringListValueStyle(StringListValueStyle object) {
- return createStringListValueStyleAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter caseTableDisplayStyle(TableDisplayStyle object) {
- return createTableDisplayStyleAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattablestyleSwitch<Adapter> modelSwitch = new NattablestyleSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseStyle(Style object) {
+ return createStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseNamedStyle(NamedStyle object) {
+ return createNamedStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseFontStyle(FontStyle object) {
+ return createFontStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseCellTextStyle(CellTextStyle object) {
+ return createCellTextStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseIntValueStyle(IntValueStyle object) {
+ return createIntValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseIntListValueStyle(IntListValueStyle object) {
+ return createIntListValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseBooleanValueStyle(BooleanValueStyle object) {
+ return createBooleanValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {
+ return createBooleanListValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseDoubleValueStyle(DoubleValueStyle object) {
+ return createDoubleValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {
+ return createDoubleListValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseStringValueStyle(StringValueStyle object) {
+ return createStringValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseStringListValueStyle(StringListValueStyle object) {
+ return createStringListValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter caseTableDisplayStyle(TableDisplayStyle object) {
+ return createTableDisplayStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseEObjectValueStyle(EObjectValueStyle object) {
+ return createEObjectValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseEObjectListValueStyle(EObjectListValueStyle object) {
+ return createEObjectListValueStyleAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -181,16 +194,15 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.
* <!-- begin-user-doc -->
@@ -207,7 +219,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle
+ * <em>Named Style</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.
@@ -222,7 +235,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle
+ * <em>Font Style</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.
@@ -237,7 +251,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle
+ * <em>Cell Text Style</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.
@@ -252,7 +267,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle
+ * <em>Int Value Style</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.
@@ -267,7 +283,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle
+ * <em>Int List Value Style</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.
@@ -282,7 +299,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle
+ * <em>Boolean Value Style</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.
@@ -297,7 +315,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle
+ * <em>Boolean List Value Style</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.
@@ -312,7 +331,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle
+ * <em>Double Value Style</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.
@@ -327,7 +347,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle
+ * <em>Double List Value Style</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.
@@ -342,7 +363,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle
+ * <em>String Value Style</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.
@@ -357,7 +379,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle
+ * <em>String List Value Style</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.
@@ -372,7 +395,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -387,7 +411,8 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle
+ * <em>Table Display Style</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.
@@ -402,6 +427,38 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+ * <em>EObject Value Style</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.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+ * @generated
+ */
+ public Adapter createEObjectValueStyleAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+ * <em>EObject List Value Style</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.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+ * @generated
+ */
+ public Adapter createEObjectListValueStyleAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
@@ -428,5 +485,4 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattablestyleAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
index 646cd3b6a34..b21a255ec0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
@@ -21,6 +21,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanVa
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
@@ -46,6 +48,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
* @generated
*/
public class NattablestyleSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -63,7 +66,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* @generated
*/
public NattablestyleSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablestylePackage.eINSTANCE;
}
}
@@ -92,217 +95,267 @@ public class NattablestyleSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattablestylePackage.STYLE: {
- Style style = (Style) theEObject;
+ switch(classifierID) {
+ case NattablestylePackage.STYLE:
+ {
+ Style style = (Style)theEObject;
T result = caseStyle(style);
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(style);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.NAMED_STYLE: {
- NamedStyle namedStyle = (NamedStyle) theEObject;
+ case NattablestylePackage.NAMED_STYLE:
+ {
+ NamedStyle namedStyle = (NamedStyle)theEObject;
T result = caseNamedStyle(namedStyle);
- if (result == null) {
+ if(result == null) {
result = caseStyle(namedStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(namedStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.FONT_STYLE: {
- FontStyle fontStyle = (FontStyle) theEObject;
+ case NattablestylePackage.FONT_STYLE:
+ {
+ FontStyle fontStyle = (FontStyle)theEObject;
T result = caseFontStyle(fontStyle);
- if (result == null) {
+ if(result == null) {
result = caseStyle(fontStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(fontStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.CELL_TEXT_STYLE: {
- CellTextStyle cellTextStyle = (CellTextStyle) theEObject;
+ case NattablestylePackage.CELL_TEXT_STYLE:
+ {
+ CellTextStyle cellTextStyle = (CellTextStyle)theEObject;
T result = caseCellTextStyle(cellTextStyle);
- if (result == null) {
+ if(result == null) {
result = caseStyle(cellTextStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(cellTextStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.INT_VALUE_STYLE: {
- IntValueStyle intValueStyle = (IntValueStyle) theEObject;
+ case NattablestylePackage.INT_VALUE_STYLE:
+ {
+ IntValueStyle intValueStyle = (IntValueStyle)theEObject;
T result = caseIntValueStyle(intValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(intValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(intValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(intValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.INT_LIST_VALUE_STYLE: {
- IntListValueStyle intListValueStyle = (IntListValueStyle) theEObject;
+ case NattablestylePackage.INT_LIST_VALUE_STYLE:
+ {
+ IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;
T result = caseIntListValueStyle(intListValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(intListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(intListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(intListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.BOOLEAN_VALUE_STYLE: {
- BooleanValueStyle booleanValueStyle = (BooleanValueStyle) theEObject;
+ case NattablestylePackage.BOOLEAN_VALUE_STYLE:
+ {
+ BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;
T result = caseBooleanValueStyle(booleanValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(booleanValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(booleanValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(booleanValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: {
- BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle) theEObject;
+ case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE:
+ {
+ BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;
T result = caseBooleanListValueStyle(booleanListValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(booleanListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(booleanListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(booleanListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.DOUBLE_VALUE_STYLE: {
- DoubleValueStyle doubleValueStyle = (DoubleValueStyle) theEObject;
+ case NattablestylePackage.DOUBLE_VALUE_STYLE:
+ {
+ DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;
T result = caseDoubleValueStyle(doubleValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(doubleValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(doubleValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(doubleValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: {
- DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle) theEObject;
+ case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE:
+ {
+ DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;
T result = caseDoubleListValueStyle(doubleListValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(doubleListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(doubleListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(doubleListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.STRING_VALUE_STYLE: {
- StringValueStyle stringValueStyle = (StringValueStyle) theEObject;
+ case NattablestylePackage.STRING_VALUE_STYLE:
+ {
+ StringValueStyle stringValueStyle = (StringValueStyle)theEObject;
T result = caseStringValueStyle(stringValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(stringValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(stringValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(stringValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.STRING_LIST_VALUE_STYLE: {
- StringListValueStyle stringListValueStyle = (StringListValueStyle) theEObject;
+ case NattablestylePackage.STRING_LIST_VALUE_STYLE:
+ {
+ StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;
T result = caseStringListValueStyle(stringListValueStyle);
- if (result == null) {
+ if(result == null) {
result = caseNamedStyle(stringListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseStyle(stringListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(stringListValueStyle);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.STYLED_ELEMENT: {
- StyledElement styledElement = (StyledElement) theEObject;
+ case NattablestylePackage.STYLED_ELEMENT:
+ {
+ StyledElement styledElement = (StyledElement)theEObject;
T result = caseStyledElement(styledElement);
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(styledElement);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattablestylePackage.TABLE_DISPLAY_STYLE: {
- TableDisplayStyle tableDisplayStyle = (TableDisplayStyle) theEObject;
+ case NattablestylePackage.TABLE_DISPLAY_STYLE:
+ {
+ TableDisplayStyle tableDisplayStyle = (TableDisplayStyle)theEObject;
T result = caseTableDisplayStyle(tableDisplayStyle);
- if (result == null) {
+ if(result == null) {
result = caseStyle(tableDisplayStyle);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(tableDisplayStyle);
}
- if (result == null) {
+ if(result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case NattablestylePackage.EOBJECT_VALUE_STYLE:
+ {
+ EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;
+ T result = caseEObjectValueStyle(eObjectValueStyle);
+ if(result == null) {
+ result = caseNamedStyle(eObjectValueStyle);
+ }
+ if(result == null) {
+ result = caseStyle(eObjectValueStyle);
+ }
+ if(result == null) {
+ result = caseEModelElement(eObjectValueStyle);
+ }
+ if(result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE:
+ {
+ EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;
+ T result = caseEObjectListValueStyle(eObjectListValueStyle);
+ if(result == null) {
+ result = caseNamedStyle(eObjectListValueStyle);
+ }
+ if(result == null) {
+ result = caseStyle(eObjectListValueStyle);
+ }
+ if(result == null) {
+ result = caseEModelElement(eObjectListValueStyle);
+ }
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -320,7 +373,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -337,7 +390,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Named Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -354,7 +407,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Font Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -371,7 +424,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -388,7 +441,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Int Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -405,7 +458,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -422,7 +475,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -439,7 +492,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -456,7 +509,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Double Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -473,7 +526,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -490,7 +543,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>String Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -507,7 +560,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>String List Value Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -524,7 +577,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -541,7 +594,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -551,6 +604,40 @@ public class NattablestyleSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseEObjectValueStyle(EObjectValueStyle object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseEObjectListValueStyle(EObjectListValueStyle object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
@@ -558,7 +645,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -575,7 +662,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -584,5 +671,4 @@ public class NattablestyleSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattablestyleSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
index 008c054d4b2..e37bd3e1ac2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public interface AbstractTableTester extends StyledElement {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -40,5 +41,4 @@ public interface AbstractTableTester extends StyledElement {
* @generated
*/
Object getTester();
-
} // AbstractTableTester
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
index 08ff4beb3a3..e0a4ba3e9c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
@@ -12,14 +12,14 @@
*/
package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Java Table Tester</b></em>'.
* <!-- end-user-doc -->
*
* <!-- begin-model-doc -->
- * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.
+ * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point
+ * org.eclipse.papyrus.infra.nattable.tester.
* The field tester must be the id declared in this extension point.
* <!-- end-model-doc -->
*
@@ -35,6 +35,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
* @generated
*/
public interface JavaTableTester extends AbstractTableTester {
+
/**
* Returns the value of the '<em><b>Tester</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -53,15 +54,15 @@ public interface JavaTableTester extends AbstractTableTester {
String getTester();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Tester</em>' attribute.
+ * the new value of the '<em>Tester</em>' attribute.
* @see #getTester()
* @generated
*/
void setTester(String value);
-
} // JavaTableTester
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
index 1e075c9f589..c1efd082f61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface NattabletesterFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
@@ -52,5 +53,4 @@ public interface NattabletesterFactory extends EFactory {
* @generated
*/
NattabletesterPackage getNattabletesterPackage();
-
} // NattabletesterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
index 15611ff4974..bb9feca3f88 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
* @generated
*/
public interface NattabletesterPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
@@ -73,7 +74,8 @@ public interface NattabletesterPackage extends EPackage {
NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+ * <em>Abstract Table Tester</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -174,7 +176,8 @@ public interface NattabletesterPackage extends EPackage {
int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+ * <em>Java Table Tester</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -284,9 +287,9 @@ public interface NattabletesterPackage extends EPackage {
*/
int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;
-
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+ * <em>Abstract Table Tester</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -297,7 +300,8 @@ public interface NattabletesterPackage extends EPackage {
EClass getAbstractTableTester();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()
+ * <em>Get Tester</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -308,7 +312,8 @@ public interface NattabletesterPackage extends EPackage {
EOperation getAbstractTableTester__GetTester();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+ * <em>Java Table Tester</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -319,7 +324,8 @@ public interface NattabletesterPackage extends EPackage {
EClass getJavaTableTester();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester
+ * <em>Tester</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -355,8 +361,10 @@ public interface NattabletesterPackage extends EPackage {
* @generated
*/
interface Literals {
+
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+ * <em>Abstract Table Tester</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -376,7 +384,8 @@ public interface NattabletesterPackage extends EPackage {
EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+ * <em>Java Table Tester</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -394,7 +403,5 @@ public interface NattabletesterPackage extends EPackage {
* @generated
*/
EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();
-
}
-
} // NattabletesterPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
index 3cce71615bb..4be18118478 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public abstract class AbstractTableTesterImpl extends StyledElementImpl implements AbstractTableTester {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -72,11 +73,10 @@ public abstract class AbstractTableTesterImpl extends StyledElementImpl implemen
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:
return getTester();
}
return super.eInvoke(operationID, arguments);
}
-
} // AbstractTableTesterImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
index 81d24245e6e..c13f7106dfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {
+
/**
* The default value of the '{@link #getTester() <em>Tester</em>}' attribute.
* <!-- begin-user-doc -->
@@ -96,7 +97,7 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
public void setTester(String newTester) {
String oldTester = tester;
tester = newTester;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));
}
}
@@ -109,7 +110,7 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
return getTester();
}
@@ -124,9 +125,9 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
- setTester((String) newValue);
+ setTester((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -140,7 +141,7 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
setTester(TESTER_EDEFAULT);
return;
@@ -156,7 +157,7 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);
}
@@ -171,15 +172,13 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
-
StringBuffer result = new StringBuffer(super.toString());
result.append(" (tester: "); //$NON-NLS-1$
result.append(tester);
result.append(')');
return result.toString();
}
-
} // JavaTableTesterImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
index c305908c70b..db3a595de13 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -38,8 +39,8 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
*/
public static NattabletesterFactory init() {
try {
- NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory) EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);
- if (theNattabletesterFactory != null) {
+ NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);
+ if(theNattabletesterFactory != null) {
return theNattabletesterFactory;
}
} catch (Exception exception) {
@@ -67,7 +68,7 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case NattabletesterPackage.JAVA_TABLE_TESTER:
return createJavaTableTester();
default:
@@ -95,7 +96,7 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
*/
@Override
public NattabletesterPackage getNattabletesterPackage() {
- return (NattabletesterPackage) getEPackage();
+ return (NattabletesterPackage)getEPackage();
}
/**
@@ -109,5 +110,4 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
public static NattabletesterPackage getPackage() {
return NattabletesterPackage.eINSTANCE;
}
-
} // NattabletesterFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
index 5ba4e36daa0..30e5e8eb8bb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -66,10 +67,12 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
private EClass javaTableTesterEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI
@@ -92,8 +95,8 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link NattabletesterPackage#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
- * -->
+ * This method is used to initialize {@link NattabletesterPackage#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 -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -101,41 +104,24 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
* @generated
*/
public static NattabletesterPackage init() {
- if (isInited) {
- return (NattabletesterPackage) EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+ if(isInited) {
+ return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
}
-
// Obtain or create and register package
- NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());
-
+ NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());
isInited = true;
-
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
-
// Obtain or create and register interdependencies
- NattablePackageImpl theNattablePackage = (NattablePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI)
- : NattablePackage.eINSTANCE);
- NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableconfigurationPackage.eNS_URI)
- : NattableconfigurationPackage.eINSTANCE);
- NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
- NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablelabelproviderPackage.eNS_URI)
- : NattablelabelproviderPackage.eINSTANCE);
- NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableaxisconfigurationPackage.eNS_URI)
- : NattableaxisconfigurationPackage.eINSTANCE);
- NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI)
- : NattableaxisPackage.eINSTANCE);
- NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI)
- : NattablecellPackage.eINSTANCE);
- NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
- NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
-
+ NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+ NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+ NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+ NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+ NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+ NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+ NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
// Create package meta-data objects
theNattabletesterPackage.createPackageContents();
theNattablePackage.createPackageContents();
@@ -147,7 +133,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
theNattablecellPackage.createPackageContents();
theNattableproblemPackage.createPackageContents();
theNattablestylePackage.createPackageContents();
-
// Initialize created meta-data
theNattabletesterPackage.initializePackageContents();
theNattablePackage.initializePackageContents();
@@ -159,11 +144,8 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
theNattablecellPackage.initializePackageContents();
theNattableproblemPackage.initializePackageContents();
theNattablestylePackage.initializePackageContents();
-
// Mark meta-data to indicate it can't be changed
theNattabletesterPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);
return theNattabletesterPackage;
@@ -210,7 +192,7 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
*/
@Override
public EAttribute getJavaTableTester_Tester() {
- return (EAttribute) javaTableTesterEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);
}
/**
@@ -221,7 +203,7 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
*/
@Override
public NattabletesterFactory getNattabletesterFactory() {
- return (NattabletesterFactory) getEFactoryInstance();
+ return (NattabletesterFactory)getEFactoryInstance();
}
/**
@@ -241,15 +223,13 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
-
// Create classes and their features
abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);
createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);
-
javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);
createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);
}
@@ -271,34 +251,25 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Obtain other dependent packages
- NattablestylePackage theNattablestylePackage = (NattablestylePackage) EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
-
+ NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
abstractTableTesterEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
javaTableTesterEClass.getESuperTypes().add(this.getAbstractTableTester());
-
// Initialize classes, features, and operations; add parameters
initEClass(abstractTableTesterEClass, AbstractTableTester.class, "AbstractTableTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEOperation(getAbstractTableTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
initEClass(javaTableTesterEClass, JavaTableTester.class, "JavaTableTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getJavaTableTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
}
-
} // NattabletesterPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
index 47694c716bd..74e3897648c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -49,7 +50,7 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattabletesterAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattabletesterPackage.eINSTANCE;
}
}
@@ -65,11 +66,11 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -81,33 +82,33 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattabletesterSwitch<Adapter> modelSwitch =
- new NattabletesterSwitch<Adapter>() {
- @Override
- public Adapter caseAbstractTableTester(AbstractTableTester object) {
- return createAbstractTableTesterAdapter();
- }
-
- @Override
- public Adapter caseJavaTableTester(JavaTableTester object) {
- return createJavaTableTesterAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseAbstractTableTester(AbstractTableTester object) {
+ return createAbstractTableTesterAdapter();
+ }
+
+ @Override
+ public Adapter caseJavaTableTester(JavaTableTester object) {
+ return createJavaTableTesterAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -115,18 +116,18 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+ * <em>Abstract Table Tester</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.
@@ -141,7 +142,8 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+ * <em>Java Table Tester</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.
@@ -171,7 +173,8 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -197,5 +200,4 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattabletesterAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
index 25b787f31f0..aa9d7ed4917 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
* @generated
*/
public class NattabletesterSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -52,7 +53,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* @generated
*/
public NattabletesterSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattabletesterPackage.eINSTANCE;
}
}
@@ -81,34 +82,36 @@ public class NattabletesterSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {
- AbstractTableTester abstractTableTester = (AbstractTableTester) theEObject;
+ switch(classifierID) {
+ case NattabletesterPackage.ABSTRACT_TABLE_TESTER:
+ {
+ AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;
T result = caseAbstractTableTester(abstractTableTester);
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(abstractTableTester);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(abstractTableTester);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case NattabletesterPackage.JAVA_TABLE_TESTER: {
- JavaTableTester javaTableTester = (JavaTableTester) theEObject;
+ case NattabletesterPackage.JAVA_TABLE_TESTER:
+ {
+ JavaTableTester javaTableTester = (JavaTableTester)theEObject;
T result = caseJavaTableTester(javaTableTester);
- if (result == null) {
+ if(result == null) {
result = caseAbstractTableTester(javaTableTester);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(javaTableTester);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(javaTableTester);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -126,7 +129,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -143,7 +146,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -160,7 +163,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -177,7 +180,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -194,7 +197,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -203,5 +206,4 @@ public class NattabletesterSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattabletesterSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
index 4abeb298d4a..444a325003f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -49,7 +50,7 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public NattableAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablePackage.eINSTANCE;
}
}
@@ -65,11 +66,11 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -81,33 +82,33 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected NattableSwitch<Adapter> modelSwitch =
- new NattableSwitch<Adapter>() {
- @Override
- public Adapter caseTable(Table object) {
- return createTableAdapter();
- }
-
- @Override
- public Adapter caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
-
- @Override
- public Adapter caseStyledElement(StyledElement object) {
- return createStyledElementAdapter();
- }
-
- @Override
- public Adapter caseTableNamedElement(TableNamedElement object) {
- return createTableNamedElementAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {
+
+ @Override
+ public Adapter caseTable(Table object) {
+ return createTableAdapter();
+ }
+
+ @Override
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
+ }
+
+ @Override
+ public Adapter caseStyledElement(StyledElement object) {
+ return createStyledElementAdapter();
+ }
+
+ @Override
+ public Adapter caseTableNamedElement(TableNamedElement object) {
+ return createTableNamedElementAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -115,16 +116,15 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
* <!-- begin-user-doc -->
@@ -156,7 +156,8 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+ * <em>Styled Element</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.
@@ -171,7 +172,8 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+ * <em>Table Named Element</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.
@@ -197,5 +199,4 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
public Adapter createEObjectAdapter() {
return null;
}
-
} // NattableAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
index 915121e004b..3f035c9a96b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
* @generated
*/
public class NattableSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -52,7 +53,7 @@ public class NattableSwitch<T> extends Switch<T> {
* @generated
*/
public NattableSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = NattablePackage.eINSTANCE;
}
}
@@ -81,20 +82,21 @@ public class NattableSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case NattablePackage.TABLE: {
- Table table = (Table) theEObject;
+ switch(classifierID) {
+ case NattablePackage.TABLE:
+ {
+ Table table = (Table)theEObject;
T result = caseTable(table);
- if (result == null) {
+ if(result == null) {
result = caseTableNamedElement(table);
}
- if (result == null) {
+ if(result == null) {
result = caseStyledElement(table);
}
- if (result == null) {
+ if(result == null) {
result = caseEModelElement(table);
}
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -112,7 +114,7 @@ public class NattableSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -129,7 +131,7 @@ public class NattableSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -146,7 +148,7 @@ public class NattableSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -163,7 +165,7 @@ public class NattableSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -180,7 +182,7 @@ public class NattableSwitch<T> extends Switch<T> {
* <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
@@ -189,5 +191,4 @@ public class NattableSwitch<T> extends Switch<T> {
public T defaultCase(EObject object) {
return null;
}
-
} // NattableSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
index 66d2e67ef1a..d23733901eb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.u
* @generated
*/
public class NattableValidator extends EObjectValidator {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -42,7 +43,8 @@ public class NattableValidator extends EObjectValidator {
public static final NattableValidator INSTANCE = new NattableValidator();
/**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+ * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+ * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -112,9 +114,9 @@ public class NattableValidator extends EObjectValidator {
*/
@Override
protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
- switch (classifierID) {
+ switch(classifierID) {
case NattablePackage.TABLE:
- return validateTable((Table) value, diagnostics, context);
+ return validateTable((Table)value, diagnostics, context);
default:
return true;
}
@@ -127,41 +129,41 @@ public class NattableValidator extends EObjectValidator {
* @generated
*/
public boolean validateTable(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(table, diagnostics, context)) {
+ if(!validate_NoCircularContainment(table, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(table, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= nattableconfigurationValidator.validateTableNamedElement_nonEmptyName(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateTable_currentAxisProvidersTypes(table, diagnostics, context);
}
return result;
@@ -184,15 +186,9 @@ public class NattableValidator extends EObjectValidator {
* @generated
*/
public boolean validateTable_currentRowAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattablePackage.Literals.TABLE,
- table,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "currentRowAxisInHistory", //$NON-NLS-1$
- TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "currentRowAxisInHistory", //$NON-NLS-1$
+ TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -212,15 +208,9 @@ public class NattableValidator extends EObjectValidator {
* @generated
*/
public boolean validateTable_currentColumnAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattablePackage.Literals.TABLE,
- table,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "currentColumnAxisInHistory", //$NON-NLS-1$
- TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "currentColumnAxisInHistory", //$NON-NLS-1$
+ TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -240,15 +230,9 @@ public class NattableValidator extends EObjectValidator {
* @generated
*/
public boolean validateTable_currentAxisProvidersTypes(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate(NattablePackage.Literals.TABLE,
- table,
- diagnostics,
- context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
- "currentAxisProvidersTypes", //$NON-NLS-1$
- TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION,
- Diagnostic.ERROR,
- DIAGNOSTIC_SOURCE,
- 0);
+ return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+ "currentAxisProvidersTypes", //$NON-NLS-1$
+ TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);
}
/**
@@ -265,5 +249,4 @@ public class NattableValidator extends EObjectValidator {
// Ensure that you remove @generated or mark it @generated NOT
return super.getResourceLocator();
}
-
} // NattableValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java
index 43e5f97f0f3..d07d7d43fb2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java
@@ -10,7 +10,6 @@
* CEA LIST - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.infra.nattable.model.factory;
import org.eclipse.emf.ecore.EObject;
@@ -43,35 +42,33 @@ public class IAxisFactory {
/**
*
* @param parent
- * the parent for the tree axis item
+ * the parent for the tree axis item
* @param object
- * the object to represent with a ITreeItemAxis
+ * the object to represent with a ITreeItemAxis
* @param manager
- * the axis manager representation for the new axis
+ * the axis manager representation for the new axis
* @return
* the created ITreeAxisItem for the object
*/
public static final ITreeItemAxis createITreeItemAxis(ITreeItemAxis parent, Object object, AxisManagerRepresentation manager, String alias) {
ITreeItemAxis createdAxis = null;
-
- if (object instanceof Integer || object instanceof Float || object instanceof Boolean) {
+ if(object instanceof Integer || object instanceof Float || object instanceof Boolean) {
object = object.toString();
}
- if (object instanceof String) {
+ if(object instanceof String) {
IdTreeItemAxis newAxis = NattableaxisFactory.eINSTANCE.createIdTreeItemAxis();
- newAxis.setElement((String) object);
+ newAxis.setElement((String)object);
createdAxis = newAxis;
- } else if (object instanceof EStructuralFeature) {
+ } else if(object instanceof EStructuralFeature) {
EStructuralFeatureTreeItemAxis newAxis = NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis();
- newAxis.setElement((EStructuralFeature) object);
+ newAxis.setElement((EStructuralFeature)object);
createdAxis = newAxis;
- } else if (object instanceof EObject) {
+ } else if(object instanceof EObject) {
EObjectTreeItemAxis newAxis = NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis();
- newAxis.setElement((EObject) object);
+ newAxis.setElement((EObject)object);
createdAxis = newAxis;
}
-
- if (createdAxis == null) {
+ if(createdAxis == null) {
throw new UnsupportedOperationException(NLS.bind("The creation for {0} is not yet implemented", object)); //$NON-NLS-1$
} else {
createdAxis.setParent(parent);
@@ -84,19 +81,19 @@ public class IAxisFactory {
/**
*
* @param object
- * an object representing a feature
+ * an object representing a feature
* @return
* a feature axis to represent it
*/
public static final FeatureAxis createAxisForFeature(Object object, AxisManagerRepresentation manager, String alias) {
- if (object instanceof String) {
+ if(object instanceof String) {
FeatureIdAxis axis = NattableaxisFactory.eINSTANCE.createFeatureIdAxis();
- axis.setElement((String) object);
+ axis.setElement((String)object);
return axis;
}
- if (object instanceof EStructuralFeature) {
+ if(object instanceof EStructuralFeature) {
EStructuralFeatureAxis axis = NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis();
- axis.setElement((EStructuralFeature) object);
+ axis.setElement((EStructuralFeature)object);
return axis;
}
throw new UnsupportedOperationException(NLS.bind("The creation for {0} is not yet implemented", object)); //$NON-NLS-1$
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index 44cc6b0c3ff..e129c885373 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.emf.databinding,
org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 9bdd2c16682..104ac803b13 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -11,7 +11,11 @@ Export-Package: org.eclipse.papyrus.infra.nattable,
org.eclipse.papyrus.infra.nattable.copy,
org.eclipse.papyrus.infra.nattable.dataprovider,
org.eclipse.papyrus.infra.nattable.dialog,
+ org.eclipse.papyrus.infra.nattable.display.converter,
org.eclipse.papyrus.infra.nattable.export,
+ org.eclipse.papyrus.infra.nattable.filter,
+ org.eclipse.papyrus.infra.nattable.filter.configuration,
+ org.eclipse.papyrus.infra.nattable.filter.validator,
org.eclipse.papyrus.infra.nattable.formatter,
org.eclipse.papyrus.infra.nattable.handler,
org.eclipse.papyrus.infra.nattable.helper.advice,
@@ -57,12 +61,11 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.core.expressions,
org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
- org.apache.commons.lang,
com.google.guava;bundle-version="11.0.0",
org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.1.0,2.0.0)",
ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
index d63f5914ed3..bed51310e56 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
@@ -7,6 +7,7 @@
<extension-point id="org.eclipse.papyrus.infra.nattable.configuration" name="Nattable Configuration" schema="schema/org.eclipse.papyrus.infra.nattable.configuration.exsd"/>
<extension-point id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester" schema="schema/org.eclipse.papyrus.infra.nattable.tester.exsd"/>
<extension-point id="org.eclipse.papyrus.infra.nattable.paste.postactions" name="Paste Post Actions" schema="schema/org.eclipse.papyrus.infra.nattable.paste.postactions.exsd"/>
+ <extension-point id="org.eclipse.papyrus.infra.nattable.filter.configuration" name="FilterConfiguration" schema="schema/org.eclipse.papyrus.infra.nattable.filter.configuration.exsd"/>
<extension
point="org.eclipse.ui.menus">
<menuContribution
@@ -264,6 +265,10 @@
commandId="org.eclipse.papyrus.infra.nattable.column.display.label"
style="toggle">
</command>
+ <command
+ commandId="org.eclipse.papyrus.infra.nattable.column.display.filter"
+ style="toggle">
+ </command>
<menu
icon="icons/columnIndex.png"
label="Index Style">
@@ -938,6 +943,15 @@
</state>
</command>
<command
+ defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayFilterHandler"
+ id="org.eclipse.papyrus.infra.nattable.column.display.filter"
+ name="Display Row Filter">
+ <state
+ class="org.eclipse.ui.handlers.RegistryToggleState:true"
+ id="org.eclipse.ui.commands.toggleState">
+ </state>
+ </command>
+ <command
defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ChangeIndexColumnStyleHandler"
id="org.eclipse.papyrus.infra.nattable.column.index.style"
name="Change Column Index Style">
@@ -1474,4 +1488,11 @@
icon="icons/collapseAllBranch.png">
</image>
</extension>
+ <extension
+ point="org.eclipse.papyrus.infra.nattable.filter.configuration">
+ <configuration
+ class="org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration"
+ order="100000">
+ </configuration>
+ </extension>
</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.filter.configuration.exsd b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.filter.configuration.exsd
new file mode 100755
index 00000000000..006c2f40dea
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.filter.configuration.exsd
@@ -0,0 +1,135 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.filter.configuration" name="FilterCellEditorConfiguration"/>
+ </appinfo>
+ <documentation>
+ An extension point to register celleditor to use for filters. A configuration determines how to edit the cell
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="configuration">
+ <annotation>
+ <documentation>
+ This extension point allows to register configuration to use for filters in the table
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+ The class providing the configuration for filters in the table
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.filter.IFilterConfiguration"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="order" type="string" use="required">
+ <annotation>
+ <documentation>
+ Several configuration can be used for the same type, so we use this attribute to sort them.
+more the order is small, more the configuration is prioritary.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ MDT Papyrus 1.1.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ See Papyrus nattable plugins
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ none
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ none
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ /*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
index 16976656945..9d449e2b73c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
@@ -47,7 +47,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
index 2f70b668984..bd9e7d6004a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
@@ -68,7 +68,7 @@ public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {
*/
@Override
public Text createEditorControl(Composite parent) {
- IBindingService service = PlatformUI.getWorkbench().getService(IBindingService.class);
+ IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
this.initialValueForFilteringKeyPress = service.isKeyFilterEnabled();
if (this.initialValueForFilteringKeyPress) {
service.setKeyFilterEnabled(false);
@@ -113,7 +113,7 @@ public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {
@Override
public void close() {
if (this.initialValueForFilteringKeyPress) {
- IBindingService service = PlatformUI.getWorkbench().getService(IBindingService.class);
+ IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
service.setKeyFilterEnabled(this.initialValueForFilteringKeyPress);
}
super.close();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
index 3ff44ec792e..f5ecd423ab4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
@@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
@@ -35,8 +36,6 @@ public class CellEditorConfigurationFactory {
public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$
- // public static final String FACTORY_ID_ATTRIBUTE = "id"; //$NON-NLS-1$
-
public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
@@ -74,9 +73,25 @@ public class CellEditorConfigurationFactory {
* the id of the factory
* @return
* the cellEditorFactory declared on this id or <code>null</code> if not found
+ *
+ * @deprecated since Papyrus 1.1.0
*/
+ @Deprecated
public IAxisCellEditorConfiguration getCellEditorConfigruation(final String configurationId) {
- assert configurationId != null;
+ return getCellEditorConfiguration(configurationId);
+ }
+
+ /**
+ *
+ * @param configurationId
+ * the id of the factory
+ * @return
+ * the cellEditorFactory declared on this id or <code>null</code> if not found
+ *
+ *
+ */
+ public IAxisCellEditorConfiguration getCellEditorConfiguration(final String configurationId) {
+ Assert.isNotNull(configurationId);
for (final Integer order : this.registry.keySet()) {
final IAxisCellEditorConfiguration current = this.registry.get(order);
if (configurationId.equals(current.getEditorConfigId())) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
index d00c6af7e1d..9b11dc6aa1c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
@@ -21,7 +21,9 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* A specific interface to declare editor on specific EStructuralFeature
*
+ * @deprecated because never used, since Papyrus 1.1.0
*/
+@Deprecated
public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {
/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
index 546e4bf1632..065c9ec75b2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
@@ -29,6 +29,8 @@ public class CommandIds {
public static final String COMMAND_COLUMN_DISPLAY_LABEL_ID = "org.eclipse.papyrus.infra.nattable.column.display.label"; //$NON-NLS-1$
+ public static final String COMMAND_COLUMN_DISPLAY_FILTER_ID = "org.eclipse.papyrus.infra.nattable.column.display.filter"; //$NON-NLS-1$
+
public static final String COMMAND_COLUMN_DISPLAY_INDEX_STYLE_ID = "org.eclipse.papyrus.infra.nattable.column.index.style"; //$NON-NLS-1$
public static final String COMMAND_ROW_DISPLAY_INDEX_ID = "org.eclipse.papyrus.infra.nattable.row.display.index"; //$NON-NLS-1$
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
index 6d312797dc2..dc5e7c80891 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
@@ -409,7 +409,7 @@ public class TableCommands {
* the command doing the set value
*/
public static ICommand getSetIAxisConfigurationValueCommand(final Table table, final IAxisConfiguration editedConfiguration, final EStructuralFeature managedFeature, final Object value, boolean onColumn) {
- final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command");
+ final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command"); //$NON-NLS-1$
final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
final EObject parent = editedConfiguration.eContainer();
IAxisConfiguration realEditedObject = editedConfiguration;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/UpdateFilterMapCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/UpdateFilterMapCommand.java
new file mode 100755
index 00000000000..3cbc87e7989
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/UpdateFilterMapCommand.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.command;
+
+import org.eclipse.nebula.widgets.nattable.command.AbstractContextFreeCommand;
+import org.eclipse.papyrus.infra.nattable.layer.FilterRowDataLayer;
+
+/**
+ * This class allows us to update the map in {@link FilterRowDataLayer}
+ *
+ */
+public class UpdateFilterMapCommand extends AbstractContextFreeCommand {
+
+ /**
+ * the index for which we want update the filter map
+ */
+ private int index;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param indexToUpdate
+ * the column index for which we want update the value in the Map
+ */
+ public UpdateFilterMapCommand(int indexToUpdate) {
+ this.index = indexToUpdate;
+ }
+
+ /**
+ * @return the column index for which we want update the value in the Map
+ */
+ public int getColumnIndexToUpdate() {
+ return index;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
new file mode 100644
index 00000000000..f78303122a1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.math.BigDecimal;
+import java.util.Comparator;
+
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * @author VL222926
+ *
+ */
+public class DoubleFilterComparator implements Comparator<Object> {
+
+ private static DoubleFilterComparator singleton;
+
+ /**
+ *
+ * @return
+ */
+ public static final DoubleFilterComparator getInstance() {
+ if (singleton == null) {
+ singleton = new DoubleFilterComparator();
+ }
+ return singleton;
+ }
+
+ /**
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ *
+ * @param o1
+ * @param o2
+ * @return
+ */
+ @Override
+ public int compare(Object o1, Object o2) {
+ if (o1 instanceof Double && o2 instanceof Double) {
+ Double d1 = (Double) o1;
+ Double d2 = (Double) o2;
+ return d1.compareTo(d2);
+ }
+ if (!(o1 instanceof Double)) {
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+ // o1 is the cell value and o2 the value to match
+ if (o1 instanceof Double) {
+ Double d1 = (Double) o1;
+ Double d2 = null;
+ if (o2 instanceof Double) {
+ if (TypeUtils.isDoubleValue((String) o2)) {
+ // big decimal to avoid to get comma as separator instead of dot
+ d2 = new BigDecimal((String) o2).doubleValue();
+ return d1.compareTo(d2);
+ }
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+ }
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/IntegerFilterComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/IntegerFilterComparator.java
new file mode 100644
index 00000000000..c19783810f6
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/IntegerFilterComparator.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.util.Comparator;
+
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * Comparator for Integer used by filter
+ *
+ */
+public class IntegerFilterComparator implements Comparator<Object> {
+
+ private static IntegerFilterComparator singleton;
+
+ /**
+ *
+ * @return
+ */
+ public static final IntegerFilterComparator getInstance() {
+ if (singleton == null) {
+ singleton = new IntegerFilterComparator();
+ }
+ return singleton;
+ }
+
+ /**
+ *
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ *
+ * @param o1
+ * @param o2
+ * @return
+ */
+ @Override
+ public int compare(Object o1, Object o2) {
+ if (o1 instanceof Integer && o2 instanceof Integer) {
+ Integer int1 = (Integer) o1;
+ Integer int2 = (Integer) o2;
+ return int1.compareTo(int2);
+ }
+ if (!(o1 instanceof Integer)) {
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+ // o1 is the cell value and o2 the value to match
+ if (o1 instanceof Integer) {
+ Integer int1 = (Integer) o1;
+ Integer int2 = null;
+ if (o2 instanceof String) {
+ if (TypeUtils.isIntegerValue((String) o2)) {
+ int2 = Integer.valueOf((String) o2);
+ return int1.compareTo(int2);
+ }
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+ }
+ return FilterPreferences.INCONSISTENT_VALUE;
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/ObjectNameAndPathComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/ObjectNameAndPathComparator.java
new file mode 100755
index 00000000000..b6c2c3efa17
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/ObjectNameAndPathComparator.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.util.Comparator;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.papyrus.infra.nattable.display.converter.ObjectNameAndPathDisplayConverter;
+
+/**
+ * This comparator is used to sort element with this pattern : "name - path"
+ *
+ */
+public class ObjectNameAndPathComparator implements Comparator<Object> {
+
+ /**
+ * the display converter to use to do the comparison
+ */
+ private DisplayConverter converter;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param converter
+ * the converter to sue to do the comparison
+ */
+ public ObjectNameAndPathComparator(ObjectNameAndPathDisplayConverter converter) {
+ this.converter = converter;
+ }
+
+ /**
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ *
+ * @param o1
+ * @param o2
+ * @return
+ */
+ @Override
+ public int compare(Object o1, Object o2) {
+ Assert.isNotNull(o1);
+ Assert.isNotNull(o2);
+
+ String s1 = (String) this.converter.canonicalToDisplayValue(o1);
+ String s2 = (String) this.converter.canonicalToDisplayValue(o2);
+ return s1.compareToIgnoreCase(s2);
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
index bcddbf24244..86447d3cc7f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
@@ -117,7 +117,7 @@ public class EditConfiguration extends DefaultEditConfiguration {
if (editor != null) {
final String editorId = config.getEditorConfigId() + Integer.toString(i);
if (existingEditorIds.contains(editorId)) {
- org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id");
+ org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id"); //$NON-NLS-1$
} else {
existingEditorIds.add(editorId);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/FilterRowCustomConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/FilterRowCustomConfiguration.java
new file mode 100755
index 00000000000..a77a67bed51
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/FilterRowCustomConfiguration.java
@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.filterrow.FilterIconPainter;
+import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowDataLayer;
+import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowPainter;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.style.Style;
+import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
+import org.eclipse.papyrus.infra.nattable.command.UpdateFilterMapCommand;
+import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.FilterConfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+/**
+ * This class configure the filters for the table
+ *
+ */
+public class FilterRowCustomConfiguration extends AbstractRegistryConfiguration {
+
+ /**
+ *
+ * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param configRegistry
+ */
+ public void configureRegistry(IConfigRegistry configRegistry) {
+
+ // Shade the row to be slightly darker than the blue background.
+ final Style rowStyle = new Style();
+ rowStyle.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.getColor(197, 212, 231));
+ configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, rowStyle, DisplayMode.NORMAL, GridRegion.FILTER_ROW);
+
+ configRegistry.registerConfigAttribute(FilterRowConfigAttributes.FILTER_DISPLAY_CONVERTER, new GenericDisplayConverter());
+
+ // configure the filter for each columns
+ INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new FilterRowPainter(new FilterIconPainter(GUIHelper.getImage("filter"))), DisplayMode.NORMAL, GridRegion.FILTER_ROW); //$NON-NLS-1$
+
+ configRegistry.registerConfigAttribute(FilterRowConfigAttributes.TEXT_DELIMITER, "&"); //$NON-NLS-1$
+
+ List<?> columnElement = modelManager.getColumnElementsList();
+ INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ NatTable nattable = (NatTable) manager.getAdapter(NatTable.class);
+ for (int i = 0; i < columnElement.size(); i++) {
+ StringBuilder builder = new StringBuilder(FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX);
+ builder.append(Integer.valueOf(i).toString());
+ FilterConfigurationFactory.INSTANCE.configureFilter(configRegistry, columnElement.get(i), builder.toString());
+ nattable.doCommand(new UpdateFilterMapCommand(i));
+ }
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/IPapyrusNatTableConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/IPapyrusNatTableConfiguration.java
new file mode 100755
index 00000000000..c4f9026d015
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/IPapyrusNatTableConfiguration.java
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+/**
+ * This interface is used to create configuration for Papyrus Table.
+ *
+ */
+public interface IPapyrusNatTableConfiguration {
+
+ /**
+ *
+ * @return
+ * the id of the configuration. It must be unique
+ */
+ public String getConfigurationId();
+
+ /**
+ *
+ * @return
+ * a description of the editor. This description could be used in a dialog allowing to choose a specific configuration
+ */
+ public String getConfigurationDescription();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
index 4fc4aef87bb..92576974dc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
@@ -150,7 +150,7 @@ public class PapyrusPopupMenuAction extends PopupMenuAction {
* execute the command
*/
private void executeCommand(String commandId) {
- IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
+ IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
if (handlerService == null) {
Activator.log.warn("Handler service not found"); //$NON-NLS-1$
return;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
index 9f6b318d2a1..f193518f0b8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
@@ -29,13 +29,18 @@ import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
*/
public class StyleConfiguration extends DefaultNatTableStyleConfiguration {
+ /**
+ *
+ * @see org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param configRegistry
+ */
@Override
public void configureRegistry(final IConfigRegistry configRegistry) {
super.configureRegistry(configRegistry);
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());
configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());
configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());
-
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
index c446ca30c30..9fb6368f7d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
@@ -13,6 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.converter;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
@@ -55,7 +56,7 @@ public class GenericDisplayConverter implements IDisplayConverter {
*/
@Override
public Object displayToCanonicalValue(Object displayValue) {
- throw new UnsupportedOperationException();
+ return displayValue.toString();
}
/**
@@ -68,11 +69,15 @@ public class GenericDisplayConverter implements IDisplayConverter {
* @return
*/
@Override
- public Object canonicalToDisplayValue(final ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {
+ public Object canonicalToDisplayValue(ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {
+ if (canonicalValue == null) {
+ return null;
+ }
+
final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);
final ILabelProviderContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper(cell, canonicalValue, configRegistry);
- assert labelProvider != null;
+ Assert.isNotNull(labelProvider);
return labelProvider.getText(contextElement);
}
@@ -88,9 +93,7 @@ public class GenericDisplayConverter implements IDisplayConverter {
*/
@Override
public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {
- // throw new UnsupportedOperationException();
return displayValue;
}
-
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
index 9b13f92b737..38dacc3b45e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
@@ -42,6 +42,7 @@ public abstract class AbstractCompositeDataProvider implements IDataProvider, ID
*/
public AbstractCompositeDataProvider(final INattableModelManager manager) {
this.providers = new ArrayList<IDataProvider>();
+ this.manager = manager;
}
/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/FilterRowDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/FilterRowDataProvider.java
new file mode 100755
index 00000000000..54640513a3b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/FilterRowDataProvider.java
@@ -0,0 +1,579 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Original authors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Original authors and others - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowDataLayer;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.filterrow.event.FilterAppliedEvent;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.persistence.IPersistable;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.util.ObjectUtils;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+
+/**
+ * Data provider for the filter row
+ * <ul>
+ * <li>Stores filter strings</li>
+ * <li>Applies them to the ca.odell.glazedlists.matchers.MatcherEditor on the ca.odell.glazedlists.FilterList</li>
+ * </ul>
+ *
+ * Duplicated and adapted code from nattable
+ */
+public class FilterRowDataProvider<T> implements IDataProvider /* , IPersistable */{
+
+ /**
+ * Replacement for the pipe character | that is used for persistence.
+ * If regular expressions are used for filtering, the pipe character can be used
+ * in the regular expression to specify alternations. As the persistence
+ * mechanism in NatTable uses the pipe character for separation of values,
+ * the persistence breaks for such cases.
+ * By replacing the pipe in the regular expression with some silly uncommon
+ * value specified here, we ensure to be able to also persist pipes in the
+ * regular expressions, aswell as being backwards compatible with already
+ * saved filter row states.
+ */
+ public static final String PIPE_REPLACEMENT = "°~°"; //$NON-NLS-1$
+
+ /**
+ * The prefix String that will be used to mark that the following filter
+ * value in the persisted state is a collection.
+ */
+ public static final String FILTER_COLLECTION_PREFIX = "°coll("; //$NON-NLS-1$
+
+ /**
+ * The {@link IFilterStrategy} to which the set filter value should be applied.
+ */
+ private final IFilterStrategy<T> filterStrategy;
+ /**
+ * The column header layer where this {@link IDataProvider} is used for filtering.
+ * Needed for retrieval of column indexes and firing according filter events.
+ */
+ private final ILayer columnHeaderLayer;
+ /**
+ * The {@link IDataProvider} of the column header.
+ * This is necessary to retrieve the real column count of the column header and not a
+ * transformed one. (e.g. hiding a column would change the column count in the column header
+ * but not in the column header {@link IDataProvider}).
+ */
+ private final IDataProvider columnHeaderDataProvider;
+
+ // /**
+ // * The {@link IConfigRegistry} needed to retrieve the {@link IDisplayConverter} for converting
+ // * the values on state save/load operations.
+ // */
+ // private final IConfigRegistry configRegistry;
+
+ private final INattableModelManager manager;
+ /**
+ * Contains the filter objects mapped to the column index.
+ * Basically the data storage for the set filters in the filter row so they are
+ * visible to the user who entered them.
+ */
+ private Map<Integer, Object> filterIndexToObjectMap = new HashMap<Integer, Object>();
+
+ private Runnable refreshFilterRunnable;
+
+ /* Flag to avoid reentrant call to refresh */
+ private AtomicBoolean isFilterRefreshing = new AtomicBoolean(false);
+
+// private ResourceSetListener listener;
+
+
+ /**
+ *
+ * @param filterStrategy
+ * The {@link IFilterStrategy} to which the set filter value should be applied.
+ * @param columnHeaderLayer
+ * The column header layer where this {@link IDataProvider} is used for filtering
+ * needed for retrieval of column indexes and firing according filter events..
+ * @param columnHeaderDataProvider
+ * The {@link IDataProvider} of the column header needed to retrieve the real
+ * column count of the column header and not a transformed one.
+ * @param tableManager
+ * The {@link IConfigRegistry} needed to retrieve the {@link IDisplayConverter} for
+ * converting the values on state save/load operations.
+ */
+ public FilterRowDataProvider(IFilterStrategy<T> filterStrategy, ILayer columnHeaderLayer, IDataProvider columnHeaderDataProvider, INattableModelManager tableManager) {
+ this.filterStrategy = filterStrategy;
+ this.columnHeaderLayer = columnHeaderLayer;
+ this.columnHeaderDataProvider = columnHeaderDataProvider;
+ this.manager = tableManager;
+// TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(this.manager.getTable());
+// listener = new ResourceSetListener() {
+//
+// @Override
+// public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+// // TODO Auto-generated method stub
+// return null;
+// }
+//
+// @Override
+// public void resourceSetChanged(ResourceSetChangeEvent event) {
+// // TODO Auto-generated method stub
+// for (Notification current : event.getNotifications()) {
+// if (current.getNotifier() instanceof IAxis) {
+// IAxis axis = (IAxis) current.getNotifier();
+// EObject parent = axis.eContainer();
+// if (current.getOldValue() instanceof NamedStyle) {
+// NamedStyle style = (NamedStyle) current.getOldValue();
+// if (style.getName().equals(IFilterConfiguration.FILTER_VALUE_TO_MATCH)) {
+// int index = manager.getColumnElementsList().indexOf(axis);
+// getDataValue(index, 0);
+// applyFilter();
+// }
+// }
+// if (current.getNewValue() instanceof NamedStyle) {
+// NamedStyle style = (NamedStyle) current.getOldValue();
+// if (style.getName().equals(IFilterConfiguration.FILTER_VALUE_TO_MATCH)) {
+// int index = manager.getColumnElementsList().indexOf(axis);
+// getDataValue(index, 0);
+// applyFilter();
+// }
+// }
+// }
+//
+// }
+//
+// }
+//
+// @Override
+// public boolean isPrecommitOnly() {
+// // TODO Auto-generated method stub
+// return false;
+// }
+//
+// @Override
+// public boolean isPostcommitOnly() {
+// // TODO Auto-generated method stub
+// return false;
+// }
+//
+// @Override
+// public boolean isAggregatePrecommitListener() {
+// // TODO Auto-generated method stub
+// return false;
+// }
+//
+// @Override
+// public NotificationFilter getFilter() {
+// // TODO Auto-generated method stub
+// return null;
+// }
+// };
+// domain.addResourceSetListener(listener);
+ }
+
+ /**
+ * Returns the map that contains the filter objects mapped to the column index.
+ * It is the data storage for the inserted filters into the filter row by the user.
+ * <p>
+ * Note: Usually it is not intended to modify this Map directly. You should rather call <code>setDataValue(int, int, Object)</code> or <code>clearAllFilters()</code> to modify this Map to ensure consistency in other framework code. It is made visible
+ * because there might be code that needs to modify the Map without index transformations or firing events.
+ *
+ * @return Map that contains the filter objects mapped to the column index.
+ */
+ public Map<Integer, Object> getFilterIndexToObjectMap() {
+ return this.filterIndexToObjectMap;
+ }
+
+ /**
+ * Set the map that contains the filter objects mapped to the column index to be the
+ * data storage for the inserted filters into the filter row by the user.
+ * <p>
+ * Note: Usually it is not intended to set this Map from the outside as it is created in the constructor. But there might be use cases where you e.g. need to connect filter rows to each other. In this case it might be useful to override the local Map with
+ * the one form another FilterRowDataProvider. This is not a typical use case, therefore you should use this method carefully!
+ *
+ * @param filterIndexToObjectMap
+ * Map that contains the filter objects mapped to the column index.
+ */
+ public void setFilterIndexToObjectMap(Map<Integer, Object> filterIndexToObjectMap) {
+ this.filterIndexToObjectMap = filterIndexToObjectMap;
+ }
+
+ @Override
+ public int getColumnCount() {
+ return columnHeaderDataProvider.getColumnCount();
+ }
+
+ public void updateMapValue(int columnIndex) {
+ NatTable natTable = (NatTable) manager.getAdapter(NatTable.class);
+ IConfigRegistry configRegistry = natTable.getConfigRegistry();
+
+ if (manager != null) {
+ IFilterValueToMatchManager loader = getFilterValueToMatchManager(columnIndex);
+ if (loader != null) {
+ Object columnObject = manager.getColumnElement(columnIndex);
+ Object savedValue = loader.getValueToMatch(configRegistry, columnObject);
+ // to manage undo/redo
+ Object mapValue = filterIndexToObjectMap.get(columnIndex);
+ if (savedValue != mapValue) {
+ if ((mapValue != null && !mapValue.equals(savedValue)) || (savedValue != null && !savedValue.equals(mapValue))) {
+ if (savedValue == null) {
+ filterIndexToObjectMap.remove(columnIndex);
+ } else {
+ filterIndexToObjectMap.put(columnIndex, savedValue);
+ }
+ applyFilter();
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public Object getDataValue(int columnIndex, int rowIndex) {
+// NatTable natTable = (NatTable) manager.getAdapter(NatTable.class);
+// IConfigRegistry configRegistry = natTable.getConfigRegistry();
+//
+// if (manager != null) {
+// IFilterValueToMatchManager loader = getFilterValueToMatchManager(columnIndex);
+// if (loader != null) {
+// Object columnObject = manager.getColumnElement(columnIndex);
+// Object savedValue = loader.getValueToMatch(configRegistry, columnObject);
+// // to manage undo/redo
+// Object mapValue = filterIndexToObjectMap.get(columnIndex);
+// if (savedValue != mapValue) {
+// if ((mapValue != null && !mapValue.equals(savedValue)) || (savedValue != null && !savedValue.equals(mapValue))) {
+// if (savedValue == null) {
+// filterIndexToObjectMap.remove(columnIndex);
+// } else {
+// filterIndexToObjectMap.put(columnIndex, savedValue);
+// }
+// applyFilter();
+//
+// }
+// }
+// }
+// }
+
+ return filterIndexToObjectMap.get(columnIndex);
+ }
+
+ /**
+ * refresh the view.
+ */
+ protected void refreshFilterInUIThread() {
+ NatTable natTable = getNatTable();
+ // Need to refresh, even if (temporarily) invisible
+ // (Better alternative?: store refresh event and execute once visible again)
+ if (natTable != null && natTable.isDisposed()) {
+ return;
+ }
+
+ // avoid reentrant call
+ // Refresh only of we are not already refreshing.
+ if (isFilterRefreshing.compareAndSet(false, true)) {
+ filterStrategy.applyFilter(filterIndexToObjectMap);
+ columnHeaderLayer.fireLayerEvent(new FilterAppliedEvent(columnHeaderLayer));
+ isFilterRefreshing.set(false);
+ }
+ }
+
+
+
+ /**
+ *
+ * @return
+ * a new runnable for the refreash action
+ */
+ private Runnable createRefreshFilterRunnable() {
+ return new Runnable() {
+
+ @Override
+ public void run() {
+ // Only run if I'm still pending
+ synchronized (this) {
+ if (refreshFilterRunnable != this) {
+ return;
+ }
+
+ refreshFilterRunnable = null;
+ }
+ refreshFilterInUIThread();
+ ((NattableModelManager) manager).refreshNatTable();
+ }
+ };
+ }
+
+ private NatTable getNatTable() {
+ return (NatTable) manager.getAdapter(NatTable.class);
+ }
+
+ public void applyFilter() {
+ // This refresh code has been duplicated from the refresh of the ModelExplorer (class ModelExplorerView)
+ final Runnable schedule;
+ NatTable natTable = getNatTable();
+ if (natTable != null && !natTable.isDisposed()) {
+ synchronized (this) {
+ if (refreshFilterRunnable == null) {
+ // No refresh is yet pending. Schedule one
+ schedule = createRefreshFilterRunnable();
+ refreshFilterRunnable = schedule;
+ } else {
+ schedule = null;
+ }
+ }
+
+ if (schedule != null) {
+ Control control = natTable;
+ Display display = ((control == null) || control.isDisposed()) ? null : control.getDisplay();
+
+ if (display != null) {
+ // Don't need to schedule a refresh if we have no control or it's disposed
+ display.asyncExec(schedule);
+ }
+ }
+ }
+ }
+
+
+
+ @Override
+ public int getRowCount() {
+ return 1;
+ }
+
+ @Override
+ public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+ columnIndex = columnHeaderLayer.getColumnIndexByPosition(columnIndex);
+ // INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+
+ NatTable natTable = (NatTable) manager.getAdapter(NatTable.class);
+ IConfigRegistry configRegistry = natTable.getConfigRegistry();
+ if (manager != null) {
+ IFilterValueToMatchManager loader = getFilterValueToMatchManager(columnIndex);
+ if (loader != null) {
+ Object columnObject = manager.getColumnElement(columnIndex);
+ loader.saveValueToMatch(configRegistry, columnObject, newValue);
+ }
+ }
+ if (ObjectUtils.isNotNull(newValue)) {
+ filterIndexToObjectMap.put(columnIndex, newValue);
+ } else {
+ filterIndexToObjectMap.remove(columnIndex);
+ }
+
+ filterStrategy.applyFilter(filterIndexToObjectMap);
+
+ columnHeaderLayer.fireLayerEvent(new FilterAppliedEvent(columnHeaderLayer));
+ }
+
+ /**
+ *
+ * @param columnIndex
+ * the index of the column
+ * @return
+ * the filter value to match manager to use
+ */
+ private IFilterValueToMatchManager getFilterValueToMatchManager(int columnIndex) {
+ StringBuilder builder = new StringBuilder();
+ builder.append(FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX);
+ builder.append(Integer.valueOf(columnIndex));
+ return getConfigRegistry().getConfigAttribute(NattableConfigAttributes.FILTER_VALUE_TO_MATCH_MANAGER, DisplayMode.NORMAL, builder.toString());
+ }
+
+ /**
+ *
+ * @return
+ * the config registry to used by the nattable widget
+ */
+ private IConfigRegistry getConfigRegistry() {
+ NatTable natTable = (NatTable) this.manager.getAdapter(NatTable.class);
+ return natTable.getConfigRegistry();
+ }
+
+ // Load/save state
+ //
+ // @Override
+ // public void saveState(String prefix, Properties properties) {
+ // Map<Integer, String> filterTextByIndex = new HashMap<Integer, String>();
+ // for(Integer columnIndex : filterIndexToObjectMap.keySet()) {
+ // final IDisplayConverter converter = configRegistry.getConfigAttribute(
+ // CellConfigAttributes.DISPLAY_CONVERTER,
+ // DisplayMode.NORMAL,
+ // FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX + columnIndex);
+ //
+ // String filterText = getFilterStringRepresentation(filterIndexToObjectMap.get(columnIndex), converter);
+ // filterText = filterText.replace("|", PIPE_REPLACEMENT); //$NON-NLS-1$
+ // filterTextByIndex.put(columnIndex, filterText);
+ // }
+ //
+ // String string = PersistenceUtils.mapAsString(filterTextByIndex);
+ //
+ // if (!isEmpty(string)) {
+ // properties.put(prefix + FilterRowDataLayer.PERSISTENCE_KEY_FILTER_ROW_TOKENS, string);
+ // }
+ // }
+
+ // @Override
+ // public void loadState(String prefix, Properties properties) {
+ // filterIndexToObjectMap.clear();
+ //
+ // try {
+ // Object property = properties.get(prefix + FilterRowDataLayer.PERSISTENCE_KEY_FILTER_ROW_TOKENS);
+ // Map<Integer, String> filterTextByIndex = PersistenceUtils.parseString(property);
+ // for (Integer columnIndex : filterTextByIndex.keySet()) {
+ // final IDisplayConverter converter = configRegistry.getConfigAttribute(
+ // CellConfigAttributes.DISPLAY_CONVERTER,
+ // DisplayMode.NORMAL,
+ // FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX + columnIndex);
+ //
+ // String filterText = filterTextByIndex.get(columnIndex);
+ // filterText = filterText.replace(PIPE_REPLACEMENT, "|"); //$NON-NLS-1$
+ // filterIndexToObjectMap.put(columnIndex, getFilterFromString(filterText, converter));
+ // }
+ // } catch (Exception e) {
+ // log.error("Error while restoring filter row text!", e); //$NON-NLS-1$
+ // }
+
+ // filterStrategy.applyFilter(filterIndexToObjectMap);
+ // }
+
+ /**
+ * This method is used to support saving of a filter collection, e.g. in the context of the
+ * Excel like filter row. In such cases the filter value is not a simple String but a
+ * Collection of filter values that need to be converted to a String representation.
+ * As the state persistence is encapsulated to be handled here, we need to take care
+ * of such states here also.
+ *
+ * @param filterValue
+ * The filter value object that is used for filtering.
+ * @param converter
+ * The converter that is used to convert the filter value, which is necessary
+ * to support filtering of custom types.
+ * @return The String representation of the filter value.
+ */
+ private String getFilterStringRepresentation(Object filterValue, IDisplayConverter converter) {
+ // in case the filter value is a collection of values, we need to create a special
+ // string representation
+ if (filterValue instanceof Collection) {
+ String collectionSpec = FILTER_COLLECTION_PREFIX + filterValue.getClass().getName() + ")"; //$NON-NLS-1$
+ StringBuilder builder = new StringBuilder(collectionSpec);
+ builder.append("["); //$NON-NLS-1$
+ Collection<?> filterCollection = (Collection<?>) filterValue;
+ for (Iterator<?> iterator = filterCollection.iterator(); iterator.hasNext();) {
+ Object filterObject = iterator.next();
+ builder.append(converter.canonicalToDisplayValue(filterObject));
+ if (iterator.hasNext())
+ builder.append(IPersistable.VALUE_SEPARATOR);
+ }
+
+ builder.append("]"); //$NON-NLS-1$
+ return builder.toString();
+ }
+ return (String) converter.canonicalToDisplayValue(filterValue);
+ }
+
+ /**
+ * This method is used to support loading of a filter collection, e.g. in the context of the
+ * Excel like filter row. In such cases the saved filter value is not a simple String but
+ * represents a Collection of filter values that need to be converted to the corresponding values.
+ * As the state persistence is encapsulated to be handled here, we need to take care
+ * of such states here also.
+ *
+ * @param filterText
+ * The String representation of the applied saved filter.
+ * @param converter
+ * The converter that is used to convert the filter value, which is necessary
+ * to support filtering of custom types.
+ * @return The filter value that will be used to apply a filter to the IFilterStrategy
+ *
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ private Object getFilterFromString(String filterText, IDisplayConverter converter) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ if (filterText.startsWith(FILTER_COLLECTION_PREFIX)) {
+ // the filter text represents a collection
+ int indexEndCollSpec = filterText.indexOf(")"); //$NON-NLS-1$
+ String collectionSpec = filterText.substring(filterText.indexOf("(") + 1, indexEndCollSpec); //$NON-NLS-1$
+ Collection filterCollection = (Collection) Class.forName(collectionSpec).newInstance();
+
+ // also get rid of the collection marks
+ filterText = filterText.substring(indexEndCollSpec + 2, filterText.length() - 1);
+ String[] filterSplit = filterText.split(IPersistable.VALUE_SEPARATOR);
+ for (String filterString : filterSplit) {
+ filterCollection.add(converter.displayToCanonicalValue(filterString));
+ }
+
+ return filterCollection;
+ }
+ return converter.displayToCanonicalValue(filterText);
+ }
+
+ /**
+ * Clear all filters that are currently applied.
+ */
+ public void clearAllFilters() {
+ filterIndexToObjectMap.clear();
+ filterStrategy.applyFilter(filterIndexToObjectMap);
+
+ // we clear the filter
+ if (manager != null) {
+ CompoundCommand cc = new CompoundCommand("Clear All Filter"); //$NON-NLS-1$
+ TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(manager.getTable());
+ List<?> columnElement = manager.getColumnElementsList();
+ for (Object current : columnElement) {
+ if (current instanceof IAxis) {
+ Style idToDestroy = ((IAxis) current).getNamedStyle(NattablestylePackage.eINSTANCE.getStringValueStyle(), IFilterConfiguration.FILTER_SYSTEM_ID);
+ Style keyToDestroy = ((IAxis) current).getNamedStyle(NattablestylePackage.eINSTANCE.getStyle(), IFilterConfiguration.FILTER_FORCED_BY_USER_ID);
+
+ if (idToDestroy != null) {
+ Command cmd = DeleteCommand.create(domain, idToDestroy);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (idToDestroy != null) {
+ Command cmd = DeleteCommand.create(domain, keyToDestroy);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ }
+ }
+ if (!cc.isEmpty() && cc.canExecute()) {
+ domain.getCommandStack().execute(cc);
+ }
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ListComboBoxDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ListComboBoxDataProvider.java
new file mode 100755
index 00000000000..1401930054e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ListComboBoxDataProvider.java
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+
+/**
+ * This data provider is done to return list
+ *
+ */
+public class ListComboBoxDataProvider implements IComboBoxDataProvider {
+
+ /**
+ * the values to display in the combo
+ */
+ private List<Object> availablevalues;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param availablevalues
+ */
+ public ListComboBoxDataProvider(List<Object> availablevalues) {
+ this.availablevalues = availablevalues;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @return
+ */
+ @Override
+ public List<?> getValues(int columnIndex, int rowIndex) {
+ return this.availablevalues;
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/display/converter/ObjectNameAndPathDisplayConverter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/display/converter/ObjectNameAndPathDisplayConverter.java
new file mode 100755
index 00000000000..b8a5c2fd045
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/display/converter/ObjectNameAndPathDisplayConverter.java
@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.display.converter;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IQualifierLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ *
+ * Only the method {@link DisplayConverter#canonicalToDisplayValue(Object)} is implemented by this converter
+ * It returns this kind of string : "name - path"
+ */
+public class ObjectNameAndPathDisplayConverter extends DisplayConverter {
+
+ /**
+ * the label provider service
+ */
+ private LabelProviderService serv;
+
+ private static final String NAME_AND_PATH_SEPARATOR = " - "; //$NON-NLS-1$
+
+ private static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param service
+ * the label provider service to use
+ */
+ public ObjectNameAndPathDisplayConverter(LabelProviderService service) {
+ this.serv = service;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter#canonicalToDisplayValue(java.lang.Object)
+ *
+ * @param canonicalValue
+ * @return
+ */
+ @Override
+ public Object canonicalToDisplayValue(Object canonicalValue) {
+ if (canonicalValue == null) {
+ return null;
+ }
+ return getText(canonicalValue);
+ }
+
+ private String getText(Object object) {
+ if (object == null) {
+ return ""; //$NON-NLS-1$
+ }
+ StringBuffer buffer = new StringBuffer();
+ if (object instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) object;
+ Iterator<?> iter = coll.iterator();
+ while (iter.hasNext()) {
+ Object next = iter.next();
+ String txt = getText(next);
+ if (txt != null && !txt.isEmpty()) {
+ buffer.append(txt);
+ if (iter.hasNext()) {
+ buffer.append(MULTI_VALUE_SEPARATOR);
+ buffer.append(" "); //$NON-NLS-1$
+ }
+ }
+ }
+ return buffer.toString();
+ }
+ final ILabelProvider provider = serv.getLabelProvider(Constants.BODY_LABEL_PROVIDER_CONTEXT, object);
+ if (provider instanceof IQualifierLabelProvider) {
+ String txt = provider.getText(object);
+ if (txt != null && !txt.isEmpty()) {
+ buffer.append(txt);
+ String path = ((IQualifierLabelProvider) provider).getQualifierText(object);
+ if (path != null && !path.isEmpty()) {
+ buffer.append(NAME_AND_PATH_SEPARATOR);
+ buffer.append(path);
+ }
+ }
+
+ } else {
+ buffer.append(serv.getLabelProvider(object).getText(object));
+ }
+ return buffer.toString();
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter#displayToCanonicalValue(java.lang.Object)
+ *
+ * @param displayValue
+ * @return
+ */
+ @Override
+ public Object displayToCanonicalValue(Object displayValue) {
+ throw new UnsupportedOperationException();
+
+ }
+} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractPapyrusMatcherEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractPapyrusMatcherEditor.java
new file mode 100755
index 00000000000..1f5b47c26c3
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractPapyrusMatcherEditor.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+
+import ca.odell.glazedlists.matchers.Matcher;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ * TODO : check the listener utility
+ * TODO : inherits from existing abstractMatcherEditor ?
+ *
+ */
+public abstract class AbstractPapyrusMatcherEditor implements MatcherEditor<Object> {
+
+ /**
+ * the created matcher
+ */
+ private Matcher<Object> matcher;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param columnAccesor
+ * the column accessor to use to get the cell values
+ * @param columnIndex
+ * the index of the column on which we are doing the filter
+ * @param matchOn
+ * the wanted element
+ *
+ * it can't be a Collection<?>
+ * @param configRegistry
+ * the configure registry of the filtered nattable
+ */
+ public AbstractPapyrusMatcherEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ Assert.isTrue(!(matchOn instanceof Collection<?>));
+ this.matcher = createMatcher(columnAccesor, columnIndex, matchOn, configRegistry);
+ }
+
+ /**
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ protected abstract Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry);
+
+ /**
+ * @see ca.odell.glazedlists.matchers.MatcherEditor#addMatcherEditorListener(ca.odell.glazedlists.matchers.MatcherEditor.Listener)
+ *
+ * @param listener
+ */
+ @Override
+ public void addMatcherEditorListener(ca.odell.glazedlists.matchers.MatcherEditor.Listener<Object> listener) {
+
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.MatcherEditor#removeMatcherEditorListener(ca.odell.glazedlists.matchers.MatcherEditor.Listener)
+ *
+ * @param listener
+ */
+ @Override
+ public void removeMatcherEditorListener(ca.odell.glazedlists.matchers.MatcherEditor.Listener<Object> listener) {
+
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.MatcherEditor#getMatcher()
+ *
+ * @return
+ */
+ @Override
+ public final Matcher<Object> getMatcher() {
+ return this.matcher;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractSinglePapyrusMatcher.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractSinglePapyrusMatcher.java
new file mode 100755
index 00000000000..98996dddf62
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/AbstractSinglePapyrusMatcher.java
@@ -0,0 +1,125 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ * Abstract matcher class used by filter
+ *
+ */
+public abstract class AbstractSinglePapyrusMatcher<E> implements Matcher<E> {
+
+ /**
+ * the wanted object
+ */
+ private Object matchOn;
+
+ /**
+ * the column accesor to use
+ */
+ private IColumnAccessor<Object> columnAccessor;
+
+ /**
+ * the index of the column on which we are working
+ */
+ private int columnIndex;
+
+ /**
+ * the config registry of the table
+ */
+ private IConfigRegistry registry;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param columnAccessor
+ * the accessor to use to get cell value
+ * @param columnIndex
+ * the index of the column on which we are working
+ * @param matchOn
+ * the object looked for by the filter, it must not be a collection
+ */
+ public AbstractSinglePapyrusMatcher(IColumnAccessor<Object> columnAccessor, int columnIndex, Object matchOn) {
+ this(columnAccessor, columnIndex, matchOn, null);
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param columnAccessor
+ * the accessor to use to get cell value
+ * @param columnIndex
+ * the index of the column on which we are working
+ * @param matchOn
+ * the object looked for by the filter, it must not be a collection
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ */
+ public AbstractSinglePapyrusMatcher(IColumnAccessor<Object> columnAccessor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ this.matchOn = matchOn;
+ Assert.isTrue(!(matchOn instanceof Collection<?>));
+ this.columnAccessor = columnAccessor;
+ this.columnIndex = columnIndex;
+ }
+
+ /**
+ * @return the wantedObject
+ */
+ protected final Object getObjectToMatch() {
+ return matchOn;
+ }
+
+ /**
+ * @return the accessor
+ */
+ protected final IColumnAccessor<Object> getColumnAccessor() {
+ return columnAccessor;
+ }
+
+ /**
+ * @return the columnIndex
+ */
+ protected final int getColumnIndex() {
+ return columnIndex;
+ }
+
+ /**
+ * @return the registry
+ */
+ protected final IConfigRegistry getRegistry() {
+ return registry;
+ }
+
+ /**
+ *
+ * @param item
+ * an object (a row)
+ * @return
+ * the cell value for this row and the filtered column
+ */
+ protected Object getCellValueFor(Object item) {
+ return getColumnAccessor().getDataValue(item, getColumnIndex());
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditor.java
new file mode 100755
index 00000000000..78e011df1d3
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditor.java
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ * Matcher Editor for Boolean. It manages Boolean and the string N/A
+ *
+ */
+public class BooleanMatcherEditor extends AbstractPapyrusMatcherEditor {
+
+
+
+ /**
+ * Constructor.
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ */
+ public BooleanMatcherEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ super(columnAccesor, columnIndex, matchOn, configRegistry);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor#createMatcher(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, int, java.lang.Object, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ protected Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ return new BooleanMatcher(columnAccesor, matchOn, columnIndex);
+ }
+
+ /**
+ * the boolean matcher it can matches with Boolean or N/A
+ *
+ */
+ public static class BooleanMatcher extends AbstractSinglePapyrusMatcher<Object> {
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * the accessor to use to get cell value
+ * @param wantedObject
+ * the wanted value, must not be a collection
+ * @param columnIndex
+ * the index of the column
+ */
+ public BooleanMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex) {
+ super(accessor, columnIndex, wantedObject);
+ Assert.isTrue(!(wantedObject instanceof Collection<?>));
+ Assert.isTrue(wantedObject instanceof Boolean || wantedObject.equals(ICellManager.NOT_AVALAIBLE));
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.Matcher#matches(java.lang.Object)
+ *
+ * @param item
+ * @return
+ */
+ @Override
+ public boolean matches(Object item) {
+ Object wantedValue = getObjectToMatch();
+ Object value = getCellValueFor(item);
+ if (value instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) value;
+ return coll.contains(wantedValue);
+ } else {
+ return getObjectToMatch().equals(value);
+ }
+ }
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditorFactory.java
new file mode 100755
index 00000000000..0ae1a14cb28
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/BooleanMatcherEditorFactory.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ *
+ * The factory for boolean matching editor
+ *
+ */
+public class BooleanMatcherEditorFactory implements IPapyrusMatcherEditorFactory<Object> {
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory#instantiateMatcherEditors(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, java.lang.Integer, java.lang.Object,
+ * org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccessor
+ * @param columnIndex
+ * @param wantedValue
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ public EventList<MatcherEditor<Object>> instantiateMatcherEditors(IColumnAccessor<Object> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry) {
+ EventList<MatcherEditor<Object>> list = new BasicEventList<MatcherEditor<Object>>();
+ MatcherEditor<Object> matcher = new BooleanMatcherEditor(columnAccessor, columnIndex, wantedValue, configRegistry);
+ list.add(matcher);
+ return list;
+ }
+} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterPreferences.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterPreferences.java
new file mode 100644
index 00000000000..31be17ab98d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterPreferences.java
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * A class to manage preferences for filter.
+ * Preferences are not yet implemented for tables, so this class can not be considered as API
+ *
+ */
+public class FilterPreferences {
+
+ /**
+ * This value is used when one of the compared element have not the good type
+ */
+ public static final int INCONSISTENT_VALUE = Integer.MIN_VALUE;
+
+ /**
+ *
+ * @param table
+ * @return
+ */
+ public static final boolean displayInconsistentValueWithFilter(Table table) {
+ return false;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterRowUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterRowUtils.java
new file mode 100644
index 00000000000..ca4be262764
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/FilterRowUtils.java
@@ -0,0 +1,133 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.filter;
+
+
+//package org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow;
+
+import static org.eclipse.nebula.widgets.nattable.util.ObjectUtils.isNotEmpty;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult;
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult.MatchType;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+
+import ca.odell.glazedlists.matchers.ThresholdMatcherEditor;
+
+//import ca.odell.glazedlists.matchers.ThresholdMatcherEditor;
+
+/**
+ *
+ * Duplicated code from Ca.odell.glazedlist
+ */
+public class FilterRowUtils {
+
+ public static List<ParseResult> parse(String string, String textDelimiter, TextMatchingMode textMatchingMode) {
+ List<ParseResult> parseResults = new ArrayList<ParseResult>();
+
+ if (textDelimiter != null) {
+ StringTokenizer tok = new StringTokenizer(string, textDelimiter);
+ while (tok.hasMoreTokens()) {
+ parse(tok.nextToken(), textMatchingMode, parseResults);
+ }
+ } else {
+ parse(string, textMatchingMode, parseResults);
+ }
+
+ return parseResults;
+ }
+
+ private static void parse(String string, TextMatchingMode textMatchingMode, List<ParseResult> parseResults) {
+ ParseResult parseResult;
+
+ switch (textMatchingMode) {
+ case REGULAR_EXPRESSION:
+ parseResult = parseExpression(string);
+ break;
+ default:
+ parseResult = parseLiteral(string);
+ }
+
+ if (parseResult != null) {
+ parseResults.add(parseResult);
+ }
+ }
+
+ /**
+ * Parses the text entered in the filter row. The text is parsed to figure out the
+ * type of match operation (&lt;, &gt; etc.) and the value next to it.
+ *
+ * @param string
+ * entered by the user in the filter row text box
+ */
+ public static ParseResult parseExpression(String string) {
+ Scanner scanner = new Scanner(string.trim());
+ ParseResult parseResult = new ParseResult();
+
+ Pattern p = Pattern.compile("<>|([>|<]?=?)"); //$NON-NLS-1$
+ String opToken = scanner.findWithinHorizon(p, 2);
+ if (isNotEmpty(opToken)) {
+ parseResult.setMatchType(MatchType.parse(opToken));
+ while (scanner.hasNext()) {
+ parseResult.setValueToMatch(scanner.next());
+ }
+ }
+ else {
+ parseResult.setValueToMatch(string);
+ }
+ scanner.close();
+ return parseResult;
+ }
+
+ public static ParseResult parseLiteral(String string) {
+ ParseResult parseResult = new ParseResult();
+ parseResult.setMatchType(MatchType.NONE);
+ parseResult.setValueToMatch(string);
+ return parseResult;
+ }
+
+ /**
+ * Set the Match operation on the {@link ThresholdMatcherEditor} corresponding to the {@link MatchType}. This must be done this way since ThresholdMatcherEditor.MatcherEditor is private.
+ *
+ * @param <T>
+ * type of the row object
+ */
+ public static <T> void setMatchOperation(PapyrusThresholdMatcherEditor<T, Object> thresholdMatcherEditor, MatchType matchType) {
+ switch (matchType) {
+ case GREATER_THAN:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.GREATER_THAN);
+ break;
+ case GREATER_THAN_OR_EQUAL:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.GREATER_THAN_OR_EQUAL);
+ break;
+ case LESS_THAN:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.LESS_THAN);
+ break;
+ case LESS_THAN_OR_EQUAL:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.LESS_THAN_OR_EQUAL);
+ break;
+ case NOT_EQUAL:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.NOT_EQUAL);
+ break;
+ default:
+ thresholdMatcherEditor.setMatchOperation(PapyrusThresholdMatcherEditor.EQUAL);
+ }
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/GlazedListsImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/GlazedListsImpl.java
new file mode 100644
index 00000000000..2643f82be1f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/GlazedListsImpl.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+/* Glazed Lists (c) 2003-2006 */
+/* http://publicobject.com/glazedlists/ publicobject.com,*/
+/* O'Dell Engineering Ltd.*/
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import ca.odell.glazedlists.FunctionList;
+
+/**
+ * A utility class containing all sorts of random things that are useful for
+ * implementing Glazed Lists but not for using Glazed Lists.
+ *
+ * @author <a href="mailto:jesse@swank.ca">Jesse Wilson</a>
+ *
+ * Duplicated code from GlazzedList
+ */
+public final class GlazedListsImpl {
+
+
+
+ /**
+ * Returns a {@link FunctionList.Function} that simply reflects the
+ * function's argument as its result.
+ */
+ public static <E> FunctionList.Function<E, E> identityFunction() {
+ return new IdentityFunction<E>();
+ }
+
+ private static class IdentityFunction<E> implements FunctionList.Function<E, E> {
+ public E evaluate(E sourceValue) {
+ return sourceValue;
+ }
+ }
+
+
+} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IFilterValueToMatchManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IFilterValueToMatchManager.java
new file mode 100755
index 00000000000..3abfa8fc132
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IFilterValueToMatchManager.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager;
+
+/**
+ * Interface used to save and get the value to match to filter the table.
+ *
+ * We advice you to use {@link AbstractFilterValueToMatchManager}
+ *
+ */
+public interface IFilterValueToMatchManager {
+
+ /**
+ *
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @param axis
+ * the axis on which the user is filtering
+ * @param valueToMatch
+ * the new filter value typed by the user
+ */
+ public void saveValueToMatch(IConfigRegistry configRegistry, Object axis, Object valueToMatch);
+
+ /**
+ *
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @param axis
+ * the axis for which we wanted the value to match
+ * @param newValueF
+ * the new filter value typed by the user
+ */
+ public Object getValueToMatch(IConfigRegistry configRegistry, Object axis);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IPapyrusMatcherEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IPapyrusMatcherEditorFactory.java
new file mode 100755
index 00000000000..a34f128e13c
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/IPapyrusMatcherEditorFactory.java
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ *
+ * This class is used to register matcher editor in the nattable config registry.
+ * These editors will be instantiated in the FilterStrategy class
+ */
+public interface IPapyrusMatcherEditorFactory<T extends Object> {
+
+ /**
+ *
+ * @param columnAccessor
+ * the column accessor to use
+ * @param columnIndex
+ * the index of the column
+ * @param wantedValue
+ * the wanted value. It can't be a Collection<?>
+ * @param configRegistry
+ * the config registry of the table
+ * @return
+ * a new instance of a Papyrus Matcher editor
+ */
+ public EventList<MatcherEditor<T>> instantiateMatcherEditors(IColumnAccessor<T> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/ObjectMatcherEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/ObjectMatcherEditor.java
new file mode 100755
index 00000000000..10c9c2bc956
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/ObjectMatcherEditor.java
@@ -0,0 +1,111 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.Collection;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ * this class provides a matcher editor for object
+ */
+public class ObjectMatcherEditor extends AbstractPapyrusMatcherEditor {
+
+
+ /**
+ * Constructor.
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ */
+ public ObjectMatcherEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ super(columnAccesor, columnIndex, matchOn, configRegistry);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor#createMatcher(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, int, java.lang.Object, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ protected Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ return new ObjectMatcher(columnAccesor, matchOn, columnIndex);
+ }
+
+ /**
+ * This Matcher allows to know is an object is displayed in a cell
+ *
+ */
+ public static class ObjectMatcher extends AbstractSinglePapyrusMatcher<Object> {
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ * @param configRegistry
+ */
+ public ObjectMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex, IConfigRegistry configRegistry) {
+ super(accessor, columnIndex, wantedObject, configRegistry);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ */
+ public ObjectMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex) {
+ super(accessor, columnIndex, wantedObject);
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.Matcher#matches(java.lang.Object)
+ *
+ * @param item
+ * @return
+ */
+ @Override
+ public boolean matches(Object item) {
+ Object res = getColumnAccessor().getDataValue(item, getColumnIndex());
+ if (res != null) {
+ Object wantedObject = getObjectToMatch();
+ if (res instanceof Collection<?>) {
+ return ((Collection<?>) res).contains(wantedObject);
+ } else if (wantedObject instanceof String) {
+ return wantedObject.equals(res);
+ } else {
+ return res == wantedObject;
+ }
+ }
+ return false;
+ }
+
+ }
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java
new file mode 100755
index 00000000000..d46d97c3f4d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java
@@ -0,0 +1,275 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowDataLayer;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.services.IDisposable;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.FilterList;
+import ca.odell.glazedlists.matchers.CompositeMatcherEditor;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+import ca.odell.glazedlists.util.concurrent.ReadWriteLock;
+
+
+
+/**
+ * the filter strategy used by Papyrus table. It allows to manage invert axis
+ *
+ * NOT IN THE API
+ *
+ */
+public class PapyrusFilterStrategy implements IFilterStrategy<Object>, IDisposable {
+
+ /**
+ * the nattable model manager
+ */
+ private NattableModelManager manager;
+
+ /**
+ * the column accessor
+ */
+ protected final IColumnAccessor<Object> columnAccessor;
+
+ /**
+ * the row matcher editor
+ */
+ protected CompositeMatcherEditor<Object> rowMatcherEditor;
+
+ /**
+ * column matcher edito
+ */
+ protected CompositeMatcherEditor<Object> columnMatcherEditor;
+
+ /**
+ * the row filter list
+ */
+ private FilterList<Object> rowFilterList;
+
+ /**
+ * the column filter list
+ */
+ private FilterList<Object> columnFilterList;
+
+ /**
+ * the table
+ */
+ private Table table;
+
+ /**
+ * listener used to know when the user invert the table
+ */
+ private Adapter invertAxisAdapter;
+
+ /**
+ *
+ * @return
+ * the table manager
+ *
+ */
+ private INattableModelManager getTableManager() {
+ return this.manager;
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param manager
+ * the table manager
+ * @param columnAccessor
+ * a column accessor
+ */
+ public PapyrusFilterStrategy(NattableModelManager manager, final IColumnAccessor<Object> columnAccessor) {
+
+ this.columnAccessor = columnAccessor;
+ this.manager = manager;
+
+ this.table = this.manager.getTable();
+ if (this.table.isInvertAxis()) {
+ this.rowFilterList = manager.getVerticalFilterList();
+ this.columnFilterList = manager.getHorizontalFilterEventList();
+ } else {
+ this.rowFilterList = manager.getHorizontalFilterEventList();
+ this.columnFilterList = manager.getVerticalFilterList();
+ }
+ // this.currentFilterList = this.manager.get
+ this.invertAxisAdapter = new AdapterImpl() {
+
+ /**
+ * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
+ *
+ * @param msg
+ */
+ @Override
+ public void notifyChanged(Notification msg) {
+ Object notifier = msg.getNotifier();
+ if (notifier == getTableManager().getTable()) {
+ if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {
+ Display.getDefault().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ resetFilter();
+ }
+ });
+
+ }
+ }
+ }
+ };
+ table.eAdapters().add(invertAxisAdapter);
+
+ this.rowMatcherEditor = new CompositeMatcherEditor<Object>();
+ this.rowMatcherEditor.setMode(CompositeMatcherEditor.AND);
+ this.columnMatcherEditor = new CompositeMatcherEditor<Object>();
+ this.columnMatcherEditor.setMode(CompositeMatcherEditor.AND);
+
+ this.columnFilterList.setMatcherEditor(this.columnMatcherEditor);
+ this.rowFilterList.setMatcherEditor(this.rowMatcherEditor);
+ resetFilter();
+ }
+
+ /**
+ * reset the row and the column filters
+ */
+ public void resetFilter() {
+ this.rowMatcherEditor.getMatcherEditors().clear();
+ this.columnMatcherEditor.getMatcherEditors().clear();
+ }
+
+
+ private ReadWriteLock getReadWriteLockToUse() {
+ if (this.table.isInvertAxis()) {
+ return this.columnFilterList.getReadWriteLock();
+ }
+ return this.rowFilterList.getReadWriteLock();
+ }
+
+ private CompositeMatcherEditor<Object> getMatcherEditorToUse() {
+ if (this.table.isInvertAxis()) {
+ return this.columnMatcherEditor;
+ }
+ return this.rowMatcherEditor;
+ }
+
+ /**
+ * Create GlazedLists matcher editors and apply them to facilitate filtering.
+ */
+ @Override
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public void applyFilter(Map<Integer, Object> filterIndexToObjectMap) {
+ // find the lock and the matcher to use, it depends on the table invert axis state
+ ReadWriteLock filterLock = getReadWriteLockToUse();
+ CompositeMatcherEditor<Object> matcherEditor = getMatcherEditorToUse();
+ // wait until all listeners had the chance to handle the clear event
+ try {
+ filterLock.writeLock().lock();
+ matcherEditor.getMatcherEditors().clear();
+ } finally {
+ filterLock.writeLock().unlock();
+ }
+
+ if (filterIndexToObjectMap.isEmpty()) {
+ return;
+ }
+
+ try {
+ EventList<MatcherEditor<Object>> matcherEditors = new BasicEventList<MatcherEditor<Object>>();
+ NatTable natTable = (NatTable) this.manager.getAdapter(NatTable.class);
+ IConfigRegistry configRegistry = natTable.getConfigRegistry();
+ for (Entry<Integer, Object> mapEntry : filterIndexToObjectMap.entrySet()) {
+ final Integer columnIndex = mapEntry.getKey();
+ final Object value = mapEntry.getValue();
+ StringBuilder configLabel = new StringBuilder(FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX);
+ configLabel.append(columnIndex.toString());
+
+
+ IPapyrusMatcherEditorFactory matcherCreator = configRegistry.getConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, DisplayMode.NORMAL, configLabel.toString());
+ if (matcherCreator != null) {
+ if (value instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) value;
+ Iterator<?> iter = coll.iterator();
+ CompositeMatcherEditor<Object> composite = new CompositeMatcherEditor<Object>();
+ composite.setMode(CompositeMatcherEditor.OR);
+ while (iter.hasNext()) {
+ Object next = iter.next();
+ composite.getMatcherEditors().addAll(matcherCreator.instantiateMatcherEditors(columnAccessor, columnIndex, next, configRegistry));
+ }
+ matcherEditors.add(composite);
+ } else {
+ matcherEditors.addAll(matcherCreator.instantiateMatcherEditors(columnAccessor, columnIndex, value, configRegistry));
+ }
+ } else {
+ Activator.log.warn(NLS.bind("No matcher editor found for column {0}, we will use the default string matcher", columnIndex)); //$NON-NLS-1$
+ matcherEditors.addAll(new StringMatcherEditorFactory<Object>().instantiateMatcherEditors(columnAccessor, columnIndex, value, configRegistry));
+ }
+ }
+
+ // wait until all listeners had the chance to handle the clear event
+ try {
+ filterLock.writeLock().lock();
+ matcherEditor.getMatcherEditors().addAll(matcherEditors);
+ } finally {
+ filterLock.writeLock().unlock();
+ }
+
+ } catch (Exception e) {
+ Activator.log.error("Error on applying a filter", e); //$NON-NLS-1$
+ }
+ }
+
+ protected FilterList<?> getRowFilterList() {
+ return ((NattableModelManager) this.manager).getHorizontalFilterEventList();
+ }
+
+ protected ReadWriteLock getHorizontalFilterLock() {
+ return getRowFilterList().getReadWriteLock();
+ }
+
+ /**
+ * @see org.eclipse.ui.services.IDisposable#dispose()
+ *
+ */
+ @Override
+ public void dispose() {
+ this.table.eAdapters().remove(this.invertAxisAdapter);
+ this.table = null;
+ this.manager = null;
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusTextMatchingMode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusTextMatchingMode.java
new file mode 100755
index 00000000000..6113638873c
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusTextMatchingMode.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+/**
+ * @author the matching mode provided by Papyrus for filter
+ *
+ */
+public enum PapyrusTextMatchingMode {
+
+
+ /** to do a comparison using {@link String#contains(CharSequence)}. it is the default case */
+ CONTAINS("contains:"),
+
+ /** to do a comparison using {@link String#equals(Object))} */
+ EXACT("="),
+
+ /** to do a numeric comparison */
+ NUM("num:"),
+
+ /** to find element using regex find */
+ REGEX_FIND("regex:"),
+
+ /** to find element using regex match, so the full string must match */
+ REGEX_MATCH("regex_m:"),
+
+ /** to do a comparison using {@link String#startsWith(String)} */
+ START("start:");
+
+
+
+ /**
+ * the string corresponding to the mode
+ */
+ private String mode;
+
+ /**
+ * Constructor.
+ *
+ */
+ private PapyrusTextMatchingMode(String mode) {
+ this.mode = mode;
+ }
+
+
+ /**
+ *
+ * @return
+ * the string representing the comparison mode
+ */
+ public String getMode() {
+ return this.mode;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusThresholdMatcherEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusThresholdMatcherEditor.java
new file mode 100644
index 00000000000..9bf2ffdbab2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusThresholdMatcherEditor.java
@@ -0,0 +1,358 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import ca.odell.glazedlists.FunctionList;
+import ca.odell.glazedlists.GlazedLists;
+//import ca.odell.glazedlists.impl.GlazedListsImpl;
+import ca.odell.glazedlists.matchers.AbstractMatcherEditor;
+import ca.odell.glazedlists.matchers.Matcher;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ * A {@link MatcherEditor} that filters elements based on whether they are
+ * greater than or less than a threshold. The implementation is based on
+ * elements implementing {@link Comparable} unless the constructor specifies
+ * a {@link Comparator}.
+ *
+ * By default the elements themselves are compared with the threshold value,
+ * however, an optional Function can be provided which can be used to extract
+ * a value that is appropriate for comparison with the threshold. In this way,
+ * ThreshholdMatcherEditor provides a level of indirection when locating the
+ * exact value to compare for a given element.
+ *
+ * @author <a href="mailto:rob@starlight-systems.com">Rob Eden</a>
+ *
+ * Duplicated and adapted code from ca.odell.glazedlist
+ */
+public class PapyrusThresholdMatcherEditor<E, T> extends AbstractMatcherEditor<E> {
+
+ public static final MatchOperation GREATER_THAN = new MatchOperation(1, false);
+ public static final MatchOperation GREATER_THAN_OR_EQUAL = new MatchOperation(1, true);
+ public static final MatchOperation LESS_THAN = new MatchOperation(-1, false);
+ public static final MatchOperation LESS_THAN_OR_EQUAL = new MatchOperation(-1, true);
+ public static final MatchOperation EQUAL = new MatchOperation(0, true);
+ public static final MatchOperation NOT_EQUAL = new MatchOperation(0, false);
+
+ private MatchOperation currentMatcher;
+
+ private Comparator<T> comparator;
+ private MatchOperation operation;
+ private T threshold;
+ private FunctionList.Function<E, T> function;
+
+ /**
+ * Construct an instance that will require elements to be greater than the
+ * threshold (which is not initially set) and relies on the threshold
+ * object and elements in the list implementing {@link Comparable}.
+ */
+ public PapyrusThresholdMatcherEditor() {
+ this(null);
+ }
+
+ /**
+ * Construct an instance that will require elements to be greater than the
+ * given threshold and relies on the threshold object and elements in the
+ * list implementing {@link Comparable}.
+ *
+ * @param threshold
+ * the initial threshold, or null if none.
+ */
+ public PapyrusThresholdMatcherEditor(T threshold) {
+ this(threshold, null);
+ }
+
+ /**
+ * Construct an instance that will require elements to be greater than the
+ * given threshold and relies on the threshold object and elements in the
+ * list implementing {@link Comparable}.
+ *
+ * @param threshold
+ * the initial threshold, or null if none.
+ * @param operation
+ * the operation to determine what relation list elements
+ * should have to the threshold in order to match (i.e., be visible).
+ * Specifying null will use {@link #GREATER_THAN}.
+ */
+ public PapyrusThresholdMatcherEditor(T threshold, MatchOperation operation) {
+ this(threshold, operation, null);
+ }
+
+ /**
+ * Construct an instance.
+ *
+ * @param threshold
+ * rhe initial threshold, or null if none.
+ * @param operation
+ * rhe operation to determine what relation list elements
+ * should have to the threshold in order to match (i.e., be visible).
+ * Specifying null will use {@link #GREATER_THAN}.
+ * @param comparator
+ * determines how objects compare. If null, the threshold
+ * object and list elements must implement {@link Comparable}.
+ */
+ public PapyrusThresholdMatcherEditor(T threshold, MatchOperation operation, Comparator<T> comparator) {
+ this(threshold, operation, comparator, null);
+ }
+
+ /**
+ * Construct an instance.
+ *
+ * @param threshold
+ * the initial threshold, or null if none.
+ * @param operation
+ * the operation to determine what relation list elements
+ * should have to the threshold in order to match (i.e., be visible).
+ * Specifying null will use {@link #GREATER_THAN}.
+ * @param comparator
+ * determines how objects compare with the threshold value.
+ * If null, the threshold object and list elements must implement {@link Comparable}.
+ * @param function
+ * an optional Function which produces a value fit to be
+ * compared against the threshold. This argument is optional, and if
+ * it is <tt>null</tt>, the raw values will compared against the
+ * threshold.
+ */
+ public PapyrusThresholdMatcherEditor(T threshold, MatchOperation operation, Comparator<T> comparator, FunctionList.Function<E, T> function) {
+ if (operation == null)
+ operation = GREATER_THAN;
+ if (comparator == null)
+ comparator = (Comparator<T>) GlazedLists.comparableComparator();
+ if (function == null)
+ function = (FunctionList.Function<E, T>) GlazedListsImpl.identityFunction();
+
+ this.operation = operation;
+ this.comparator = comparator;
+ this.threshold = threshold;
+ this.function = function;
+
+ // if this is our first matcher, it's automatically a constrain
+ currentMatcher = operation.instance(comparator, threshold, function);
+ fireChanged(currentMatcher);
+ }
+
+ /**
+ * Update the threshold used to determine what is matched by the list. This coupled
+ * with the {@link #setMatchOperation match operation} determines what's matched.
+ *
+ * @param threshold
+ * The threshold, or null to match everything.
+ */
+ public void setThreshold(T threshold) {
+ this.threshold = threshold;
+ rebuildMatcher();
+ }
+
+ /**
+ * See {@link #getThreshold()}.
+ */
+ public T getThreshold() {
+ return threshold;
+ }
+
+ /**
+ * Update the operation used to determine what relation list elements should
+ * have to the threshold in order to match (i.e. be visible). Must be non-null.
+ *
+ * @see #GREATER_THAN
+ * @see #GREATER_THAN_OR_EQUAL
+ * @see #LESS_THAN
+ * @see #LESS_THAN_OR_EQUAL
+ * @see #EQUAL
+ * @see #NOT_EQUAL
+ */
+ public void setMatchOperation(MatchOperation operation) {
+ if (operation == null)
+ throw new IllegalArgumentException("Operation cannot be null"); //$NON-NLS-1$
+
+ this.operation = operation;
+ rebuildMatcher();
+ }
+
+ /**
+ * See {@link #setMatchOperation}.
+ */
+ public MatchOperation getMatchOperation() {
+ return operation;
+ }
+
+ /**
+ * Update the comparator. Setting to null will require that thresholds and elements in
+ * the list implement {@link Comparable}.
+ */
+ public void setComparator(Comparator<T> comparator) {
+ if (comparator == null)
+ comparator = (Comparator<T>) GlazedLists.comparableComparator();
+
+ this.comparator = comparator;
+ rebuildMatcher();
+ }
+
+ public Comparator<T> getComparator() {
+ return comparator;
+ }
+
+ /** {@inheritDoc} */
+ private void rebuildMatcher() {
+ final MatchOperation newMatcher = operation.instance(comparator, threshold, function);
+
+ // otherwise test how the matchers relate
+ final boolean moreStrict = newMatcher.isMoreStrict(currentMatcher);
+ final boolean lessStrict = currentMatcher.isMoreStrict(newMatcher);
+
+ // if they're equal we're done and we won't change the matcher
+ if (!moreStrict && !lessStrict)
+ return;
+
+ // otherwise, fire the appropriate event
+ currentMatcher = newMatcher;
+ if (moreStrict && lessStrict)
+ fireChanged(currentMatcher);
+ else if (moreStrict)
+ fireConstrained(currentMatcher);
+ else
+ fireRelaxed(currentMatcher);
+ }
+
+ /**
+ * A {@link MatchOperation} serves as both a {@link Matcher} in and of itself
+ * and as an enumerated type representing its type as an operation.
+ */
+ private static class MatchOperation<E, T> implements Matcher<E> {
+
+ /** the comparator to compare values against */
+ protected final Comparator<T> comparator;
+ /** the pivot value to compare with */
+ protected final T threshold;
+ /** either 1 for greater, 0 for equal, or -1 for less than */
+ private final int polarity;
+ /** either true for equal or false for not equal */
+ private final boolean inclusive;
+ /** a function which produces a comparable value for a given element */
+ private final FunctionList.Function<E, T> function;
+
+ private MatchOperation(Comparator<T> comparator, T threshold, int polarity, boolean inclusive, FunctionList.Function<E, T> function) {
+ this.comparator = comparator;
+ this.threshold = threshold;
+ this.polarity = polarity;
+ this.inclusive = inclusive;
+ this.function = function;
+ }
+
+ private MatchOperation(int polarity, boolean inclusive) {
+ this(null, null, polarity, inclusive, (FunctionList.Function<E, T>) GlazedListsImpl.identityFunction());
+ }
+
+ /**
+ * Factory method to create a {@link MatchOperation} of the same type
+ * as this {@link MatchOperation}.
+ */
+ private MatchOperation<E, T> instance(Comparator<T> comparator, T threshold, FunctionList.Function<E, T> function) {
+ return new MatchOperation<E, T>(comparator, threshold, polarity, inclusive, function);
+ }
+
+ /**
+ * Compare this to another {@link MatchOperation}.
+ *
+ * @return true if there exists some Object i such that <code>this.matches(i)</code> is <code>false</code> when <code>other.matches(i)<code> is
+ * <code>true</code>. Two MatcherOperations can be mutually more
+ * strict than each other.
+ */
+ boolean isMoreStrict(MatchOperation<E, T> other) {
+ if (other.polarity != polarity)
+ return true;
+ if (other.comparator != comparator)
+ return true;
+ if (other.threshold == threshold) {
+ if (polarity == 0)
+ return other.inclusive != inclusive;
+ else
+ return (other.inclusive && !inclusive);
+ } else {
+ if (polarity == 0)
+ return true;
+ else if (!matchesThreshold(other.threshold))
+ return true;
+ }
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ public boolean matches(E item) {
+ return matchesThreshold(function.evaluate(item));
+ }
+
+ public boolean matchesThreshold(T t) {
+ // Papyrus - add the case for Collection
+ if (t instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) t;
+ List<Integer> res = new ArrayList<Integer>();
+ int nbInconsistantValue = 0;
+ for (Object object : coll) {
+ final int compareResult = comparator.compare((T) object, threshold);
+ if (compareResult == FilterPreferences.INCONSISTENT_VALUE) {
+ nbInconsistantValue++;
+ }
+ res.add(Integer.valueOf(compareResult));
+ }
+ if (nbInconsistantValue == coll.size()) {
+ return FilterPreferences.displayInconsistentValueWithFilter(null);
+ }
+ if (inclusive) {
+ if (polarity == 0) {
+ return res.contains(Integer.valueOf(0));
+ }
+ if (polarity == -1) {
+ return res.contains(Integer.valueOf(polarity)) || res.contains(Integer.valueOf(0));
+ }
+ if (polarity == 1) {
+ return res.contains(Integer.valueOf(polarity)) || res.contains(Integer.valueOf(0));
+ }
+ } else {
+ if (polarity == 0) {
+ return res.contains(Integer.valueOf(0));
+ }
+ if (polarity == -1) {
+ return res.contains(Integer.valueOf(polarity));
+ }
+ if (polarity == 1) {
+ return res.contains(Integer.valueOf(polarity));
+ }
+ }
+ throw new UnsupportedOperationException("we produced an impossible case"); //$NON-NLS-1$
+
+ } else {
+ // compare the extracted value with the threshold
+ final int compareResult = comparator.compare(t, threshold);
+ if (FilterPreferences.INCONSISTENT_VALUE == compareResult) {
+ return FilterPreferences.displayInconsistentValueWithFilter(null);
+ }
+ // item equals threshold, match <=, == and >=
+ if (compareResult == 0)
+ return inclusive;
+ // for == and !=, handle the case when the item is not equal to threshold
+ if (polarity == 0)
+ return !inclusive;
+ // item is below threshold and match <, <= or item is above and match >, >=
+ return ((compareResult < 0) == (polarity < 0));
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/RegexFindEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/RegexFindEditor.java
new file mode 100755
index 00000000000..0628a3915d0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/RegexFindEditor.java
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import static org.eclipse.nebula.widgets.nattable.filterrow.FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_DISPLAY_CONVERTER;
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ *
+ * The editor used for {@link PapyrusTextMatchingMode#REGEX_FIND}.
+ *
+ * For the {@link PapyrusTextMatchingMode#REGEX_MATCH}, we use GlazedList implementation. It could be interesting to override its matching stategy, but it is not possible (not in API)
+ *
+ */
+public class RegexFindEditor extends AbstractPapyrusMatcherEditor {
+
+ /**
+ * Constructor.
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ */
+ public RegexFindEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ super(columnAccesor, columnIndex, matchOn, configRegistry);
+
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor#createMatcher(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, int, java.lang.Object, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ protected Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, final int columnIndex, final Object matchOn, final IConfigRegistry configRegistry) {
+ Assert.isTrue(matchOn instanceof String);
+ return new Matcher<Object>() {
+
+ @Override
+ public boolean matches(Object item) {
+ if (matchOn == null || ((String) matchOn).isEmpty()) {
+ return true;
+ }
+
+ Pattern pattern;
+ try {
+ pattern = Pattern.compile((String) matchOn);
+ } catch (Exception e) {
+ // when the entered regex is not valid, we don't filter the rows
+ return true;
+ }
+
+ INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ int index = manager.getRowElementsList().indexOf(item);
+ BodyLayerStack stack = manager.getBodyLayerStack();
+ ILayerCell cell = stack.getCellByPosition(columnIndex, index);
+ Object value = CellManagerFactory.INSTANCE.getCrossValue(manager.getColumnElement(columnIndex), item, manager);
+ final IDisplayConverter displayConverter = configRegistry.getConfigAttribute(FILTER_DISPLAY_CONVERTER, NORMAL, FILTER_ROW_COLUMN_LABEL_PREFIX + columnIndex);
+ Object res = displayConverter.canonicalToDisplayValue(cell, configRegistry, value);
+ String str = (String) res;
+
+ java.util.regex.Matcher m = pattern.matcher(str);
+ return m.find();
+ }
+ };
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java
new file mode 100755
index 00000000000..17322bb0bc1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java
@@ -0,0 +1,335 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter;
+
+import static org.eclipse.nebula.widgets.nattable.filterrow.FilterRowDataLayer.FILTER_ROW_COLUMN_LABEL_PREFIX;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_COMPARATOR;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_DISPLAY_CONVERTER;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.TEXT_DELIMITER;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.TEXT_MATCHING_MODE;
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow.DefaultGlazedListsFilterStrategy;
+//import org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow.FilterRowUtils;
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult;
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult.MatchType;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.FunctionList;
+import ca.odell.glazedlists.FunctionList.Function;
+import ca.odell.glazedlists.TextFilterator;
+import ca.odell.glazedlists.matchers.CompositeMatcherEditor;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+import ca.odell.glazedlists.matchers.TextMatcherEditor;
+
+/**
+ * This class has been adapted from the works done for string in {@link DefaultGlazedListsFilterStrategy}
+ *
+ */
+public class StringMatcherEditorFactory<T> implements IPapyrusMatcherEditorFactory<T> {
+
+ /**
+ * internal converter between PapyrusMatchingMode and nattable matching mode
+ */
+ private static final TextMatchingMode convertToTextMatchingMode(PapyrusTextMatchingMode mode) {
+ switch (mode) {
+ case CONTAINS:
+ return TextMatchingMode.CONTAINS;
+ case EXACT:
+ return TextMatchingMode.EXACT;
+ case REGEX_FIND:
+ case REGEX_MATCH:
+ return TextMatchingMode.REGULAR_EXPRESSION;
+ case NUM:
+ return TextMatchingMode.REGULAR_EXPRESSION;
+ case START:
+ return TextMatchingMode.STARTS_WITH;
+ default:
+ return TextMatchingMode.CONTAINS;
+ }
+
+ }
+
+ /**
+ * @param columnAccessor
+ * @param columnIndex
+ * @param wantedValue
+ * @param configRegistry
+ * @see org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory#instantiateMatcherEditors(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, java.lang.Integer, java.lang.Object,
+ * org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public EventList<MatcherEditor<T>> instantiateMatcherEditors(IColumnAccessor<T> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry) {
+ Assert.isTrue(wantedValue instanceof String);
+ EventList<MatcherEditor<T>> matcherEditors = new BasicEventList<MatcherEditor<T>>();
+
+ StringBuilder columnLabelBuilder = new StringBuilder();
+ columnLabelBuilder.append(FILTER_ROW_COLUMN_LABEL_PREFIX);
+ columnLabelBuilder.append(columnIndex);
+
+ String columnLabelId = columnLabelBuilder.toString();
+ // for (Entry<Integer, Object> mapEntry : filterIndexToObjectMap.entrySet()) {
+ // Integer columnIndex = mapEntry.getKey();
+
+ PapyrusTextMatchingMode papyrusTextMatchingMode = getTextMatchingMode((String) wantedValue, configRegistry, columnLabelId);
+
+ // we look for the text delimiter
+
+ String textDelimiter = configRegistry.getConfigAttribute(TEXT_DELIMITER, NORMAL, columnLabelId);
+ // TextMatchingMode textMatchingMode = configRegistry.getConfigAttribute(TEXT_MATCHING_MODE, NORMAL, FILTER_ROW_COLUMN_LABEL_PREFIX + columnIndex);
+
+ // we get the text to filter
+ String filterText = getStringFromColumnObject(columnIndex, wantedValue, configRegistry);
+ EventList<MatcherEditor<T>> stringMatcherEditors = new BasicEventList<MatcherEditor<T>>();
+
+
+ TextMatchingMode textMatchingMode = convertToTextMatchingMode(papyrusTextMatchingMode);
+ IDisplayConverter displayConverter = configRegistry.getConfigAttribute(FILTER_DISPLAY_CONVERTER, NORMAL, columnLabelId);
+ @SuppressWarnings("rawtypes")
+ Comparator comparator = configRegistry.getConfigAttribute(FILTER_COMPARATOR, NORMAL, columnLabelId);
+ final Function<T, Object> columnValueProvider = getColumnValueProvider(columnIndex, columnAccessor);
+ if (PapyrusTextMatchingMode.REGEX_FIND.equals(papyrusTextMatchingMode)) {
+ stringMatcherEditors.add((MatcherEditor<T>) new RegexFindEditor((IColumnAccessor<Object>) columnAccessor, columnIndex, filterText, configRegistry));
+ } else {
+
+ List<ParseResult> parseResults = FilterRowUtils.parse(filterText, textDelimiter, textMatchingMode);
+
+
+ for (ParseResult parseResult : parseResults)
+ {
+ MatchType matchOperation = parseResult.getMatchOperation();
+ if (matchOperation == MatchType.NONE) {
+ stringMatcherEditors.add(getTextMatcherEditor(columnIndex, textMatchingMode, displayConverter, parseResult.getValueToMatch(), columnAccessor, configRegistry));
+ } else {
+ Object threshold = displayConverter.displayToCanonicalValue(parseResult.getValueToMatch());
+ matcherEditors.add(getThresholdMatcherEditor(columnIndex, threshold, comparator, columnValueProvider, matchOperation, configRegistry));
+ }
+ }
+ }
+ if (stringMatcherEditors.size() > 0) {
+ CompositeMatcherEditor<T> stringCompositeMatcherEditor = new CompositeMatcherEditor<T>(stringMatcherEditors);
+ stringCompositeMatcherEditor.setMode(CompositeMatcherEditor.OR);
+ matcherEditors.add(stringCompositeMatcherEditor);
+ }
+
+ return matcherEditors;
+
+ }
+
+
+
+ /**
+ *
+ * @param wantedValue
+ * the string typed in the text editor
+ * @param configRegistry
+ * the configRegistry used by the nattable widget
+ * @param columnLabel
+ * the label of the column
+ * @return
+ * the matching mode to use, according to the table configuration and the wanted value
+ */
+ protected PapyrusTextMatchingMode getTextMatchingMode(String wantedValue, IConfigRegistry configRegistry, String columnLabel) {
+ PapyrusTextMatchingMode papyrusMatchingMode = configRegistry.getConfigAttribute(NattableConfigAttributes.STRING_FILTER_MATCHING_MODE, NORMAL, columnLabel);
+ TextMatchingMode nattableMatchingMode = configRegistry.getConfigAttribute(TEXT_MATCHING_MODE, NORMAL, columnLabel);
+
+ if (papyrusMatchingMode == null && nattableMatchingMode == null) {
+ papyrusMatchingMode = PapyrusTextMatchingMode.CONTAINS;
+ }
+ if (papyrusMatchingMode != null || (papyrusMatchingMode == null && nattableMatchingMode != null)) {
+ if (PapyrusTextMatchingMode.CONTAINS.equals(papyrusMatchingMode) || nattableMatchingMode.equals(TextMatchingMode.CONTAINS)) {
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.REGEX_FIND.getMode())) {
+ return PapyrusTextMatchingMode.REGEX_FIND;
+ }
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.REGEX_MATCH.getMode())) {
+ return PapyrusTextMatchingMode.REGEX_MATCH;
+ }
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.CONTAINS.getMode())) {
+ return PapyrusTextMatchingMode.CONTAINS;
+ }
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.EXACT.getMode())) {
+ return PapyrusTextMatchingMode.EXACT;
+ }
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.START.getMode())) {
+ return PapyrusTextMatchingMode.START;
+ }
+ if (wantedValue.startsWith(PapyrusTextMatchingMode.NUM.getMode())) {
+ return PapyrusTextMatchingMode.NUM;
+ }
+ }
+ }
+ if (papyrusMatchingMode == null) {
+ switch (nattableMatchingMode) {
+ case CONTAINS:// managed before this line!
+ return PapyrusTextMatchingMode.CONTAINS;
+ case EXACT:
+ return PapyrusTextMatchingMode.EXACT;
+ case REGULAR_EXPRESSION:
+ return PapyrusTextMatchingMode.NUM;
+ case STARTS_WITH:
+ return PapyrusTextMatchingMode.START;
+ default:
+ // not possible
+ return PapyrusTextMatchingMode.CONTAINS;
+ }
+ }
+ return papyrusMatchingMode;
+ }
+
+
+ /**
+ * Converts the object inserted to the filter cell at the given column position to the corresponding String.
+ *
+ * @param columnIndex
+ * The column index of the filter cell that should be processed.
+ * @param object
+ * The value set to the filter cell that needs to be converted
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @return The String value for the given filter value.
+ */
+ protected String getStringFromColumnObject(final int columnIndex, Object object, IConfigRegistry configRegistry) {
+ Assert.isTrue(object instanceof String);
+ // if (object instanceof String) {
+ String str = (String) object;
+ if (str.startsWith(PapyrusTextMatchingMode.REGEX_FIND.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.REGEX_FIND.getMode(), ""); //$NON-NLS-1$
+ } else if (str.startsWith(PapyrusTextMatchingMode.REGEX_MATCH.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.REGEX_MATCH.getMode(), ""); //$NON-NLS-1$
+ } else if (str.startsWith(PapyrusTextMatchingMode.CONTAINS.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.CONTAINS.getMode(), ""); //$NON-NLS-1$
+ } else if (str.startsWith(PapyrusTextMatchingMode.EXACT.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.EXACT.getMode(), ""); //$NON-NLS-1$
+ } else if (str.startsWith(PapyrusTextMatchingMode.START.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.START.getMode(), ""); //$NON-NLS-1$
+ } else if (str.startsWith(PapyrusTextMatchingMode.NUM.getMode())) {
+ str = str.replaceFirst(PapyrusTextMatchingMode.NUM.getMode(), ""); //$NON-NLS-1$
+ }
+ return str;
+ }
+
+ /**
+ * Set up a threshold matcher for tokens like '&gt;20', '&lt;=10' etc.
+ *
+ * @param columnIndex
+ * of the column for which the matcher editor is being set up
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ */
+ protected PapyrusThresholdMatcherEditor<T, Object> getThresholdMatcherEditor(Integer columnIndex, Object threshold, Comparator<Object> comparator, Function<T, Object> columnValueProvider, MatchType matchOperation, IConfigRegistry configRegistry) {
+ PapyrusThresholdMatcherEditor<T, Object> thresholdMatcherEditor = new PapyrusThresholdMatcherEditor<T, Object>(
+ threshold,
+ null,
+ comparator,
+ columnValueProvider) {
+
+ };
+
+ FilterRowUtils.setMatchOperation(thresholdMatcherEditor, matchOperation);
+ return thresholdMatcherEditor;
+ }
+
+ /**
+ * @return Function which exposes the content of the given column index from the row object
+ */
+ protected FunctionList.Function<T, Object> getColumnValueProvider(final int columnIndex, final IColumnAccessor<T> columnAccessor) {
+ return new FunctionList.Function<T, Object>() {
+ @Override
+ public Object evaluate(T rowObject) {
+ return columnAccessor.getDataValue(rowObject, columnIndex);
+ }
+ };
+ }
+
+ /**
+ * Sets up a text matcher editor for String tokens
+ *
+ * @param columnIndex
+ * of the column for which the matcher editor is being set up
+ * @param filterText
+ * text entered by the user in the filter row
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ */
+ protected TextMatcherEditor<T> getTextMatcherEditor(Integer columnIndex, TextMatchingMode textMatchingMode, IDisplayConverter converter, String filterText, final IColumnAccessor<T> columnAccessor, IConfigRegistry configRegistry) {
+ TextMatcherEditor<T> textMatcherEditor = new TextMatcherEditor<T>(getTextFilterator(columnIndex, converter, columnAccessor, configRegistry));
+ textMatcherEditor.setFilterText(new String[] { filterText });
+ textMatcherEditor.setMode(getGlazedListsTextMatcherEditorMode(textMatchingMode));
+ return textMatcherEditor;
+ }
+
+ /**
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @return {@link TextFilterator} which exposes the contents of the column as a {@link String}
+ */
+ protected TextFilterator<T> getTextFilterator(final Integer columnIndex, final IDisplayConverter converter, final IColumnAccessor<T> columnAccessor, final IConfigRegistry configRegistry) {
+ return new TextFilterator<T>() {
+ @Override
+ public void getFilterStrings(List<String> objectAsListOfStrings, T rowObject) {
+ INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ int index = manager.getRowElementsList().indexOf(rowObject);
+ BodyLayerStack stack = manager.getBodyLayerStack();
+ ILayerCell cell = stack.getBodyDataLayer().getCellByPosition(columnIndex, index);
+ Object value = CellManagerFactory.INSTANCE.getCrossValue(manager.getColumnElement(columnIndex), rowObject, manager);
+ final IDisplayConverter displayConverter = configRegistry.getConfigAttribute(FILTER_DISPLAY_CONVERTER, NORMAL, FILTER_ROW_COLUMN_LABEL_PREFIX + columnIndex);
+ Object res = displayConverter.canonicalToDisplayValue(cell, configRegistry, value);
+ if (res instanceof String) {
+ objectAsListOfStrings.add((String) res);
+ } else if (res instanceof Collection<?>) {
+ // to manage multivalued properties
+ Collection<?> col = (Collection<?>) res;
+ for (Object object : col) {
+ objectAsListOfStrings.add(object.toString());
+ }
+ }
+ }
+ };
+ }
+
+ /**
+ * @return the equivalent for GlazedLists TextMatcherEditor.
+ */
+ public static final int getGlazedListsTextMatcherEditorMode(TextMatchingMode textMatchingMode) {
+ switch (textMatchingMode) {
+ case EXACT:
+ return TextMatcherEditor.EXACT;
+ case STARTS_WITH:
+ return TextMatcherEditor.STARTS_WITH;
+ case REGULAR_EXPRESSION:
+ return TextMatcherEditor.REGULAR_EXPRESSION;
+ default:
+ return TextMatcherEditor.CONTAINS;
+ }
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanComboBoxCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanComboBoxCellEditorFilterConfiguration.java
new file mode 100755
index 00000000000..88d7570986e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanComboBoxCellEditorFilterConfiguration.java
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.BooleanMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+/**
+ * The abstract class for boolean filter using combo
+ *
+ */
+public abstract class AbstractBooleanComboBoxCellEditorFilterConfiguration implements IFilterConfiguration {
+
+ /**
+ * the avalable values to boolean combo cell editor
+ */
+ protected static final List<?> availableValue = Arrays.asList(new Object[] { ICellManager.NOT_AVALAIBLE, Boolean.TRUE, Boolean.FALSE });
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ ICellEditor editor = createICellEditor(configRegistry, columnElement, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, createMatcherFactory(), DisplayMode.NORMAL, configLabel);
+ }
+
+ /**
+ *
+ * @return
+ * a new matcher factory
+ */
+ protected IPapyrusMatcherEditorFactory<Object> createMatcherFactory() {
+ return new BooleanMatcherEditorFactory();
+ }
+
+ /**
+ *
+ * @param configRegistry
+ * @param columnElement
+ * @param configLabel
+ * @return
+ * a new ICellEditor
+ */
+ protected ICellEditor createICellEditor(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ return new ComboBoxCellEditor(availableValue);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides an Combo to filter boolean values. Known values are true, false and N/A"; //$//$NON-NLS-1$
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration.java
new file mode 100755
index 00000000000..0747173ebee
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration.java
@@ -0,0 +1,218 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.filterrow.combobox.FilterRowComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * The abstract class for boolean filter using combo with checkbox for boolean
+ *
+ */
+public abstract class AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration extends AbstractBooleanComboBoxCellEditorFilterConfiguration {
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ ICellEditor editor = createICellEditor(configRegistry, columnElement, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, createMatcherFactory(), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(IFilterConfiguration.FILTER_VALUE_TO_MATCH_MANAGER, createBooleanFilterLoader());
+ }
+
+ /**
+ * @return
+ */
+ protected IFilterValueToMatchManager createBooleanFilterLoader() {
+ return new BooleanFilterValueToMatchManager(getConfigurationId());
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.EBooleanComboBoxCellEditorConfiguration#createICellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+ *
+ * @param configRegistry
+ * @param columnElement
+ * @param configLabel
+ * @return
+ */
+ @Override
+ protected ICellEditor createICellEditor(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ IComboBoxDataProvider dataProvider = new IComboBoxDataProvider() {
+
+ @Override
+ public List<?> getValues(int columnIndex, int rowIndex) {
+ return availableValue;
+ }
+ };
+ return new FilterRowComboBoxCellEditor(dataProvider);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.EBooleanComboBoxCellEditorFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ public String getConfigurationDescription() {
+ return "This configuration provides an Combo with checkbox to filter boolean values. Known values are true, false and N/A"; //$//$NON-NLS-1$
+ }
+
+ public static class BooleanFilterValueToMatchManager extends AbstractFilterValueToMatchManager {
+
+ /**
+ * Constructor.
+ *
+ * @param filterConfigurationId
+ */
+ public BooleanFilterValueToMatchManager(String filterConfigurationId) {
+ super(filterConfigurationId);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager#getValueToMatch(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param configRegistry
+ * @param axis
+ * @return
+ */
+ @Override
+ public Object getValueToMatch(IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ NamedStyle style = getValueToMatchStyle(iaxis);
+ if (style != null) {
+ if (style instanceof StringListValueStyle) {
+ List<Object> returnedValues = new ArrayList<Object>();
+ Collection<String> coll = ((StringListValueStyle) style).getStringListValue();
+ for (String string : coll) {
+ if (string.equals(ICellManager.NOT_AVALAIBLE)) {
+ returnedValues.add(ICellManager.NOT_AVALAIBLE);
+ } else {
+ Assert.isTrue(TypeUtils.isBooleanValue(string));
+ returnedValues.add(Boolean.valueOf(string));
+ }
+ }
+ return returnedValues;
+ }
+ if (style instanceof StringValueStyle) {
+ String val = ((StringValueStyle) style).getStringValue();
+ if (val.equals(ICellManager.NOT_AVALAIBLE)) {
+ return ICellManager.NOT_AVALAIBLE;
+ }
+ Assert.isTrue(TypeUtils.isBooleanValue(val));
+ return Boolean.valueOf(val);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager#getSaveValueToMatchCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,
+ * java.lang.Object, java.lang.Object)
+ *
+ * @param domain
+ * @param configRegistry
+ * @param axis
+ * @param newValue
+ * @return
+ */
+ @Override
+ protected Command getSaveValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis, Object newValue) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ CompoundCommand cc = new CompoundCommand("Save Value To Match Command"); //$NON-NLS-1$
+ NamedStyle keyStyle = getValueToMatchStyle(iaxis);
+ if (newValue instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) newValue;
+ // we need to update the keystyle
+ if (keyStyle != null && !(keyStyle instanceof StringListValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createStringListValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+
+ List<String> values = new ArrayList<String>();
+ for (Object tmp : coll) {
+ Assert.isTrue(tmp instanceof Boolean || ICellManager.NOT_AVALAIBLE.equals(tmp));
+ values.add(tmp.toString());
+ }
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringListValueStyle_StringListValue(), values));
+ } else {
+ if (keyStyle != null && !(keyStyle instanceof StringValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createEObjectValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+ Assert.isTrue(newValue instanceof Boolean || ICellManager.NOT_AVALAIBLE.equals(newValue));
+ // we store the name of the literal and a reference to the literal, for 2 reasons :
+ // - for static profile we get enumerator and not EEnumLiteral
+ // - in case of redefinition of the profile, the reference would be not correct
+ String name = newValue.toString();
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringValueStyle_StringValue(), name));
+ }
+ return cc;
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractDoubleEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractDoubleEditorFilterConfiguration.java
new file mode 100644
index 00000000000..e0da68d99ae
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractDoubleEditorFilterConfiguration.java
@@ -0,0 +1,152 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_COMPARATOR;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_DISPLAY_CONVERTER;
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.papyrus.infra.nattable.comparator.DoubleFilterComparator;
+import org.eclipse.papyrus.infra.nattable.filter.validator.DoubleFilterDataValidator;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * Abstract configuration to filter double values
+ *
+ */
+public abstract class AbstractDoubleEditorFilterConfiguration extends AbstractNumericEditorFilterConfiguration {
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractNumericEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ configRegistry.registerConfigAttribute(FILTER_COMPARATOR, DoubleFilterComparator.getInstance(), NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(FILTER_DISPLAY_CONVERTER, new DoubleToStringConverter(), NORMAL, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getDataValidator(IConfigRegistry)
+ *
+ * @return
+ */
+ @Override
+ protected IDataValidator getDataValidator(IConfigRegistry configRegistry) {
+ return new DoubleFilterDataValidator(configRegistry.getConfigAttribute(FilterRowConfigAttributes.TEXT_DELIMITER, NORMAL), TextMatchingMode.REGULAR_EXPRESSION);
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ public String getConfigurationDescription() {
+ return "This editor allows to filter on double value, using >, >=, <, <=, =, <>"; //$NON-NLS-1$
+ }
+
+ private static class DoubleToStringConverter implements IDisplayConverter {
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)
+ *
+ * @param displayValue
+ * @return
+ */
+ @Override
+ public Object displayToCanonicalValue(Object displayValue) {
+ Assert.isTrue(displayValue instanceof String);
+ Assert.isTrue(TypeUtils.isDoubleValue((String) displayValue));
+ return new BigDecimal((String) displayValue).doubleValue();
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param canonicalValue
+ * @return
+ */
+ @Override
+ public Object canonicalToDisplayValue(ILayerCell cell, IConfigRegistry configRegistry, Object canonicalValue) {
+ List<String> values = new ArrayList<String>();
+ if (canonicalValue instanceof Collection<?>) {
+ Collection<?> col = (Collection<?>) canonicalValue;
+ for (Object object : col) {
+ if (TypeUtils.isDoubleValue(object.toString())) {
+ values.add(new Double(object.toString()).toString());
+ }
+ else {
+ values.add(object.toString());
+ }
+ }
+ } else {
+ if (canonicalValue instanceof Double) {
+ values.add(canonicalValue.toString());
+ } else if (TypeUtils.isDoubleValue(canonicalValue.toString())) {
+ values.add(new Double(canonicalValue.toString()).toString());
+ } else {
+ values.add(canonicalValue.toString());
+ }
+ }
+ return values;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)
+ *
+ * @param canonicalValue
+ * @return
+ */
+ @Override
+ public Object canonicalToDisplayValue(Object canonicalValue) {
+ return null;
+ }
+
+
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param displayValue
+ * @return
+ */
+ @Override
+ public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {
+ return null;
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterConfiguration.java
new file mode 100755
index 00000000000..1756cc6bcbd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterConfiguration.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+/**
+ * Abstract class for the filter configuration
+ *
+ */
+public abstract class AbstractFilterConfiguration implements IFilterConfiguration {
+
+ /**
+ *
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @return
+ * the nattable model manager
+ */
+ protected final INattableModelManager getINattableModelManager(final IConfigRegistry configRegistry) {
+ return configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterValueToMatchManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterValueToMatchManager.java
new file mode 100755
index 00000000000..a612b64bd19
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractFilterValueToMatchManager.java
@@ -0,0 +1,252 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * abstract class to use to get and save the values to match to filter the table
+ *
+ * The value to match is registered as NamedStyle into the filtered IAxis. Two Name style are used to do that :
+ * <ul>
+ * <li>a {@link StringValueStyle} to store the id of the filter configuration to use. Two key can be used as name :
+ * <ul>
+ * <li> {@link IFilterConfiguration#FILTER_SYSTEM_ID} : it is the filter strategy choosen by the system. We will destroy its {@link StringValueStyle} when the filter will be reseted</li>
+ * <li>{@link IFilterConfiguration#FILTER_FORCED_BY_USER_ID} : it is the filter strategy choosen by the user. We WILL NOT destroy its {@link StringValueStyle} when the filter will be reseted</li>
+ * </ul>
+ * <li>another {@link NamedStyle} to store the value to match, using the key {@link IFilterConfiguration#FILTER_VALUE_TO_MATCH} as name</li>
+ *
+ *
+ * </ul>
+ *
+ */
+public abstract class AbstractFilterValueToMatchManager implements IFilterValueToMatchManager {
+
+ /**
+ * the id of the filter configuration to use to do the match with the stored values
+ */
+ private final String filterConfigurationId;
+
+ /**
+ * Constructor.
+ *
+ * @param filterConfigurationId
+ * the id of the filter configuration with which we are working
+ */
+ public AbstractFilterValueToMatchManager(final String filterConfigurationId) {
+ Assert.isNotNull(filterConfigurationId);
+ this.filterConfigurationId = filterConfigurationId;
+ }
+
+ /**
+ *
+ * @param axis
+ * an iaxis
+ * @return
+ * the filter id style for this iaxis when exists
+ */
+ protected final StringValueStyle getFilterConfigurationIdStyle(IAxis axis) {
+ StringValueStyle style = (StringValueStyle) axis.getNamedStyle(NattablestylePackage.eINSTANCE.getStringValueStyle(), IFilterConfiguration.FILTER_FORCED_BY_USER_ID);
+ if (style == null) {
+ style = (StringValueStyle) axis.getNamedStyle(NattablestylePackage.eINSTANCE.getStringValueStyle(), IFilterConfiguration.FILTER_SYSTEM_ID);
+ }
+ return style;
+ }
+
+ /**
+ *
+ * @param axis
+ * an iaxis
+ * @return
+ * the filter key style for this iaxis when exists
+ */
+ protected final NamedStyle getValueToMatchStyle(IAxis axis) {
+ return (NamedStyle) axis.getNamedStyle(NattablestylePackage.eINSTANCE.getNamedStyle(), IFilterConfiguration.FILTER_VALUE_TO_MATCH);
+ }
+
+
+
+ /**
+ *
+ * @param valueStyle
+ * the filter id value style
+ * @return
+ * <code>true</code> if the filter id style is defined by the user
+ */
+ protected boolean isFilterUserStyle(StringValueStyle valueStyle) {
+ return IFilterConfiguration.FILTER_FORCED_BY_USER_ID.equals(valueStyle.getName());
+ }
+
+ /**
+ *
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @return
+ * the nattable model manager
+ */
+ protected final INattableModelManager getINattableModelManager(final IConfigRegistry configRegistry) {
+ return configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager#saveValueToMatch(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.Object)
+ *
+ * @param confirRegistry
+ * @param axis
+ * @param newValue
+ */
+ @Override
+ public final void saveValueToMatch(IConfigRegistry configRegistry, Object axis, Object newValue) {
+ CompoundCommand cc = new CompoundCommand("Update Set Value To Match Command"); //$NON-NLS-1$
+ INattableModelManager manager = getINattableModelManager(configRegistry);
+ TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(manager.getTable());
+
+ if (newValue != null) {
+ // 1. we need to save the filter id value
+ Command saveFilterIdCmd = getSaveFilterIdCommand(domain, configRegistry, axis);
+ if (saveFilterIdCmd != null && saveFilterIdCmd.canExecute()) {
+ cc.append(saveFilterIdCmd);
+ }
+
+ // 2. we need to save the value
+ Command saveValueCommand = getSaveValueToMatchCommand(domain, configRegistry, axis, newValue);
+ if (saveValueCommand != null && saveValueCommand.canExecute()) {
+ cc.append(saveValueCommand);
+ }
+ } else {
+ // we need to destroy the filter id, only if the filter has been declared by the system and not by the user
+ Command deleteIdCmd = getDestroyFilterId(domain, configRegistry, axis);
+ if (deleteIdCmd != null && deleteIdCmd.canExecute()) {
+ cc.append(deleteIdCmd);
+ }
+
+ Command deleteKeyStyleCommand = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ // we need to destroy the filtered value
+ if (deleteKeyStyleCommand != null && deleteKeyStyleCommand.canExecute()) {
+ cc.append(deleteKeyStyleCommand);
+ }
+ }
+
+ if (!cc.isEmpty() && cc.canExecute()) {
+ domain.getCommandStack().execute(cc);
+ }
+ }
+
+ /**
+ *
+ * @param domain
+ * the editing domain to use
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @param axis
+ * the axis for which we want to destroy the style storing the value to match
+ * @return
+ * the command to destroy the style storing the value to match
+ */
+ protected final Command getDestroyFilterValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ Style keyStyle = (Style) getValueToMatchStyle(iaxis);
+ if (keyStyle != null) {
+ return RemoveCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), keyStyle);
+ }
+ return null;
+ }
+
+ /**
+ *
+ * @param domain
+ * the editing domain to use
+ * @param configRegistry
+ * the config registry used by the nattable widget
+ * @param axis
+ * the axis for which we want to destroy the id of the filter configuration to use
+ * @return
+ * the command to destroy the style storing the id of the filter configuration to use
+ */
+ protected final Command getDestroyFilterId(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ StringValueStyle idStyle = getFilterConfigurationIdStyle(iaxis);
+ if (idStyle != null && !isFilterUserStyle(idStyle)) {
+ // we need to destroy the filter id, only if the filter has been declared by the system and not by the user
+ return RemoveCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), idStyle);
+ }
+ return null;
+ }
+
+ /**
+ *
+ * @param domain
+ * the editing domain to use
+ * @param configRegistry
+ * the config registry of the nattable widget
+ * @param axis
+ * the axis for which we want to store the value to match
+ * @param valueToMatch
+ * the value to match
+ * @return
+ * the command to save the value to match in the model
+ */
+ protected abstract Command getSaveValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis, Object valueToMatch);
+
+ /**
+ *
+ * @param domain
+ * the editing domain to use
+ * @param configRegistry
+ * the config registry of the nattable widget
+ * @param axis
+ * the axis for which we want to store the value to match
+ * @return
+ * the command to store the filter configuration id to use for this axis
+ */
+ protected final Command getSaveFilterIdCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ StringValueStyle idStyle = getFilterConfigurationIdStyle(iaxis);
+ if (idStyle != null) {
+ Assert.isTrue(this.filterConfigurationId.equals(idStyle.getStringValue()), "These is a bug, the filter configuration is not the configuration saved in the model"); //$NON-NLS-1$
+ return null;
+ }
+ idStyle = NattablestyleFactory.eINSTANCE.createStringValueStyle();
+ idStyle.setName(IFilterConfiguration.FILTER_SYSTEM_ID);
+ idStyle.setStringValue(this.filterConfigurationId);
+ return AddCommand.create(domain, axis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), idStyle);
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractIntegerEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractIntegerEditorFilterConfiguration.java
new file mode 100644
index 00000000000..91e176db8c0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractIntegerEditorFilterConfiguration.java
@@ -0,0 +1,140 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_COMPARATOR;
+import static org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes.FILTER_DISPLAY_CONVERTER;
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.papyrus.infra.nattable.comparator.IntegerFilterComparator;
+import org.eclipse.papyrus.infra.nattable.filter.validator.IntegerFilterDataValidator;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * abstract configuration to filter integer values
+ *
+ */
+public abstract class AbstractIntegerEditorFilterConfiguration extends AbstractNumericEditorFilterConfiguration {
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ configRegistry.registerConfigAttribute(FILTER_COMPARATOR, IntegerFilterComparator.getInstance(), NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(FILTER_DISPLAY_CONVERTER, new IntegerToStringConverter(), NORMAL, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getDataValidator(IConfigRegistry)
+ *
+ * @return
+ */
+ @Override
+ protected IDataValidator getDataValidator(IConfigRegistry configRegistry) {
+ return new IntegerFilterDataValidator(configRegistry.getConfigAttribute(FilterRowConfigAttributes.TEXT_DELIMITER, NORMAL), TextMatchingMode.REGULAR_EXPRESSION);
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ public String getConfigurationDescription() {
+ return "This editor allows to filter on integer value, using >, >=, <, <=, =, <>"; //$NON-NLS-1$
+ }
+
+ private static final class IntegerToStringConverter implements IDisplayConverter {
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)
+ *
+ * @param canonicalValue
+ * @return
+ */
+ @Override
+ public Object canonicalToDisplayValue(Object canonicalValue) {
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)
+ *
+ * @param displayValue
+ * @return
+ */
+ @Override
+ public Object displayToCanonicalValue(Object displayValue) {
+ // here we need to convert to the wanted type
+ Assert.isTrue(displayValue instanceof String);
+ Assert.isTrue(TypeUtils.isIntegerValue((String) displayValue));
+ return Integer.valueOf((String) displayValue);
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param canonicalValue
+ * @return
+ */
+ @Override
+ public Object canonicalToDisplayValue(ILayerCell cell, IConfigRegistry configRegistry, Object canonicalValue) {
+ // here we need to convert to string
+ List<String> values = new ArrayList<String>();
+ if (canonicalValue instanceof Collection<?>) {
+ Collection<?> col = (Collection<?>) canonicalValue;
+ for (Object object : col) {
+ values.add(object.toString());
+ }
+ } else {
+ values.add(canonicalValue.toString());
+ }
+ return values;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param displayValue
+ * @return
+ */
+ @Override
+ public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {
+ return null;
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNaturalEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNaturalEditorFilterConfiguration.java
new file mode 100644
index 00000000000..eafc402ad6b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNaturalEditorFilterConfiguration.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.filter.validator.NaturalFilterDataValidator;
+
+/**
+ * abstract class used to filter natural numbers
+ */
+public class AbstractNaturalEditorFilterConfiguration extends AbstractIntegerEditorFilterConfiguration {
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getDataValidator(IConfigRegistry)
+ *
+ * @return
+ */
+ @Override
+ protected IDataValidator getDataValidator(IConfigRegistry configRegistry) {
+ return new NaturalFilterDataValidator(configRegistry.getConfigAttribute(FilterRowConfigAttributes.TEXT_DELIMITER, NORMAL), TextMatchingMode.REGULAR_EXPRESSION);
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ public String getConfigurationDescription() {
+ return "This editor allows to filter natural values, using >, >=, <, <=, =, <>"; //$NON-NLS-1$
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNumericEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNumericEditorFilterConfiguration.java
new file mode 100644
index 00000000000..6619ad6d122
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/AbstractNumericEditorFilterConfiguration.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusTextMatchingMode;
+
+/**
+ * abstract configuration to filter numerical values
+ *
+ */
+public abstract class AbstractNumericEditorFilterConfiguration extends TextEditorFilterConfiguration {
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getFilterMatchingMode()
+ *
+ * @return
+ */
+ @Override
+ protected PapyrusTextMatchingMode getFilterMatchingMode() {
+ return PapyrusTextMatchingMode.NUM;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/FilterConfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/FilterConfigurationFactory.java
new file mode 100755
index 00000000000..6e14fe995d7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/FilterConfigurationFactory.java
@@ -0,0 +1,180 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ *
+ * This class manage the the contribution to the extension point "org.eclipse.papyrus.infra.nattable.filter.configuration".
+ *
+ * This extension point allows to register the filter configuration
+ */
+public class FilterConfigurationFactory {
+
+ /**
+ * this map store the contribution to the extension point
+ */
+ private Map<Integer, List<IFilterConfiguration>> contributionByOrder;
+
+ /**
+ * this map store the contribution by id
+ */
+ private Map<String, IFilterConfiguration> configurationById;
+ /**
+ * the id of the extension point
+ */
+ public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.filter.configuration"; //$NON-NLS-1$
+
+ /**
+ * the field used to register the java class contributing to this extension point
+ */
+ public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+ /**
+ * the field order (an integer) used to organize the contribution
+ */
+ public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
+
+ /**
+ * this class is a singleton
+ */
+ public static final FilterConfigurationFactory INSTANCE = new FilterConfigurationFactory();
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ private FilterConfigurationFactory() {
+ // to prevent instanciation
+ final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+ this.contributionByOrder = new TreeMap<Integer, List<IFilterConfiguration>>();
+ this.configurationById = new HashMap<String, IFilterConfiguration>();
+ for (final IConfigurationElement iConfigurationElement : configElements) {
+ String orderAttribute = iConfigurationElement.getAttribute(ORDER_ATTRIBUTE);
+ if (!TypeUtils.isIntegerValue(orderAttribute)) {
+ Activator.log.warn(NLS.bind("The order declared for a filter configuration in the plugin {0} is not an integer", iConfigurationElement.getNamespaceIdentifier())); //$NON-NLS-1$
+ continue;
+ }
+ final Integer order = Integer.parseInt(orderAttribute);
+ try {
+ final Object tmp = iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);
+ if (!(tmp instanceof IFilterConfiguration)) {
+ Activator.log.warn(NLS.bind("The class {0} declared as filter configuration doesn't implements the interface {1}", tmp.getClass().getName(), IFilterConfiguration.class.getName())); //$NON-NLS-1$
+ continue;
+ }
+ final IFilterConfiguration factory = (IFilterConfiguration) tmp;
+
+
+ if (factory != null) {
+ String id = factory.getConfigurationId();
+ if (id == null || id.isEmpty()) {
+ Activator.log.warn(NLS.bind("The id returned by the class {0} is null or empty, so this contribution will be ignored", factory.getClass().getName())); //$NON-NLS-1$
+ continue;
+ }
+ if (configurationById.containsKey(id)) {
+ Activator.log.warn(NLS.bind("The id returned by the class {0} already exists, so the previous contribution will be erased", factory.getClass().getName())); //$NON-NLS-1$
+ }
+ configurationById.put(id, factory);
+
+ List<IFilterConfiguration> list = this.contributionByOrder.get(order);
+ if (list == null) {
+ list = new ArrayList<IFilterConfiguration>();
+ this.contributionByOrder.put(order, list);
+ }
+ list.add(factory);
+ }
+
+ } catch (final CoreException e) {
+ Activator.log.error(e);
+ }
+ }
+ }
+
+
+ /**
+ * This method allows to configure the filter. if not specific filter configuration is found, we will use the StringFilterConfiguration
+ *
+ * @param configRegistry
+ * the configuration registry used by nattable
+ * @param axis
+ * the axis to configure
+ * @param configLabel
+ * the label to use to configure the filter
+ */
+ public void configureFilter(final IConfigRegistry configRegistry, final Object axis, final String configLabel) {
+ IFilterConfiguration conf = getFilterConfigurationToUse(configRegistry, axis);
+ // we use the String filter configuration
+ if (conf == null) {
+ conf = new TextEditorFilterConfiguration();
+ }
+ conf.configureFilter(configRegistry, axis, configLabel);
+ }
+
+ /**
+ * @param axis
+ * @param configRegistry
+ * @return can be <code>null</code> if no configuration is found
+ */
+ private IFilterConfiguration getFilterConfigurationToUse(IConfigRegistry configRegistry, Object axis) {
+ if (axis instanceof IAxis) {
+ StringValueStyle style = (StringValueStyle) ((IAxis) axis).getNamedStyle(NattablestylePackage.eINSTANCE.getStringValueStyle(), IFilterConfiguration.FILTER_FORCED_BY_USER_ID);
+ if (style == null) {
+ style = (StringValueStyle) ((IAxis) axis).getNamedStyle(NattablestylePackage.eINSTANCE.getStringValueStyle(), IFilterConfiguration.FILTER_SYSTEM_ID);
+ }
+ if (style != null) {
+ IFilterConfiguration conf = getFilterConfiguration(style.getStringValue());
+ if (conf != null) {
+ return conf;
+ }
+ }
+
+ }
+ for (Entry<Integer, List<IFilterConfiguration>> entry : this.contributionByOrder.entrySet()) {
+ for (IFilterConfiguration current : entry.getValue()) {
+ if (current.handles(configRegistry, axis)) {
+ return current;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @param editorId
+ * @return
+ */
+ private IFilterConfiguration getFilterConfiguration(final String filterConfigurationId) {
+ return this.configurationById.get(filterConfigurationId);
+ }
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/IFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/IFilterConfiguration.java
new file mode 100755
index 00000000000..3b77b2ad558
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/IFilterConfiguration.java
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.ConfigAttribute;
+import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+/**
+ * This interface is used to register new cell editor for filter
+ *
+ */
+
+public interface IFilterConfiguration extends IPapyrusNatTableConfiguration {
+
+
+ /**
+ * key used to save a filter configuration id state when the system use the default filter provided by the configuration
+ * It is only used as name for a {@link StringValueStyle}
+ */
+ public static final String FILTER_SYSTEM_ID = "filterId"; //$NON-NLS-1$
+
+ /**
+ * key used to save filter state (the value typed by the user to filter the rows)
+ * This key used as name for a {@link Style} without more precision
+ */
+ public static final String FILTER_VALUE_TO_MATCH = "filterValueToMatch"; //$NON-NLS-1$
+
+ /**
+ * key used to save a filter configuration id state when the system use a filter choosen by the user
+ * It is only used as name for a {@link StringValueStyle}, we use a specific key in order to not destroyed it when we unapply filter on a column where filter has been definied by the user
+ *
+ *
+ */
+ public static final String FILTER_FORCED_BY_USER_ID = "filterForcedByUserId"; //$NON-NLS-1$
+
+ /**
+ * the config attribute used to register the class loading and storing filter state
+ */
+ public static final ConfigAttribute<IFilterValueToMatchManager> FILTER_VALUE_TO_MATCH_MANAGER = NattableConfigAttributes.FILTER_VALUE_TO_MATCH_MANAGER;
+
+ /**
+ *
+ * @param registry
+ * the config registry used by NatTable
+ * @param axis
+ * the axis for which we want a filter
+ * @return
+ * <code>true</code> if the configuration manage the axis
+ */
+ public boolean handles(IConfigRegistry registry, final Object axis);
+
+ /**
+ *
+ * @param registry
+ * the config registry used by NatTable
+ * @param axis
+ * the axis for which we want a filter
+ * @param configLabel
+ * the label to use to declare the filter
+ *
+ * This method is used to store information required to filter the table into the config registry
+ */
+ public void configureFilter(IConfigRegistry configRegistry, final Object axis, final String configLabel);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/TextEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/TextEditorFilterConfiguration.java
new file mode 100755
index 00000000000..b3c98bcd9df
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/configuration/TextEditorFilterConfiguration.java
@@ -0,0 +1,214 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.configuration;
+
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import java.util.Comparator;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.config.DefaultComparator;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusTextMatchingMode;
+import org.eclipse.papyrus.infra.nattable.filter.StringMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.filter.validator.StringFilterDataValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * This is the filter cell editor used by default in the table. It allows to these matches :
+ * <ul>
+ * <li>contains</li>
+ * <li>startWith</li>
+ * <li>regex_match</li>
+ * <li>regex_find</li>
+ * <li>numeric</li>
+ * <li>exact</li>
+ * </ul>
+ *
+ * @See {@link PapyrusTextMatchingMode} for further information
+ *
+ */
+public class TextEditorFilterConfiguration extends AbstractFilterConfiguration implements IFilterConfiguration {
+
+ /**
+ * the id of the editor
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.nattable.string.filter.configuration"; //$NON-NLS-1$
+
+ /**
+ * the description of the editor configuration
+ */
+ public static final String DESCRIPTION = NLS
+ .bind("This editor allows to edit string value. It is used to do a string comparison when there is no other editor declared to manage filter. By default, this editor tests if the string is contains by the cells, but it allows to filter with others strategy doing starting the text in the fiter cell by {0}, {1}, {2}, {3}, {4}: ", new Object[] { PapyrusTextMatchingMode.EXACT, PapyrusTextMatchingMode.NUM, PapyrusTextMatchingMode.REGEX_FIND, PapyrusTextMatchingMode.REGEX_MATCH, PapyrusTextMatchingMode.START }); //$NON-NLS-1$, binding)
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.ConfigRegistry, java.lang.Object, int, List<Object>)
+ *
+ * @param configRegistry
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ ICellEditor editor = new TextCellEditor();
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, DisplayMode.NORMAL, configLabel);
+ StringMatcherEditorFactory<Object> creator = new StringMatcherEditorFactory<Object>();
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.MATCHER_EDITOR_FACTORY, creator, DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR, getDataValidator(configRegistry), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.STRING_FILTER_MATCHING_MODE, getFilterMatchingMode(), NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.FILTER_VALUE_TO_MATCH_MANAGER, new TextFilterValueToMatchManager(getConfigurationId()), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(FilterRowConfigAttributes.FILTER_COMPARATOR, new Comparator<Object>() {
+
+ //the second one is the threshold
+ @Override
+ public int compare(Object o1, Object o2) {
+ if(TypeUtils.isNumericValue(o2) && !TypeUtils.isNumericValue(o1)){
+ return FilterPreferences.INCONSISTENT_VALUE;
+ }
+ return DefaultComparator.getInstance().compare(o1, o2);
+ }
+ }, DisplayMode.NORMAL, configLabel);
+ }
+
+ /**
+ * @return
+ */
+ protected PapyrusTextMatchingMode getFilterMatchingMode() {
+ return PapyrusTextMatchingMode.CONTAINS;
+ }
+
+ /**
+ *
+ * @param configRegistry
+ * TODO
+ * @return
+ * the data validator to use
+ */
+ protected IDataValidator getDataValidator(IConfigRegistry configRegistry) {
+ return new StringFilterDataValidator();
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.ConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ return columnElement != null;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return DESCRIPTION;
+ }
+
+
+ private class TextFilterValueToMatchManager extends AbstractFilterValueToMatchManager {
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param filterEditorId
+ * the id of the filter configuration with which we are working
+ */
+ public TextFilterValueToMatchManager(String filterEditorId) {
+ super(filterEditorId);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager#getSaveValueToMatchCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,
+ * java.lang.Object, java.lang.Object)
+ *
+ * @param domain
+ * @param configRegistry
+ * @param axis
+ * @param newValue
+ * @return
+ */
+ @Override
+ protected Command getSaveValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis, Object newValue) {
+ if (!(axis instanceof IAxis) || newValue == null) {
+ return null;
+ }
+ Assert.isTrue(newValue instanceof String);
+ String str = (String) newValue;
+ IAxis iaxis = (IAxis) axis;
+ StringValueStyle style = (StringValueStyle) getValueToMatchStyle(iaxis);
+ if (style != null) {
+ return SetCommand.create(domain, style, NattablestylePackage.eINSTANCE.getStringValueStyle_StringValue(), str);
+ } else {
+ style = NattablestyleFactory.eINSTANCE.createStringValueStyle();
+ style.setName(IFilterConfiguration.FILTER_VALUE_TO_MATCH);
+ style.setStringValue(str);
+ return AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), style);
+ }
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager#getValueToMatch(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param configRegistry
+ * @param axis
+ * @return
+ */
+ @Override
+ public Object getValueToMatch(IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ StringValueStyle style = (StringValueStyle) getValueToMatchStyle(iaxis);
+ if (style != null) {
+ return style.getStringValue();
+ }
+ return null;
+ }
+
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/AbstractFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/AbstractFilterDataValidator.java
new file mode 100644
index 00000000000..8a31d9a6e68
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/AbstractFilterDataValidator.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+
+/**
+ * @author VL222926
+ *
+ */
+public abstract class AbstractFilterDataValidator extends DataValidator {
+
+ /**
+ * the value separator
+ */
+ protected final String valueSeparator;
+
+ /**
+ * the matching mode
+ */
+ protected final TextMatchingMode matchingMode;
+
+ protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+ /**
+ * Constructor.
+ *
+ */
+ public AbstractFilterDataValidator(String valueSeparator, TextMatchingMode matchingMode) {
+ this.valueSeparator = valueSeparator;
+ this.matchingMode = matchingMode;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ return false;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/DoubleFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/DoubleFilterDataValidator.java
new file mode 100644
index 00000000000..733c97afa87
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/DoubleFilterDataValidator.java
@@ -0,0 +1,75 @@
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.papyrus.infra.nattable.filter.FilterRowUtils;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ *
+ * Validator for Double values used in filter rows
+ *
+ */
+public class DoubleFilterDataValidator extends AbstractFilterDataValidator {
+
+ /**
+ * Constructor.
+ *
+ * @param valueSeparator
+ * @param matchingMode
+ */
+ public DoubleFilterDataValidator(String valueSeparator, TextMatchingMode matchingMode) {
+ super(valueSeparator, matchingMode);
+ }
+
+ /**
+ *
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ if (TypeUtils.isDoubleValue(newValue.toString())) {
+ return true;
+ }
+ List<ParseResult> res;
+ try {
+ res = FilterRowUtils.parse((String) newValue, valueSeparator, matchingMode);
+ } catch (Exception e) {
+ return false;
+ }
+ for (ParseResult current : res) {
+ String valueToMatch = current.getValueToMatch();
+ if (valueToMatch == null || valueToMatch.equals(EMPTY_STRING)) {
+ continue;
+ }
+ boolean tmp = TypeUtils.isDoubleValue(valueToMatch);
+ if (!tmp) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/IntegerFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/IntegerFilterDataValidator.java
new file mode 100644
index 00000000000..a15f84446eb
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/IntegerFilterDataValidator.java
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.papyrus.infra.nattable.filter.FilterRowUtils;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ *
+ * The Validator used in filter row for integer
+ *
+ */
+public class IntegerFilterDataValidator extends AbstractFilterDataValidator {
+
+
+ /**
+ * Constructor.
+ *
+ * @param valueSeparator
+ * @param matchingMode
+ */
+ public IntegerFilterDataValidator(String valueSeparator, TextMatchingMode matchingMode) {
+ super(valueSeparator, matchingMode);
+ }
+
+ /**
+ *
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ if (TypeUtils.isIntegerValue(newValue.toString())) {
+ return true;
+ }
+ List<ParseResult> res;
+ try {
+ res = FilterRowUtils.parse((String) newValue, valueSeparator, matchingMode);
+ } catch (Exception e) {
+ return false;
+ }
+ for (ParseResult current : res) {
+ String valueToMatch = current.getValueToMatch();
+ if (valueToMatch == null || valueToMatch.equals(EMPTY_STRING)) {
+ continue;
+ }
+ boolean tmp = TypeUtils.isIntegerValue(valueToMatch);
+ if (!tmp) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/NaturalFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/NaturalFilterDataValidator.java
new file mode 100644
index 00000000000..c8dfd615e5b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/NaturalFilterDataValidator.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.filterrow.ParseResult;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.papyrus.infra.nattable.filter.FilterRowUtils;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * Validator used to filter natural values in the table
+ *
+ */
+public class NaturalFilterDataValidator extends AbstractFilterDataValidator {
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param valueSeparator
+ * @param matchingMode
+ */
+ public NaturalFilterDataValidator(String valueSeparator, TextMatchingMode matchingMode) {
+ super(valueSeparator, matchingMode);
+ }
+
+
+ /**
+ *
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ if (TypeUtils.isIntegerValue(newValue.toString())) {
+ return true;
+ }
+ List<ParseResult> res;
+ try {
+ res = FilterRowUtils.parse((String) newValue, valueSeparator, matchingMode);
+ } catch (Exception e) {
+ return false;
+ }
+ for (ParseResult current : res) {
+ String valueToMatch = current.getValueToMatch();
+ if (valueToMatch == null || valueToMatch.equals(EMPTY_STRING)) {
+ continue;
+ }
+ boolean tmp = TypeUtils.isIntegerValue(valueToMatch);
+ if (!tmp) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/RegexFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/RegexFilterDataValidator.java
new file mode 100755
index 00000000000..df466f0798f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/RegexFilterDataValidator.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+
+/**
+ * The validator used by filter for the regex
+ *
+ */
+public class RegexFilterDataValidator implements IDataValidator {
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator#validate(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(ILayerCell cell, IConfigRegistry configRegistry, Object newValue) {
+ Assert.isTrue(newValue instanceof String);
+ String regex = (String) newValue;
+ if (regex.isEmpty()) {
+ return true;
+ }
+ try {
+ Pattern.compile(regex);
+ } catch (Exception e) {
+ return false;
+ }
+
+ return true;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/StringFilterDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/StringFilterDataValidator.java
new file mode 100755
index 00000000000..29d5858b922
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/validator/StringFilterDataValidator.java
@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.filter.validator;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusTextMatchingMode;
+
+/**
+ * The validator used for all string editor in the filter row header
+ *
+ */
+public class StringFilterDataValidator implements IDataValidator {
+
+ /**
+ * validator used for regex
+ */
+ private RegexFilterDataValidator regexValidator = new RegexFilterDataValidator();
+
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator#validate(int, int, java.lang.Object)
+ *
+ * @param columnIndex
+ * @param rowIndex
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator#validate(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param cell
+ * @param configRegistry
+ * @param newValue
+ * @return
+ */
+ @Override
+ public boolean validate(ILayerCell cell, IConfigRegistry configRegistry, Object newValue) {
+ if (newValue == null) {
+ return true;
+ }
+ Assert.isTrue(newValue instanceof String);
+ String value = (String) newValue;
+
+ if (value.startsWith(PapyrusTextMatchingMode.NUM.getMode())) {
+ String num = value.replaceFirst(PapyrusTextMatchingMode.NUM.getMode(), ""); //$NON-NLS-1$
+ // TODO
+ } else if (value.startsWith(PapyrusTextMatchingMode.REGEX_FIND.getMode())) {
+ String regex = value.replaceFirst(PapyrusTextMatchingMode.REGEX_FIND.getMode(), ""); //$NON-NLS-1$
+ return regexValidator.validate(cell, configRegistry, regex);
+ } else if (value.startsWith(PapyrusTextMatchingMode.REGEX_MATCH.getMode())) {
+ String regex = value.replaceFirst(PapyrusTextMatchingMode.REGEX_MATCH.getMode(), ""); //$NON-NLS-1$
+ return regexValidator.validate(cell, configRegistry, regex);
+ }
+ return true;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
index 3c12975f076..a06e3c3be8b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.handler;
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IExecutableExtension;
/**
* @author VL222926
- *
+ *
*
*/
public abstract class AbstractParametricTreeTableHandler extends AbstractTreeTableHandler implements IExecutableExtension {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
index 6f49f02ef1a..7d57d6fa366 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.handler;
@@ -38,7 +38,7 @@ public abstract class AbstractTreeTableHandler extends AbstractTableHandler {
}
/**
- *
+ *
* @return
* the current tree nattable model manager
*/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
index 3872fd06850..7190712ebed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.handler;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayFilterHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayFilterHandler.java
new file mode 100755
index 00000000000..997656925c6
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayFilterHandler.java
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Handler to display the filter row in the column header
+ *
+ */
+public class ColumnDisplayFilterHandler extends AbstractColumnChangeHeaderConfigurationHandler {
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+ *
+ * @return
+ */
+ @Override
+ protected EStructuralFeature getEditedFeature() {
+ return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter();
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
index 5925216dc58..5f35f1f23d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.handler;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TransactionalCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TransactionalCommandHandler.java
index 3a75a0fd619..576c7c54ab9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TransactionalCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TransactionalCommandHandler.java
@@ -43,7 +43,7 @@ public abstract class TransactionalCommandHandler<T extends ILayerCommand> imple
}
public String getLabel() {
- return (label != null) ? label : "Table Command";
+ return (label != null) ? label : "Table Command"; //$NON-NLS-1$
}
public void setLabel(String label) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
index ae300e84d38..f5f38437e46 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
public class TreeRowHideAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
/**
- *
+ *
* @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*
* @param event
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesCommandHandler.java
index ffc09aa7e8e..ef4c66d1ca7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesCommandHandler.java
@@ -22,14 +22,14 @@ import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
/**
- *
+ *
* @author VL222926
*
*/
public class TreeRowShowAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
/**
- *
+ *
* @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*
* @param event
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
index 5530779c2c8..8ef66c5a2c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.handler;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowDataLayer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowDataLayer.java
new file mode 100755
index 00000000000..affab2aaf12
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowDataLayer.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Original authors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Original authors and others - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.layer;
+
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.filterrow.command.ClearAllFiltersCommand;
+import org.eclipse.nebula.widgets.nattable.filterrow.command.ClearFilterCommand;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.DefaultFilterRowConfiguration;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.event.RowStructuralRefreshEvent;
+import org.eclipse.papyrus.infra.nattable.dataprovider.FilterRowDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * {@link DataLayer} with a custom {@link IDataProvider} which stores/tracks the filter text on columns.
+ * Applies region name of {@link GridRegion#FILTER_ROW} to the filter row.
+ * Persists the filter text to the properties file.
+ *
+ * @param <T>
+ * type of the underlying row object
+ *
+ * Duplicated and adapted code from Nattable
+ */
+public class FilterRowDataLayer<T> extends DataLayer {
+
+ /** Prefix of the column label applied to each column in the filter row */
+ public static final String FILTER_ROW_COLUMN_LABEL_PREFIX = "FILTER_COLUMN_"; //$NON-NLS-1$
+
+ /** Prefix for the persistence key in the properties file */
+ public static final String PERSISTENCE_KEY_FILTER_ROW_TOKENS = ".filterTokens"; //$NON-NLS-1$
+
+
+ public FilterRowDataLayer(IFilterStrategy<T> filterStrategy, ILayer columnHeaderLayer, IDataProvider columnHeaderDataProvider, INattableModelManager tableManager) {
+ super(new FilterRowDataProvider<T>(filterStrategy, columnHeaderLayer, columnHeaderDataProvider, tableManager));
+
+ addConfiguration(new DefaultFilterRowConfiguration());
+ }
+
+ @SuppressWarnings("unchecked")
+ public FilterRowDataProvider<T> getFilterRowDataProvider() {
+ return (FilterRowDataProvider<T>) dataProvider;
+ }
+
+ @Override
+ public boolean doCommand(ILayerCommand command) {
+ boolean handled = false;
+ if (command instanceof ClearFilterCommand && command.convertToTargetLayer(this)) {
+ int columnPosition = ((ClearFilterCommand) command).getColumnPosition();
+ dataProvider.setDataValue(columnPosition, 0, null);
+ handled = true;
+ } else if (command instanceof ClearAllFiltersCommand) {
+ getFilterRowDataProvider().clearAllFilters();
+ handled = true;
+ }
+
+ if (handled) {
+ fireLayerEvent(new RowStructuralRefreshEvent(this));
+ return true;
+ } else {
+ return super.doCommand(command);
+ }
+ }
+
+ @Override
+ public LabelStack getConfigLabelsByPosition(int columnPosition, int rowPosition) {
+ // At the data layer level position == index
+ final LabelStack labels = super.getConfigLabelsByPosition(columnPosition, rowPosition);
+ labels.addLabel(FILTER_ROW_COLUMN_LABEL_PREFIX + columnPosition);
+ labels.addLabel(GridRegion.FILTER_ROW);
+ return labels;
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowHeaderComposite.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowHeaderComposite.java
new file mode 100755
index 00000000000..0fbd280b6e0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/FilterRowHeaderComposite.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Original authors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Original authors and others - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.layer;
+
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.filterrow.command.ToggleFilterRowCommand;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.grid.layer.ColumnHeaderLayer;
+import org.eclipse.nebula.widgets.nattable.grid.layer.DimensionallyDependentLayer;
+import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.event.RowStructuralRefreshEvent;
+import org.eclipse.papyrus.infra.nattable.command.UpdateFilterMapCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * 1 column x 2 rows Composite layer
+ * <ul>
+ * <li>First row is the {@link ColumnHeaderLayer}</li>
+ * <li>Second row is the composite is the filter row layer. The filter row layer is a {@link DimensionallyDependentLayer} dependent on the {@link ColumnHeaderLayer}</li>
+ * </ul>
+ *
+ * @see FilterRowDataLayer
+ *
+ * Duplicated and adapted code from Nattable
+ */
+public class FilterRowHeaderComposite<T> extends CompositeLayer {
+
+ private final FilterRowDataLayer<T> filterRowDataLayer;
+ private boolean filterRowVisible = true;
+
+ public FilterRowHeaderComposite(IFilterStrategy<T> filterStrategy, ILayer columnHeaderLayer, IDataProvider columnHeaderDataProvider, INattableModelManager tableManager) {
+ super(1, 2);
+
+ setChildLayer("columnHeader", columnHeaderLayer, 0, 0); //$NON-NLS-1$
+
+ filterRowDataLayer = new FilterRowDataLayer<T>(filterStrategy, columnHeaderLayer, columnHeaderDataProvider, tableManager);
+ DimensionallyDependentLayer filterRowLayer = new DimensionallyDependentLayer(filterRowDataLayer, columnHeaderLayer, filterRowDataLayer);
+
+ setChildLayer(GridRegion.FILTER_ROW, filterRowLayer, 0, 1);
+ }
+
+ public FilterRowDataLayer<T> getFilterRowDataLayer() {
+ return filterRowDataLayer;
+ }
+
+ @Override
+ public int getHeight() {
+ if (filterRowVisible) {
+ return super.getHeight();
+ } else {
+ return getHeightOffset(1);
+ }
+ }
+
+ @Override
+ public int getRowCount() {
+ if (filterRowVisible) {
+ return super.getRowCount();
+ } else {
+ return super.getRowCount() - 1;
+ }
+ }
+
+ public boolean isFilterRowVisible() {
+ return filterRowVisible;
+ }
+
+ public void setFilterRowVisible(boolean filterRowVisible) {
+ this.filterRowVisible = filterRowVisible;
+ fireLayerEvent(new RowStructuralRefreshEvent(filterRowDataLayer));
+ }
+
+ @Override
+ public boolean doCommand(ILayerCommand command) {
+ if (command instanceof UpdateFilterMapCommand) {
+ this.filterRowDataLayer.getFilterRowDataProvider().updateMapValue(((UpdateFilterMapCommand) command).getColumnIndexToUpdate());
+ return true;
+ }
+ if (command instanceof ToggleFilterRowCommand) {
+ setFilterRowVisible(!filterRowVisible);
+ return true;
+ }
+ return super.doCommand(command);
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusTreeLayer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusTreeLayer.java
index 44dc3bb2a7a..1a48284f22d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusTreeLayer.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusTreeLayer.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.nattable.layer;
import java.util.Collections;
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;
@@ -34,10 +35,10 @@ import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfigura
import org.eclipse.nebula.widgets.nattable.tree.painter.IndentedTreeImagePainter;
import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
import org.eclipse.papyrus.infra.nattable.configuration.PapyrusTreeLayerConfiguration;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
@@ -55,7 +56,7 @@ public class PapyrusTreeLayer extends TreeLayer {
/**
* the table manager
*/
- private INattableModelManager tableManager;
+ private ITreeNattableModelManager tableManager;
/**
* the managed tree list
@@ -124,8 +125,10 @@ public class PapyrusTreeLayer extends TreeLayer {
@Override
public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {
super.configure(configRegistry, uiBindingRegistry);
- this.tableManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
- this.treeList = (TreeList<?>) this.tableManager.getRowElementsList();
+ Object tmp = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Assert.isTrue(tmp instanceof ITreeNattableModelManager);
+ this.tableManager = (ITreeNattableModelManager) tmp;
+ this.treeList = (TreeList<?>) this.tableManager.getTreeList();
addListListener();
}
@@ -168,7 +171,7 @@ public class PapyrusTreeLayer extends TreeLayer {
/**
* This method do the stuff for insert event
- *
+ *
* @param index
* the modified index
* @param natTable
@@ -210,7 +213,7 @@ public class PapyrusTreeLayer extends TreeLayer {
/**
* This method do the stuff for update event
- *
+ *
* @param index
* the modified index
* @param natTable
@@ -224,7 +227,7 @@ public class PapyrusTreeLayer extends TreeLayer {
/**
* This method do the stuff for delete event
- *
+ *
* @param index
* the modified index
* @param natTable
@@ -366,7 +369,7 @@ public class PapyrusTreeLayer extends TreeLayer {
// if categories are hidden for this depth, we need to hide them and to expand their children
if (!(curr.getElement() instanceof TreeFillingConfiguration) && !curr.getChildren().isEmpty()) {
List<Integer> hidden = StyleUtils.getHiddenDepths(tableManager);
- int deth = ((NattableModelManager) tableManager).getSemanticDepth(curr) + 1;
+ int deth = ((ITreeNattableModelManager) tableManager).getSemanticDepth(curr) + 1;
if (hidden.contains(Integer.valueOf(deth))) {
for (ITreeItemAxis child : curr.getChildren()) {
int childIndex = tableManager.getRowElementsList().indexOf(child);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderHierarchicalLayerStack.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderHierarchicalLayerStack.java
index c2dcfcc53e4..f3a3ba61a00 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderHierarchicalLayerStack.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderHierarchicalLayerStack.java
@@ -29,7 +29,7 @@ import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
import org.eclipse.papyrus.infra.nattable.dataprovider.HierarchicalRowLabelHeaderDataProvider;
import org.eclipse.papyrus.infra.nattable.layer.PapyrusTreeLayer;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
import org.eclipse.papyrus.infra.nattable.painter.PapyrusIndentedTreeImagePainter;
@@ -84,7 +84,7 @@ public class RowHeaderHierarchicalLayerStack extends RowHeaderLayerStack {
*/
@Override
protected AbstractLayer createLabelRowHeaderLayer(BodyLayerStack bodyLayerStack, INattableModelManager tableManager) {
- List<?> managedAxis = ((NattableModelManager) tableManager).getRowElementsList();
+ List<?> managedAxis = ((ITreeNattableModelManager) tableManager).getTreeList();
if (managedAxis instanceof TreeList<?>) {
@SuppressWarnings("unchecked")
GlazedListTreeData<ITreeItemAxis> glazedListTreeData = new GlazedListTreeData<ITreeItemAxis>((TreeList<ITreeItemAxis>) managedAxis);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java
index b0d49beef6d..84796878285 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java
@@ -305,7 +305,7 @@ public abstract class AbstractPasteImportInNattableManager {
ILabelProvider p = serv.getLabelProvider(wrapper);
p = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
String categoryName = p.getText(axis);
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR_NO_CONTAINMENT_FEATURE, NLS.bind("Paste feature has not been set for category {0} on depth {1}", categoryName, current.getDepth()), null);
+ IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR__NO_CONTAINMENT_FEATURE, NLS.bind("Paste feature has not been set for category {0} on depth {1}", categoryName, current.getDepth()), null);
return status;
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
index 9897b8071af..c93afc100f7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
@@ -450,9 +450,9 @@ public abstract class AbstractTreeAxisManagerForEventList extends AbstractAxisMa
* the the
*/
protected int getDepth(final ITreeItemAxis axis) {
- final ITreeNattableModelManager manager = getTableManager();
+ final INattableModelManager manager = getTableManager();
if (manager instanceof ITreeNattableModelManager) {
- return manager.getTreeItemDepth(axis);
+ return ((ITreeNattableModelManager) manager).getTreeItemDepth(axis);
}
return 0;
}
@@ -489,9 +489,9 @@ public abstract class AbstractTreeAxisManagerForEventList extends AbstractAxisMa
* we returns the depth of the {@link TreeFillingConfiguration} parent of the {@link ITreeItemAxis} represented it.
*/
public final int getSemanticDepth(final ITreeItemAxis axis) {
- final ITreeNattableModelManager manager = getTableManager();
+ final INattableModelManager manager = getTableManager();
if (manager instanceof ITreeNattableModelManager) {
- return manager.getSemanticDepth(axis);
+ return ((ITreeNattableModelManager) manager).getSemanticDepth(axis);
}
return 0;
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
index b54fe55f574..5685764f946 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
@@ -750,7 +750,7 @@ public class CompositeAxisManagerForEventList extends AbstractAxisManagerForEven
@Override
protected void manageAddNotification(final Notification notification) {
final Object newValue = notification.getNewValue();
- if (newValue instanceof IAxis && ((IAxis) newValue).eContainer() != null) {
+ if (newValue instanceof IAxis && ((IAxis) newValue).eContainer() == getRepresentedContentProvider()) {
EventListHelper.addToEventList(eventList, newValue);
}
propagateEvent(notification);
@@ -763,7 +763,7 @@ public class CompositeAxisManagerForEventList extends AbstractAxisManagerForEven
final Object newValue = notification.getNewValue();
if (newValue instanceof Collection<?>) {
for (Object current : (Collection<?>) newValue) {
- if (current instanceof IAxis) {
+ if (current instanceof IAxis && ((IAxis) current).eContainer() == getRepresentedContentProvider()) {
EventListHelper.addToEventList(eventList, current);
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
index 1481805c7e4..e7f131ea9eb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
@@ -119,7 +119,7 @@ public class CompositeTreeAxisManagerForEventList extends CompositeAxisManagerFo
}
/**
- *
+ *
* @param conf
* a tree filling configuration
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
index 6bbba7e23d4..1c539622067 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
@@ -37,7 +37,7 @@ public interface ICellManager {
/**
* the empty sting
*/
- public static final String EMPTY_STRING = "";
+ public static final String EMPTY_STRING = ""; //$NON-NLS-1$
/**
*
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
index dead4455e42..0f347b5c3fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
@@ -22,9 +22,15 @@ import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
@@ -47,6 +53,8 @@ import org.eclipse.nebula.widgets.nattable.copy.command.CopyDataToClipboardComma
import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
import org.eclipse.nebula.widgets.nattable.export.command.ExportCommand;
+//import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowHeaderComposite;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
import org.eclipse.nebula.widgets.nattable.grid.data.DefaultCornerDataProvider;
import org.eclipse.nebula.widgets.nattable.grid.layer.CornerLayer;
@@ -75,7 +83,11 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.command.CommandIds;
+import org.eclipse.papyrus.infra.nattable.command.UpdateFilterMapCommand;
+import org.eclipse.papyrus.infra.nattable.comparator.ObjectNameAndPathComparator;
import org.eclipse.papyrus.infra.nattable.configuration.CornerConfiguration;
+import org.eclipse.papyrus.infra.nattable.configuration.FilterRowCustomConfiguration;
import org.eclipse.papyrus.infra.nattable.configuration.PapyrusClickSortConfiguration;
import org.eclipse.papyrus.infra.nattable.configuration.PapyrusHeaderMenuConfiguration;
import org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider;
@@ -84,24 +96,33 @@ import org.eclipse.papyrus.infra.nattable.dataprovider.ColumnIndexHeaderDataProv
import org.eclipse.papyrus.infra.nattable.dataprovider.ColumnLabelHeaderDataProvider;
import org.eclipse.papyrus.infra.nattable.dataprovider.CompositeColumnHeaderDataProvider;
import org.eclipse.papyrus.infra.nattable.dataprovider.CompositeRowHeaderDataProvider;
+import org.eclipse.papyrus.infra.nattable.display.converter.ObjectNameAndPathDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.layer.FilterRowHeaderComposite;
import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;
import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
import org.eclipse.papyrus.infra.nattable.layerstack.ColumnHeaderLayerStack;
-import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;
import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderLayerStack;
import org.eclipse.papyrus.infra.nattable.listener.NatTableDropListener;
import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
import org.eclipse.papyrus.infra.nattable.provider.PapyrusNatTableToolTipProvider;
import org.eclipse.papyrus.infra.nattable.provider.TableSelectionProvider;
import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;
@@ -116,20 +137,23 @@ import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
import org.eclipse.papyrus.infra.nattable.utils.TableGridRegion;
-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
import org.eclipse.papyrus.infra.nattable.utils.TableSelectionWrapper;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.tools.util.EclipseCommandUtils;
import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.services.IDisposable;
/**
*
@@ -139,6 +163,20 @@ import org.eclipse.ui.IWorkbenchPartSite;
public abstract class AbstractNattableWidgetManager implements INattableModelManager, NavigationTarget, IAdaptable {
/**
+ * we need to keep it to be able to remove listener (required when we destroy the context of the table)
+ *
+ * The editing domain to use to edit context element
+ */
+ protected TransactionalEditingDomain contextEditingDomain;
+
+ /**
+ * we need to keep it to be able to remove listener (required when we destroy the context of the table)
+ *
+ * The editing domain to use to edit table elements
+ */
+ protected TransactionalEditingDomain tableEditingDomain;
+
+ /**
* the managed table
*/
private Table table;
@@ -180,6 +218,8 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
*/
private TableSelectionProvider selectionProvider;
+ private IFilterStrategy<Object> filterStrategy;
+
/**
* the body layer stack
*/
@@ -198,6 +238,11 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
private BodyDataProvider bodyDataProvider;
/**
+ * the composite layer providing the filter row in the column header
+ */
+ private FilterRowHeaderComposite<?> filterColumnHeaderComposite;
+
+ /**
* the sort model used for rows
*/
private IPapyrusSortModel rowSortModel;
@@ -205,6 +250,11 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
private ISelectionExtractor selectionExtractor;
/**
+ * this listener is used to update value in nattable layer
+ */
+ private ResourceSetListener resourceSetListener;
+
+ /**
*
* Constructor.
*
@@ -215,6 +265,26 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
this.table = table;
this.tableContext = table.getContext();
this.selectionExtractor = selectionExtractor;
+ this.tableEditingDomain = TableEditingDomainUtils.getTableEditingDomain(table);
+ this.contextEditingDomain = TableEditingDomainUtils.getTableContextEditingDomain(table);
+ }
+
+ /**
+ * Returns the EditingDomain associated to the table
+ *
+ * @return
+ */
+ protected final TransactionalEditingDomain getTableEditingDomain() {
+ return this.tableEditingDomain;
+ }
+
+ /**
+ * Returns the EditingDomain associated to the context
+ *
+ * @return
+ */
+ protected final TransactionalEditingDomain getContextEditingDomain() {
+ return this.contextEditingDomain;
}
/**
@@ -244,13 +314,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
// this.columnHeaderLayerStack = new ColumnHeaderLayerStack(this.columnHeaderDataProvider, this.bodyLayerStack, this.bodyDataProvider, getRowSortModel());
this.columnHeaderLayerStack = new ColumnHeaderLayerStack(indexColumnProvider, labelColumnProvider, this.bodyLayerStack, getRowSortModel());
- final DisplayStyle displayStyle = TableHelper.getTableDisplayStyle(this);
- if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(displayStyle) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(displayStyle)) {
- this.rowHeaderLayerStack = new RowHeaderHierarchicalLayerStack(bodyLayerStack, this);
- } else {
- this.rowHeaderLayerStack = new RowHeaderLayerStack(bodyLayerStack, this);
- }
-
+ this.rowHeaderLayerStack = createRowHeaderLayerStack(this.bodyLayerStack);
rowHeaderDataProvider = new CompositeRowHeaderDataProvider(this);
rowHeaderDataProvider.addDataProvider(this.rowHeaderLayerStack.getIndexDataProvider());
rowHeaderDataProvider.addDataProvider(this.rowHeaderLayerStack.getLabelDataProvider());
@@ -259,21 +323,28 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
// final IDataProvider cornerDataProvider = new DefaultCornerDataProvider(this.columnHeaderDataProvider, this.rowHeaderDataProvider);
final IDataProvider cornerDataProvider = new DefaultCornerDataProvider(columnHeaderDataProvider, rowHeaderDataProvider);
- final CornerLayer cornerLayer = new CornerLayer(new DataLayer(cornerDataProvider), this.rowHeaderLayerStack, this.columnHeaderLayerStack);
+
+
+ // create the filter layer, configRegistry can be null for our usecase
+ this.filterStrategy = createFilterStrategy();
+ this.filterColumnHeaderComposite = new FilterRowHeaderComposite<Object>(this.filterStrategy, columnHeaderLayerStack, columnHeaderDataProvider, this);
+
+ // init the filter visibility
+ this.filterColumnHeaderComposite.setFilterRowVisible(HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.table).isDisplayFilter());
+
+ final CornerLayer cornerLayer = new CornerLayer(new DataLayer(cornerDataProvider), this.rowHeaderLayerStack, filterColumnHeaderComposite);
cornerLayer.addConfiguration(new CornerConfiguration(this));
- this.gridLayer = new PapyrusGridLayer(TransactionUtil.getEditingDomain(tableContext), this.bodyLayerStack, this.columnHeaderLayerStack, this.rowHeaderLayerStack, cornerLayer);
+ this.gridLayer = new PapyrusGridLayer(TransactionUtil.getEditingDomain(tableContext), this.bodyLayerStack, filterColumnHeaderComposite, this.rowHeaderLayerStack, cornerLayer);
this.gridLayer.addConfiguration(new DefaultPrintBindings());
this.natTable = new NatTable(parent, this.gridLayer, false);
-
-
this.natTable.addConfiguration(new PapyrusHeaderMenuConfiguration());
this.natTable.addConfiguration(new CellEditionConfiguration());
this.natTable.addConfiguration(new PapyrusClickSortConfiguration());
-
+ this.natTable.addConfiguration(new FilterRowCustomConfiguration());
configureNatTable();
// initialize the table by checking all its applied styles
@@ -299,19 +370,191 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
-
-
new PapyrusNatTableToolTipProvider(this.natTable, GridRegion.BODY, GridRegion.COLUMN_HEADER, GridRegion.ROW_HEADER);
+ initResourceSetListener();
return this.natTable;
}
+
+ /**
+ * @return
+ * the filter strategy to use
+ */
+ protected abstract IFilterStrategy<Object> createFilterStrategy();
+
+
+ /**
+ * TODO : should be refactored with resourceset used in NattableModelManager
+ */
+ private void initResourceSetListener() {
+ // resourceSetListener used to capture table style modification
+ // these events can be used to undo/redo previous actions
+ resourceSetListener = new ResourceSetListener() {
+
+ @Override
+ public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+ return null;
+ }
+
+ @Override
+ public void resourceSetChanged(ResourceSetChangeEvent event) {
+
+ for (final Notification notification : event.getNotifications()) {
+ // filter the events to only let through the changes on the current table resource
+ Table notifiedTable = findTable(notification);
+ if (getTable().equals(notifiedTable)) {
+
+ Display.getDefault().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+
+ Object notifier = notification.getNotifier();
+ Object feature = notification.getFeature();
+ Object newValue = notification.getNewValue();
+ Object oldValue = notification.getOldValue();
+ if (notifier instanceof LocalTableHeaderAxisConfiguration) {
+ boolean onColumnOnModel = getTable().getLocalColumnHeaderAxisConfiguration() == notifier;
+ boolean isInverted = table.isInvertAxis();
+
+ if (feature == NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter() && newValue instanceof Boolean) {
+ if ((onColumnOnModel && !isInverted) || (!onColumnOnModel && isInverted)) {
+ AbstractNattableWidgetManager.this.filterColumnHeaderComposite.setFilterRowVisible(((Boolean) newValue).booleanValue());
+ natTable.refresh();
+ }
+ }
+ } else if (notifier instanceof Table && feature == NattablePackage.eINSTANCE.getTable_InvertAxis()) {
+ // TODO : replace the listener and its action done in NattableModelManger by this one
+ AbstractNattableWidgetManager.this.filterColumnHeaderComposite.setFilterRowVisible(HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable()).isDisplayFilter());
+ natTable.refresh();
+ } else if (notifier instanceof IAxis || notifier instanceof StringValueStyle || notifier instanceof StringListValueStyle) {
+ boolean refreshFilter = false;
+ IAxis axisToRefresh = null;
+ if (notifier instanceof IAxis) {
+ axisToRefresh = (IAxis) notifier;
+ if (oldValue instanceof NamedStyle && IFilterConfiguration.FILTER_VALUE_TO_MATCH.equals(((NamedStyle) oldValue).getName())) {
+ // we need to replay the filter
+ refreshFilter = true;
+ } else if (newValue instanceof NamedStyle && IFilterConfiguration.FILTER_VALUE_TO_MATCH.equals(((NamedStyle) newValue).getName())) {
+ refreshFilter = true;
+ }
+ }
+ if ((notifier instanceof StringValueStyle || notifier instanceof StringListValueStyle) && IFilterConfiguration.FILTER_VALUE_TO_MATCH.equals(((NamedStyle) notifier).getName())) {
+ EObject container = ((NamedStyle) notifier).eContainer();
+ if (container instanceof IAxis) {
+ axisToRefresh = (IAxis) container;
+ refreshFilter = true;
+ }
+ }
+ if(refreshFilter && axisToRefresh!=null){
+ //we need to update the filter map value (manage Undo/Redo for example)
+ int index = -1;
+ if(table.isInvertAxis() && getRowElementsList().contains(axisToRefresh)){
+ index = getRowElementsList().indexOf(axisToRefresh);
+ }else if(!table.isInvertAxis() && getColumnElementsList().contains(axisToRefresh)){
+ index = getColumnElementsList().indexOf(axisToRefresh);
+ }
+ if(index!=-1){
+ filterColumnHeaderComposite.doCommand(new UpdateFilterMapCommand(index));
+ }
+
+ }
+ }
+ }
+ });
+ }
+ }
+ }
+
+ @Override
+ public boolean isPrecommitOnly() {
+ return false;
+ }
+
+ @Override
+ public boolean isPostcommitOnly() {
+ return false;
+ }
+
+ @Override
+ public boolean isAggregatePrecommitListener() {
+ return false;
+ }
+
+ @Override
+ public NotificationFilter getFilter() {
+ // this filter only lets through the notifications pertaining to the table
+ // the first three conditions handle the modification, the add and the remove of styles
+ // the last seven handle the modified or created objects containing those styles
+ return ((NotificationFilter.createEventTypeFilter(Notification.SET))
+ .or(NotificationFilter.createEventTypeFilter(Notification.ADD))
+ .or(NotificationFilter.createEventTypeFilter(Notification.REMOVE)))
+ .and((NotificationFilter.createNotifierTypeFilter(BooleanValueStyle.class))
+ .or(NotificationFilter.createNotifierTypeFilter(IntValueStyle.class))
+ .or(NotificationFilter.createNotifierTypeFilter(Style.class))
+ .or(NotificationFilter.createNotifierTypeFilter(EObjectAxis.class))
+ .or(NotificationFilter.createNotifierTypeFilter(FeatureIdAxis.class))
+ .or(NotificationFilter.createNotifierTypeFilter(EStructuralFeatureAxis.class))
+ .or(NotificationFilter.createNotifierTypeFilter(LocalTableHeaderAxisConfiguration.class))
+ .or(NotificationFilter.createNotifierTypeFilter(Table.class)));
+ // return NotificationFilter.createNotifierTypeFilter(EObject.class);
+ }
+ };
+
+ this.tableEditingDomain.addResourceSetListener(resourceSetListener);
+ }
+
+ /**
+ *
+ * @param notification
+ * @return
+ * The nearest table containing the style in order to verify the table's styled event's source
+ */
+ protected static Table findTable(Notification notification) {
+ if (notification.getNotifier() instanceof Table) {
+ return (Table) notification.getNotifier();
+ }
+ else {
+ Object notifier = notification.getNotifier();
+ if (notifier instanceof EObject) {
+ EObject container = ((EObject) notifier).eContainer();
+ while (!(container instanceof Table) && container != null) {
+ container = container.eContainer();
+ }
+ return (Table) container;
+ }
+ return null;
+ }
+ }
+
+ /**
+ *
+ * @param bodyLayerStack
+ * the body layer stack to use
+ *
+ * @return
+ * the row header layer stack to use
+ */
+ protected RowHeaderLayerStack createRowHeaderLayerStack(BodyLayerStack bodyLayerStack) {
+ return new RowHeaderLayerStack(bodyLayerStack, this);
+ }
+
protected void configureNatTable() {
+
if (this.natTable != null && !this.natTable.isDisposed()) {
ConfigRegistry configRegistry = new ConfigRegistry();
+
+ // could be done by config file!
configRegistry.registerConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, AbstractNattableWidgetManager.this, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
configRegistry.registerConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, getLabelProviderService(), DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
// commented because seems generate several bugs with edition
// newRegistry.registerConfigAttribute( CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter(), DisplayMode.NORMAL, GridRegion.BODY);
+
+ // configuration used by filter
+ ObjectNameAndPathDisplayConverter converter = new ObjectNameAndPathDisplayConverter(getLabelProviderService());
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER, converter, DisplayMode.NORMAL, NattableConfigAttributes.OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER_ID);
+ configRegistry.registerConfigAttribute(NattableConfigAttributes.OBJECT_NAME_AND_PATH_COMPARATOR, new ObjectNameAndPathComparator(converter), DisplayMode.NORMAL, NattableConfigAttributes.OBJECT_NAME_AND_PATH_COMPARATOR_ID);
+
this.natTable.setConfigRegistry(configRegistry);
this.natTable.setUiBindingRegistry(new UiBindingRegistry(this.natTable));
this.natTable.configure();
@@ -320,12 +563,6 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
private LabelProviderService getLabelProviderService() {
- //FIXME: avoid spam-log of ServiceExceptions when configuring a Table without a Context (Especially during tests),
- //but there is probably something wrong if we're in this case
- if (this.table == null || this.table.getContext() == null){
- return null;
- }
-
try {
ServicesRegistry serviceRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.table.getContext());// get context and NOT get table for the usecase where the table is not in a resource
return serviceRegistry.getService(LabelProviderService.class);
@@ -866,6 +1103,15 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
this.columnHeaderDataProvider.dispose();
}
+
+ if (this.tableEditingDomain != null && this.resourceSetListener != null) {
+ this.tableEditingDomain.removeResourceSetListener(this.resourceSetListener);
+ }
+ if (this.filterStrategy instanceof IDisposable) {
+ ((IDisposable) this.filterStrategy).dispose();
+ }
+ this.tableEditingDomain = null;
+ this.contextEditingDomain = null;
this.tableContext = null;
}
@@ -1323,6 +1569,20 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
/**
+ * this method is used to update the state of the toggle actions for table
+ */
+ protected void updateToggleActionState() {
+ final ICommandService commandService = EclipseCommandUtils.getCommandService();
+ if (commandService != null) {
+ final AbstractHeaderAxisConfiguration columnAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
+
+ // update the header configuration
+ org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_FILTER_ID);
+ EclipseCommandUtils.updateToggleCommandState(command, columnAxisConfiguration.isDisplayFilter());
+ }
+ }
+
+ /**
*
* @return
* The boolean indicating if the toggle of the currently used menu is to be set to true or not.
@@ -1339,7 +1599,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
/**
- *
+ *
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*
* @param adapter
@@ -1368,7 +1628,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
/**
- *
+ *
* @return
* a {@link TableStructuredSelection} representing the current selection of the table or <code>null</code> when there is no selection
*/
@@ -1381,10 +1641,10 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
/**
- *
+ *
* @return
* a map representing index of fully selected rows linked to the associated element
- *
+ *
* The returned value can't be <code>null</code>
*/
protected final Map<Integer, Object> getFullySelectedRows() {
@@ -1399,10 +1659,10 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
}
/**
- *
+ *
* @return
* a map representing index of fully selected columns linked to the associated element
- *
+ *
* The returned value can't be <code>null</code>
*/
protected final Map<Integer, Object> getFullySelectedColumns() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
index 5582f137d73..098656b446b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
@@ -22,13 +22,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
+import ca.odell.glazedlists.TreeList;
+
/**
* This interface provides methods for Tree Table table manager
*
* @author VL222926
*
*/
-public interface ITreeNattableModelManager {
+public interface ITreeNattableModelManager extends INattableModelManager {
/**
*
@@ -106,4 +108,6 @@ public interface ITreeNattableModelManager {
* </ul>
*/
public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis);
+
+ public TreeList getTreeList();
} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
index a4b15e54202..865783266d7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.infra.nattable.manager.table;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.EventObject;
import java.util.Iterator;
import java.util.List;
@@ -52,12 +51,9 @@ import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.command.VisualRefreshCommand;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
-import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
-import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnHideCommand;
-import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnShowCommand;
-import org.eclipse.nebula.widgets.nattable.hideshow.command.ShowAllColumnsCommand;
-import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;
import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
@@ -66,17 +62,11 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.nattable.Activator;
import org.eclipse.papyrus.infra.nattable.command.CommandIds;
import org.eclipse.papyrus.infra.nattable.dialog.DisplayedAxisSelectorDialog;
-import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;
-import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderLayerStack;
-import org.eclipse.papyrus.infra.nattable.listener.HideShowCategoriesTableListener;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusFilterStrategy;
import org.eclipse.papyrus.infra.nattable.manager.axis.AxisManagerFactory;
import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManager;
-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;
-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeTreeAxisManagerForEventList;
import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;
import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;
-import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
import org.eclipse.papyrus.infra.nattable.messages.Messages;
import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
@@ -85,11 +75,9 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxi
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;
@@ -101,27 +89,14 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
-import org.eclipse.papyrus.infra.nattable.sort.ColumnSortModel;
-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
-import org.eclipse.papyrus.infra.nattable.tree.DatumExpansionModel;
-import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.infra.nattable.utils.CellMapKey;
-import org.eclipse.papyrus.infra.nattable.utils.CollapseExpandActionHelper;
-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
import org.eclipse.papyrus.infra.nattable.utils.StringComparator;
-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
@@ -136,18 +111,21 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.FilterList;
import ca.odell.glazedlists.GlazedLists;
-import ca.odell.glazedlists.TreeList;
-import ca.odell.glazedlists.TreeList.Format;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-public class NattableModelManager extends AbstractNattableWidgetManager implements INattableModelManager, ITreeNattableModelManager {
+/**
+ * TODO : this class must be refactored, all the part concerning tree table must be push in the subclass {@link TreeNattableModelManager}
+ *
+ *
+ */
+public class NattableModelManager extends AbstractNattableWidgetManager implements INattableModelManager {
/**
* the column manager
@@ -166,6 +144,14 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
private List<Object> horizontalElements;
+ protected FilterList<Object> verticalFilterList;
+
+ protected FilterList<Object> horizontalFilterList;
+
+ protected EventList<Object> basicVerticalList;
+
+ protected EventList<Object> basicHorizontalList;
+
private Adapter invertAxisListener;
private AbstractAxisProvider rowProvider;
@@ -192,18 +178,12 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
*/
private ILayerListener layerListener;
- /**
- * we need to keep it to be able to remove listener (required when we destroy the context of the table)
- */
- private TransactionalEditingDomain contextEditingDomain;
-
- private TransactionalEditingDomain tableEditingDomain;
private Adapter changeAxisProvider;
private AdapterImpl changeAxisProviderHistory;
- private ResourceSetListener hideShowCategoriesListener;
+
/**
* the listener on the table cells
*/
@@ -216,39 +196,23 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
*/
private PreferenceStore localPreferenceStore;
- private TreeList treeList;
-
- private List<Object> eventList;
-
- private DatumTreeFormat treeFormat;
-
- private DatumExpansionModel expansionModel;
// fields used for refresh
private Runnable refreshRunnable;
+
/** Flag to avoid reentrant call to refresh. */
private AtomicBoolean isRefreshing = new AtomicBoolean(false);
public NattableModelManager(final Table rawModel, final ISelectionExtractor selectionExtractor) {
super(rawModel, selectionExtractor);
- this.tableEditingDomain = TableEditingDomainUtils.getTableEditingDomain(rawModel);
- this.contextEditingDomain = TableEditingDomainUtils.getTableContextEditingDomain(rawModel);
+
this.rowProvider = rawModel.getCurrentRowAxisProvider();
this.columnProvider = rawModel.getCurrentColumnAxisProvider();
- this.verticalElements = Collections.synchronizedList(new ArrayList<Object>());
-
- if (TableHelper.isTreeTable(rawModel)) {
- this.eventList = GlazedLists.eventList(new ArrayList<Object>());
- // eventList = GlazedLists.threadSafeList(eventList);
- treeFormat = new DatumTreeFormat(new ColumnSortModel(this));
- this.expansionModel = new DatumExpansionModel();
- this.treeList = new TreeList((EventList) eventList, treeFormat, expansionModel);
- this.horizontalElements = this.treeList;// Collections.synchronizedList(this.treeList);
- } else {
- this.horizontalElements = Collections.synchronizedList(new ArrayList<Object>());
- }
+ this.verticalElements = createVerticalElementList();
+ this.horizontalElements = createHorizontalElementList();
+
this.cellsMap = HashBiMap.create();
this.invertAxisListener = new AdapterImpl() {
@@ -280,9 +244,6 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
rawModel.eAdapters().add(this.invertAxisListener);
init();
- // if(rawModel.isInvertAxis()) {
- // invertJavaObject();
- // }
changeAxisProvider = new AdapterImpl() {
@@ -347,6 +308,33 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
this(rawModel, new ObjectsSelectionExtractor());
}
+ /**
+ *
+ * @return
+ * the new list to use for vertical element
+ */
+ protected List<Object> createVerticalElementList() {
+ // return Collections.synchronizedList(new ArrayList<Object>());
+ this.basicVerticalList = GlazedLists.eventList(new ArrayList<Object>());
+ // it required than vertical element is a filter list -> warning to invert axis?
+ this.verticalFilterList = new FilterList<Object>(this.basicVerticalList);
+ return this.verticalFilterList;
+ }
+
+ /**
+ *
+ * @return
+ * the new list to use for horizontal element
+ */
+ protected List<Object> createHorizontalElementList() {
+ // return Collections.synchronizedList(new ArrayList<Object>());
+ this.basicHorizontalList = GlazedLists.eventList(new ArrayList<Object>());
+ FilterList<Object> filteredList = new FilterList<Object>(this.basicHorizontalList);
+ this.horizontalFilterList = filteredList;
+ return this.horizontalFilterList;
+ }
+
+
@Override
public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {
updateCellMap(null);
@@ -405,18 +393,6 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
nattable.addLayerListener(layerListener);
updateToggleActionState();// required, because the focus listener is not notified just after the creation of the widget
-
- // update the hidden categories
- if (TableHelper.isTreeTable(this)) {
- List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(this);
- if (hiddenDepth.size() > 0) {
- hideShowCategories(hiddenDepth, null);
- }
- this.hideShowCategoriesListener = new HideShowCategoriesTableListener(this);
- getTableEditingDomain().addResourceSetListener(this.hideShowCategoriesListener);
- }
-
-
return nattable;
}
@@ -424,7 +400,8 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
* this command update the status of the toggle actions
*/
protected void updateToggleActionState() {
- final ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
+ super.updateToggleActionState();
+ final ICommandService commandService = EclipseCommandUtils.getCommandService();
if (commandService != null) {
final AbstractHeaderAxisConfiguration columnAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
@@ -544,12 +521,7 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
// }
- // update hierarchic table display style
- DisplayStyle style = TableHelper.getTableDisplayStyle(this);
- command = commandService.getCommand(CommandIds.COMMAND_HIERARCHIC_DISPLAY_STYLE);
- if (!DisplayStyle.NORMAL.equals(style)) {
- updateRadioCommandState(command, style.getLiteral());
- }
+
} else {
throw new RuntimeException(String.format("The Eclipse service %s has not been found", ICommandService.class)); //$NON-NLS-1$
@@ -571,35 +543,12 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
/**
*
- * @param notification
- * @return
- * The nearest table containing the style in order to verify the table's styled event's source
- */
- private static Table findStyleTable(Notification notification) {
- if (notification.getNotifier() instanceof Table) {
- return (Table) notification.getNotifier();
- }
- else {
- Object notifier = notification.getNotifier();
- if (notifier instanceof EObject) {
- EObject mergeContainer = ((EObject) notifier).eContainer();
- while (!(mergeContainer instanceof Table) && mergeContainer != null) {
- mergeContainer = mergeContainer.eContainer();
- }
- return (Table) mergeContainer;
- }
- return null;
- }
- }
-
- /**
- *
* @param command
* an eclispe command
* @param newValue
* the new value to set to the state of this command
*/
- private void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {
+ protected void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {
EclipseCommandUtils.updateRadioCommandState(command, newValue);
}
@@ -618,6 +567,18 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
NattableModelManager.this.verticalElements = newVerticalElementList;
NattableModelManager.this.horizontalElements = newHorizontalElementList;
+ EventList<Object> newHorizontalBasicList = this.basicVerticalList;
+ EventList<Object> newVerticalBasicList = this.basicHorizontalList;
+
+ FilterList<Object> newVerticalFilterLilst = this.horizontalFilterList;
+ FilterList<Object> newHorizontalFilterList = this.verticalFilterList;
+
+ this.basicVerticalList = newVerticalBasicList;
+ this.basicHorizontalList = newHorizontalBasicList;
+ this.horizontalFilterList = newHorizontalFilterList;
+ this.verticalFilterList = newVerticalFilterLilst;
+
+
NattableModelManager.this.rowManager = newRowManager;
NattableModelManager.this.columnManager = newColumnManager;
this.rowManager.setAxisComparator(null);
@@ -628,6 +589,18 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
refreshNatTable();
}
+ public EventList<Object> getHorizontalBasicEventList() {
+ return this.basicHorizontalList;
+ }
+
+ public FilterList<Object> getHorizontalFilterEventList() {
+ return this.horizontalFilterList;
+ }
+
+ public FilterList<Object> getVerticalFilterList() {
+ return this.verticalFilterList;
+ }
+
public void resizeAxis() {
initTableAxis();
refreshNatTable();
@@ -671,39 +644,16 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
* @return the created axis manager to use to manage the {@link IAxisContentsProvider}
*/
protected ICompositeAxisManager createAxisManager(final List<AxisManagerRepresentation> representations, final AbstractAxisProvider contentProvider, final boolean columnAxisManager) {
- TableDisplayStyle style = (TableDisplayStyle) getTable().getTableConfiguration().getStyle(NattablestylePackage.eINSTANCE.getTableDisplayStyle());
- if (style == null) {
- style = NattablestyleFactory.eINSTANCE.createTableDisplayStyle();
- style.setDisplayStyle(DisplayStyle.NORMAL);
- }
- final ICompositeAxisManager compositeAxisManager;
- if ((!columnAxisManager) && (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style.getDisplayStyle()) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style.getDisplayStyle()))) {
- compositeAxisManager = new CompositeTreeAxisManagerForEventList((EventList<Object>) this.eventList);
- final List<IAxisManagerForEventList> managers = new ArrayList<IAxisManagerForEventList>();
- for (AxisManagerRepresentation current : representations) {
- final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
- Assert.isTrue(manager instanceof IAxisManagerForEventList);
- manager.init(this, current, contentProvider);
- managers.add((IAxisManagerForEventList) manager);
-
- }
- compositeAxisManager.init(this, null, contentProvider);
- DatumTreeFormat treeFormat = getTreeFormat();
- treeFormat.setTreeComparatorProvider((CompositeTreeAxisManagerForEventList) compositeAxisManager);
- this.expansionModel.setAxisManager((CompositeTreeAxisManagerForEventList) compositeAxisManager);
- ((CompositeAxisManagerForEventList) compositeAxisManager).setSubManagers(managers);
- } else {
- compositeAxisManager = new CompositeAxisManager();
- final List<IAxisManager> managers = new ArrayList<IAxisManager>();
- for (AxisManagerRepresentation current : representations) {
- final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
- assert manager != null;
- manager.init(this, current, contentProvider);
- managers.add(manager);
- }
- compositeAxisManager.init(this, null, contentProvider);
- compositeAxisManager.setSubAxisManager(managers);
+ final ICompositeAxisManager compositeAxisManager = new CompositeAxisManager();
+ final List<IAxisManager> managers = new ArrayList<IAxisManager>();
+ for (AxisManagerRepresentation current : representations) {
+ final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
+ assert manager != null;
+ manager.init(this, current, contentProvider);
+ managers.add(manager);
}
+ compositeAxisManager.init(this, null, contentProvider);
+ compositeAxisManager.setSubAxisManager(managers);
return compositeAxisManager;
}
@@ -715,38 +665,39 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
*/
@Override
public void dispose() {
- if (this.tableEditingDomain != null && this.contextEditingDomain != null) {
- if (this.hideShowCategoriesListener != null) {
- getTableEditingDomain().removeResourceSetListener(this.hideShowCategoriesListener);
- }
+ if (this.tableEditingDomain != null) {
if (this.tableEditingDomain.getCommandStack() != null) {
this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
}
- if (this.contextEditingDomain.getCommandStack() != null) {
- this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
- }
- this.columnManager.dispose();
- this.rowManager.dispose();
- Table table = getTable();
- if (table != null && this.tableCellsListener != null) {
- table.eAdapters().remove(this.tableCellsListener);
- }
- if (this.cellsMap != null) {
- this.cellsMap.clear();
- }
- if (this.natTable != null) {
- natTable.removeLayerListener(layerListener);
- }
if (this.tableEditingDomain != null) {
this.tableEditingDomain.removeResourceSetListener(resourceSetListener);
}
- this.tableEditingDomain = null;
+
+ }
+
+ if (this.contextEditingDomain != null) {
+ if (this.contextEditingDomain.getCommandStack() != null) {
+ this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+ }
if (this.contextEditingDomain != null) {
this.contextEditingDomain.removeResourceSetListener(resourceSetListener);
}
- this.contextEditingDomain = null;
- super.dispose();
}
+ this.columnManager.dispose();
+ this.rowManager.dispose();
+ Table table = getTable();
+ if (table != null && this.tableCellsListener != null) {
+ table.eAdapters().remove(this.tableCellsListener);
+ }
+ if (this.cellsMap != null) {
+ this.cellsMap.clear();
+ }
+ if (this.natTable != null) {
+ natTable.removeLayerListener(layerListener);
+ }
+
+
+ super.dispose();
}
/**
@@ -829,25 +780,6 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
}
-
- /**
- * Returns the EditingDomain associated to the table
- *
- * @return
- */
- private TransactionalEditingDomain getTableEditingDomain() {
- return this.tableEditingDomain;
- }
-
- /**
- * Returns the EditingDomain associated to the context
- *
- * @return
- */
- private TransactionalEditingDomain getContextEditingDomain() {
- return this.contextEditingDomain;
- }
-
/**
*
* @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getBodyDataProvider()
@@ -1006,7 +938,7 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
});
} catch (InterruptedException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
@@ -1071,9 +1003,6 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
return this.horizontalElements;
}
- public List<Object> getEventList() {
- return this.eventList;
- }
@Override
public boolean canInsertRow(Collection<Object> objectsToAdd, int index) {
@@ -1637,7 +1566,7 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
for (final Notification notification : event.getNotifications()) {
// filter the events to only let through the changes on the current table resource
- Table notifiedTable = findStyleTable(notification);
+ Table notifiedTable = findTable(notification);
if (getTable().equals(notifiedTable)) {
Display.getDefault().asyncExec(new Runnable() {
@@ -1785,146 +1714,57 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
this.localPreferenceStore = store;
}
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getTreeFormat()
- *
- * @return
- */
- @Override
- public DatumTreeFormat getTreeFormat() {
- return this.treeFormat;
- }
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getDepth()
- *
- * @return
- */
- @Override
- public int getTreeItemDepth(final ITreeItemAxis axis) {
- Format<ITreeItemAxis> format = getTreeFormat();
- if (format != null) {
- List<ITreeItemAxis> path = new ArrayList<ITreeItemAxis>();
- format.getPath(path, axis);
- return path.size() - 1;
- }
- return 0;
- }
+ // TODO : tmp class to externalize when the filter will works fine
+ public class PapyrusColumnAccesor implements IColumnAccessor<Object> {
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getSemanticDepth(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
- *
- * @param axis
- * @return
- */
- @Override
- public int getSemanticDepth(ITreeItemAxis axis) {
- Object representedObject = axis.getElement();
- if (representedObject instanceof TreeFillingConfiguration) {
- return ((TreeFillingConfiguration) representedObject).getDepth();
- } else {
- ITreeItemAxis parent = axis.getParent();
- if (parent == null) {
- return 0;
- }
- representedObject = parent.getElement();
- Assert.isTrue(representedObject instanceof TreeFillingConfiguration);
- return ((TreeFillingConfiguration) representedObject).getDepth();
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getDataValue(java.lang.Object, int)
+ *
+ * @param rowObject
+ * @param columnIndex
+ * @return
+ */
+ @Override
+ public Object getDataValue(Object rowObject, int columnIndex) {
+ return CellManagerFactory.INSTANCE.getCrossValue(getColumnElement(columnIndex), rowObject, NattableModelManager.this);
}
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowCategories(java.util.List, java.util.List)
- *
- * @param depthToHide
- * @param depthToShow
- */
- @Override
- public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow) {
- hideShowRowCategories(depthToHide, depthToShow);
- hideShowColumnCategoriesInRowHeader(depthToHide, depthToShow);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowRowCategories(java.util.List, java.util.List)
- *
- * @param depthToHide
- * @param depthToShow
- */
- @Override
- public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow) {
- // we hide the rows representing the categories
- ((ITreeItemAxisManagerForEventList) getRowAxisManager()).managedHideShowCategoriesForDepth(depthToHide, depthToShow);
- }
- /**
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowColumnCategoriesInRowHeader(java.util.List, java.util.List)
- *
- * @param depthToHide
- * @param depthToShow
- */
- @Override
- public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow) {
- this.natTable.refresh();
- RowHeaderLayerStack rowHeaderLayerStack = getRowHeaderLayerStack();
- if (rowHeaderLayerStack instanceof RowHeaderHierarchicalLayerStack) {
- ColumnHideShowLayer layer = ((RowHeaderHierarchicalLayerStack) rowHeaderLayerStack).getRowHeaderColumnHideShowLayer();
- ILayer subLayer = layer.getUnderlyingLayerByPosition(0, 0);
- // we hide the columns representing the categories
- if (TableHelper.isMultiColumnTreeTable(this)) {
- boolean hasRootConfif = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0);
-
- if (depthToHide != null && depthToHide.size() > 0) {
- int[] indexToHide = new int[depthToHide.size()];
- for (int i = 0; i < depthToHide.size(); i++) {
- Integer curr = depthToHide.get(i);
- int tmp = -1;
- if (hasRootConfif) {
- tmp = curr * 2;
- } else {
- // TODO not yet tested
- tmp = curr * 2 - 1;
- }
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#setDataValue(java.lang.Object, int, java.lang.Object)
+ *
+ * @param rowObject
+ * @param columnIndex
+ * @param newValue
+ */
+ @Override
+ public void setDataValue(Object rowObject, int columnIndex, Object newValue) {
+ // TODO Auto-generated method stub
- // we need to convert the position
- tmp = layer.underlyingToLocalColumnPosition(subLayer, tmp);
- indexToHide[i] = tmp;
- }
- layer.doCommand(new MultiColumnHideCommand(layer, indexToHide));
- }
+ }
- if (depthToShow != null && depthToShow.size() > 0) {
-
- List<Integer> indexToShow = new ArrayList<Integer>();
- for (int i = 0; i < depthToShow.size(); i++) {
- Integer curr = depthToShow.get(i);
- int tmp = -1;
- if (hasRootConfif) {
- tmp = curr * 2;
- } else {
- // TODO not yet tested
- tmp = curr * 2 - 1;
- }
- indexToShow.add(tmp);
- }
- layer.doCommand(new MultiColumnShowCommand(indexToShow));
- }
- } else {
- layer.doCommand(new ShowAllColumnsCommand());
- }
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getColumnCount()
+ *
+ * @return
+ */
+ @Override
+ public int getColumnCount() {
+ // TODO Auto-generated method stub
+ return 0;
}
}
/**
- *
- * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#doCollapseExpandAction(org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum, java.util.List)
- *
- * @param actionId
- * @param selectedAxis
+ * @return
+ * the filter strategy to use
+ *
*/
- @Override
- public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis) {
- CollapseExpandActionHelper.doCollapseExpandAction(actionId, selectedAxis, getTableAxisElementProvider(), this.natTable);
+ protected IFilterStrategy<Object> createFilterStrategy() {
+ return new PapyrusFilterStrategy(this, new PapyrusColumnAccesor());
+ // TODO
+ // FIXME warning to invert axis
+ // return new PapyrusFilterStrategy(this, this.horizontalFilterList, new PapyrusColumnAccesor(), null);
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
new file mode 100755
index 00000000000..2df433c7ea8
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
@@ -0,0 +1,380 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnHideCommand;
+import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnShowCommand;
+import org.eclipse.nebula.widgets.nattable.hideshow.command.ShowAllColumnsCommand;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.papyrus.infra.nattable.command.CommandIds;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;
+import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderLayerStack;
+import org.eclipse.papyrus.infra.nattable.listener.HideShowCategoriesTableListener;
+import org.eclipse.papyrus.infra.nattable.manager.axis.AxisManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeTreeAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.sort.ColumnSortModel;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.nattable.tree.DatumExpansionModel;
+import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
+import org.eclipse.papyrus.infra.nattable.utils.CollapseExpandActionHelper;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.papyrus.infra.tools.util.EclipseCommandUtils;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.commands.ICommandService;
+
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.FilterList;
+import ca.odell.glazedlists.GlazedLists;
+import ca.odell.glazedlists.TreeList;
+import ca.odell.glazedlists.TreeList.Format;
+
+/**
+ * This class allows to manage Papyrus Tree Table
+ *
+ */
+public class TreeNattableModelManager extends NattableModelManager implements ITreeNattableModelManager {
+
+ /**
+ * the event list used to build the tree list
+ */
+ // protected EventList<Object> eventList;
+
+ /**
+ * the managed tree list
+ */
+ protected TreeList treeList;
+
+ protected DatumTreeFormat treeFormat;
+
+ protected DatumExpansionModel expansionModel;
+
+
+ /**
+ * the listener used to refresh the update the hidden rows
+ */
+ protected ResourceSetListener hideShowCategoriesListener;
+
+ /**
+ * Constructor.
+ *
+ * @param rawModel
+ * @param selectionExtractor
+ */
+ public TreeNattableModelManager(Table rawModel, ISelectionExtractor selectionExtractor) {
+ super(rawModel, selectionExtractor);
+ Assert.isTrue(TableHelper.isTreeTable(rawModel));
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param rawModel
+ */
+ public TreeNattableModelManager(Table rawModel) {
+ this(rawModel, new ObjectsSelectionExtractor());
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#createHorizontalElementList()
+ *
+ * @return
+ */
+ @Override
+ protected List<Object> createHorizontalElementList() {
+ // super.createHorizontalElementList();
+ EventList<Object> eventList = GlazedLists.eventList(new ArrayList<Object>());
+ eventList = GlazedLists.threadSafeList(eventList);
+ this.basicHorizontalList = eventList;
+ treeFormat = new DatumTreeFormat(new ColumnSortModel(this));
+ this.expansionModel = new DatumExpansionModel();
+ this.horizontalFilterList = new FilterList<Object>(this.basicHorizontalList);
+ this.treeList = new TreeList(this.horizontalFilterList, treeFormat, expansionModel);
+
+ return this.treeList;
+ }
+
+ public TreeList getTreeList() {
+ return this.treeList;
+ }
+
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#createNattable(org.eclipse.swt.widgets.Composite, int, org.eclipse.ui.IWorkbenchPartSite)
+ *
+ * @param parent
+ * @param style
+ * @param site
+ * @return
+ */
+ @Override
+ public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {
+ NatTable nattable = super.createNattable(parent, style, site);
+ // update the hidden categories
+
+ List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(this);
+ if (hiddenDepth.size() > 0) {
+ hideShowCategories(hiddenDepth, null);
+ }
+ this.hideShowCategoriesListener = new HideShowCategoriesTableListener(this);
+ getTableEditingDomain().addResourceSetListener(this.hideShowCategoriesListener);
+ return nattable;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#updateToggleActionState()
+ *
+ */
+ @Override
+ protected void updateToggleActionState() {
+ super.updateToggleActionState();
+ // update hierarchic table display style
+ DisplayStyle style = TableHelper.getTableDisplayStyle(this);
+ final ICommandService commandService = EclipseCommandUtils.getCommandService();
+ if (commandService != null) {
+
+ Command command = commandService.getCommand(CommandIds.COMMAND_HIERARCHIC_DISPLAY_STYLE);
+ if (!DisplayStyle.NORMAL.equals(style)) {
+ updateRadioCommandState(command, style.getLiteral());
+ }
+ }
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#createAxisManager(java.util.List, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider, boolean)
+ *
+ * @param representations
+ * @param contentProvider
+ * @param columnAxisManager
+ * @return
+ */
+ @Override
+ protected ICompositeAxisManager createAxisManager(List<AxisManagerRepresentation> representations, AbstractAxisProvider contentProvider, boolean columnAxisManager) {
+ if (columnAxisManager) {
+ return super.createAxisManager(representations, contentProvider, columnAxisManager);
+ } else {
+ CompositeTreeAxisManagerForEventList compositeAxisManager = new CompositeTreeAxisManagerForEventList((EventList<Object>) horizontalFilterList);
+ final List<IAxisManagerForEventList> managers = new ArrayList<IAxisManagerForEventList>();
+ for (AxisManagerRepresentation current : representations) {
+ final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
+ Assert.isTrue(manager instanceof IAxisManagerForEventList);
+ manager.init(this, current, contentProvider);
+ managers.add((IAxisManagerForEventList) manager);
+
+ }
+ compositeAxisManager.init(this, null, contentProvider);
+ DatumTreeFormat treeFormat = getTreeFormat();
+ treeFormat.setTreeComparatorProvider((CompositeTreeAxisManagerForEventList) compositeAxisManager);
+ this.expansionModel.setAxisManager((CompositeTreeAxisManagerForEventList) compositeAxisManager);
+ ((CompositeAxisManagerForEventList) compositeAxisManager).setSubManagers(managers);
+ return compositeAxisManager;
+ }
+
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getTreeFormat()
+ *
+ * @return
+ */
+ @Override
+ public DatumTreeFormat getTreeFormat() {
+ return this.treeFormat;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getDepth()
+ *
+ * @return
+ */
+ @Override
+ public int getTreeItemDepth(final ITreeItemAxis axis) {
+ Format<ITreeItemAxis> format = getTreeFormat();
+ if (format != null) {
+ List<ITreeItemAxis> path = new ArrayList<ITreeItemAxis>();
+ format.getPath(path, axis);
+ return path.size() - 1;
+ }
+ return 0;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#getSemanticDepth(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+ *
+ * @param axis
+ * @return
+ */
+ @Override
+ public int getSemanticDepth(ITreeItemAxis axis) {
+ Object representedObject = axis.getElement();
+ if (representedObject instanceof TreeFillingConfiguration) {
+ return ((TreeFillingConfiguration) representedObject).getDepth();
+ } else {
+ ITreeItemAxis parent = axis.getParent();
+ if (parent == null) {
+ return 0;
+ }
+ representedObject = parent.getElement();
+ Assert.isTrue(representedObject instanceof TreeFillingConfiguration);
+ return ((TreeFillingConfiguration) representedObject).getDepth();
+ }
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowCategories(java.util.List, java.util.List)
+ *
+ * @param depthToHide
+ * @param depthToShow
+ */
+ @Override
+ public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow) {
+ hideShowRowCategories(depthToHide, depthToShow);
+ hideShowColumnCategoriesInRowHeader(depthToHide, depthToShow);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowRowCategories(java.util.List, java.util.List)
+ *
+ * @param depthToHide
+ * @param depthToShow
+ */
+ @Override
+ public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow) {
+ // we hide the rows representing the categories
+ ((ITreeItemAxisManagerForEventList) getRowAxisManager()).managedHideShowCategoriesForDepth(depthToHide, depthToShow);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#hideShowColumnCategoriesInRowHeader(java.util.List, java.util.List)
+ *
+ * @param depthToHide
+ * @param depthToShow
+ */
+ @Override
+ public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow) {
+ this.natTable.refresh();
+ RowHeaderLayerStack rowHeaderLayerStack = getRowHeaderLayerStack();
+ if (rowHeaderLayerStack instanceof RowHeaderHierarchicalLayerStack) {
+ ColumnHideShowLayer layer = ((RowHeaderHierarchicalLayerStack) rowHeaderLayerStack).getRowHeaderColumnHideShowLayer();
+ ILayer subLayer = layer.getUnderlyingLayerByPosition(0, 0);
+ // we hide the columns representing the categories
+ if (TableHelper.isMultiColumnTreeTable(this)) {
+ boolean hasRootConfif = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0);
+
+ if (depthToHide != null && depthToHide.size() > 0) {
+ int[] indexToHide = new int[depthToHide.size()];
+ for (int i = 0; i < depthToHide.size(); i++) {
+ Integer curr = depthToHide.get(i);
+ int tmp = -1;
+ if (hasRootConfif) {
+ tmp = curr * 2;
+ } else {
+ // TODO not yet tested
+ tmp = curr * 2 - 1;
+ }
+
+ // we need to convert the position
+ tmp = layer.underlyingToLocalColumnPosition(subLayer, tmp);
+ indexToHide[i] = tmp;
+ }
+ layer.doCommand(new MultiColumnHideCommand(layer, indexToHide));
+ }
+
+ if (depthToShow != null && depthToShow.size() > 0) {
+
+ List<Integer> indexToShow = new ArrayList<Integer>();
+ for (int i = 0; i < depthToShow.size(); i++) {
+ Integer curr = depthToShow.get(i);
+ int tmp = -1;
+ if (hasRootConfif) {
+ tmp = curr * 2;
+ } else {
+ // TODO not yet tested
+ tmp = curr * 2 - 1;
+ }
+ indexToShow.add(tmp);
+ }
+ layer.doCommand(new MultiColumnShowCommand(indexToShow));
+ }
+ } else {
+ layer.doCommand(new ShowAllColumnsCommand());
+ }
+ }
+ }
+
+ /**
+ *
+ * @param bodyLayerStack
+ * the body layer stack to use
+ *
+ * @return
+ * the row header layer stack to use
+ */
+ protected RowHeaderLayerStack createRowHeaderLayerStack(BodyLayerStack bodyLayerStack) {
+ return new RowHeaderHierarchicalLayerStack(bodyLayerStack, this);
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager#doCollapseExpandAction(org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum, java.util.List)
+ *
+ * @param actionId
+ * @param selectedAxis
+ */
+ @Override
+ public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis) {
+ CollapseExpandActionHelper.doCollapseExpandAction(actionId, selectedAxis, getTableAxisElementProvider(), this.natTable);
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#dispose()
+ *
+ */
+ @Override
+ public void dispose() {
+ if (getTableEditingDomain() != null) {
+ if (this.hideShowCategoriesListener != null) {
+ getTableEditingDomain().removeResourceSetListener(this.hideShowCategoriesListener);
+ }
+ }
+ super.dispose();
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
index a2af26968f9..9768b2fa96c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
@@ -166,7 +166,7 @@ public class CSVParser {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#hasNext()
*/
@Override
@@ -176,7 +176,7 @@ public class CSVParser {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#next()
*/
@Override
@@ -196,7 +196,7 @@ public class CSVParser {
private class Document extends RowIterator {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#hasNext()
*/
@Override
@@ -206,7 +206,7 @@ public class CSVParser {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#next()
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java
index f37ccdb0a56..79ec592e240 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java
@@ -23,7 +23,7 @@ public abstract class CellIterator implements Iterator<String> {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#remove()
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java
index 3029f52715c..b2b47bb55a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java
@@ -23,7 +23,7 @@ public abstract class RowIterator implements Iterator<CellIterator> {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#remove()
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
index 2d6227fcd2d..eefb1f9b6d0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
@@ -40,7 +40,6 @@ public class TablePreferencesConstantsHelper {
*/
public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$
-
/**
* Get the preference constant used to store the preference of an element.
*
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
index a0825ab3a09..9a30d7c8a84 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
@@ -74,11 +74,14 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
final ILabelProviderCellContextElementWrapper contextElement = (ILabelProviderCellContextElementWrapper) element;
final IConfigRegistry configRegistry = contextElement.getConfigRegistry();
final LabelStack labels = getLabelStack(contextElement, configRegistry);
+ if (labels.hasLabel(GridRegion.FILTER_ROW)) {
+ return getBodyLabel(contextElement, configRegistry);
+ }
if (labels.hasLabel(GridRegion.COLUMN_HEADER)) {
return getColumnHeaderLabel(contextElement, configRegistry);
} else if (labels.hasLabel(GridRegion.ROW_HEADER)) {
return getRowHeaderLabel(contextElement, configRegistry);
- } else if (labels.hasLabel(GridRegion.BODY)) {
+ } else if (labels.hasLabel(GridRegion.BODY) || labels.hasLabel(GridRegion.FILTER_ROW)) {
return getBodyLabel(contextElement, configRegistry);
}
Object value = contextElement.getObject();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
index 6317a2ce98a..a887da6c11e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
@@ -280,7 +280,7 @@ public class PasteEObjectTreeAxisInNattableCommandProvider {
}
}
if (categoryName.equals(featureName)) {
- return curr.getPasteConfiguration();
+ return (IPasteConfiguration) curr.getPasteConfiguration();
}
}
@@ -803,11 +803,11 @@ public class PasteEObjectTreeAxisInNattableCommandProvider {
}
/**
- *
+ *
* @param iterator
* the cellIterator
* @param nbReadCell
- *
+ *
*/
protected void crossCellIteratorToFirstBodyCell(CellIterator cellIter, int nbReadCell) {
if (TableHelper.isSingleColumnTreeTable(table)) {
@@ -923,7 +923,7 @@ public class PasteEObjectTreeAxisInNattableCommandProvider {
}
// we get the paste configuration to use
- PasteEObjectConfiguration pasteConfToUse = confMap.get(Integer.valueOf(depth));
+ PasteEObjectConfiguration pasteConfToUse = (PasteEObjectConfiguration) confMap.get(Integer.valueOf(depth));
if (pasteConfToUse == null) {
pasteConfToUse = (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, null);
if (pasteConfToUse != null) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
index cca9bd8f2bf..71212c6eeff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.selection;
@@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
public interface ISelectionExtractor {
/**
- *
+ *
* @param structuredSelection
* a structured selection
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
index f3abec933dc..1f078ec5345 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.selection;
@@ -28,16 +28,15 @@ public class ObjectsSelectionExtractor implements ISelectionExtractor {
/**
- *
+ *
* @param structuredSelection
* a structured selection
* @return
* the object owned by the selected
*/
- @Override
public final Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {
List<Object> result = new ArrayList<Object>(structuredSelection.size());
-
+
for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {
Object realObject = getRealObject(iter.next());
if (realObject != null) {
@@ -49,7 +48,7 @@ public class ObjectsSelectionExtractor implements ISelectionExtractor {
}
/**
- *
+ *
* @param object
* an object
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
index f78b93b3040..97079304c0b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.tree;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
index 76ecce35085..3c4b48c4da1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
@@ -67,8 +67,8 @@ public class AxisComparator implements Comparator<IAxis> {
@Override
public int compare(IAxis arg0, IAxis arg1) {
final LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
- final String str1 = getText(serv, arg0).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace
- final String str2 = getText(serv, arg1).replaceAll(AxisUtils.REGEX, "");
+ final String str1 = getText(serv, arg0).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace //$NON-NLS-1$
+ final String str2 = getText(serv, arg1).replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$
if (this.alphabeticOrder) {
return str1.compareToIgnoreCase(str2);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
index 383b304678a..98550fe6687 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
@@ -34,7 +34,7 @@ public class AxisUtils {
/**
* This regex allows to find all word character (letters + numbers)+ the whitespace
*/
- public static final String REGEX = "[^\\w\\s]";
+ public static final String REGEX = "[^\\w\\s]"; //$NON-NLS-1$
/**
* This methods avoid to duplicate these some lines
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
index 899f8b5da45..56152dc3be7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.utils;
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.infra.tools.util.SelectionHelper;
public class CollapseExpandActionHelper {
/**
- *
+ *
* Constructor.
*
*/
@@ -46,7 +46,7 @@ public class CollapseExpandActionHelper {
/**
* This method is not in the API.
- *
+ *
* @param actionId
* the id of the action to do
* @param axisProvider
@@ -76,9 +76,9 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* This method does the wanted action according to the current selection of the table
- *
+ *
* @param actionId
* the id of the action to do
* @param axisProvider
@@ -112,9 +112,9 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* This method does the wanted action according to the @param selectedRows
- *
+ *
* @param actionId
* the id of the action to do
* @param selectedRows
@@ -151,9 +151,9 @@ public class CollapseExpandActionHelper {
/**
* This method allows to expand the selected rows on 2 levels
- *
+ *
* @param natTable
- *
+ *
*/
private static final void expandOn2LevelsRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
@@ -180,7 +180,7 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* @param axis
* @param axisProvider
* @param natTable
@@ -197,7 +197,7 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* @param axis
* @param axisProvider
* @param natTable
@@ -209,7 +209,7 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* @param axis
* @param axisProvider
* @param natTable
@@ -226,7 +226,7 @@ public class CollapseExpandActionHelper {
* @param axis
* the list of axis to collapse
* @param natTable
- *
+ *
*/
private static final void collapseRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
for (ITreeItemAxis current : axis) {
@@ -238,9 +238,9 @@ public class CollapseExpandActionHelper {
}
/**
- *
+ *
* This method expands parents of nodes to display these nodes in the table
- *
+ *
* @param axis
* a list of axis to show in the table
* @param axisProvider
@@ -256,7 +256,7 @@ public class CollapseExpandActionHelper {
/**
* This action expands the parents axis of the axis, in order to display it
- *
+ *
* @param axis
* an axis
* @param axisProvider
@@ -281,9 +281,9 @@ public class CollapseExpandActionHelper {
/**
* this method allows to collapse the selection
- *
+ *
* @param natTable
- *
+ *
*/
private static final void collapseSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
@@ -299,9 +299,9 @@ public class CollapseExpandActionHelper {
/**
* this method allows to expand the selection
- *
+ *
* @param natTable
- *
+ *
*/
private static final void expandFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
@@ -317,9 +317,9 @@ public class CollapseExpandActionHelper {
/**
* this method allows to collapse all nodes for the selection
- *
+ *
* @param natTable
- *
+ *
*/
private static final void collapseAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
@@ -327,19 +327,19 @@ public class CollapseExpandActionHelper {
if (value instanceof ITreeItemAxis) {
ITreeItemAxis axis = (ITreeItemAxis) value;
if (axis.isExpanded()) {
- collapseFullBranch(axis, axisProvider, natTable);
+ collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);
}
}
}
}
/**
- *
+ *
* @param axis
* an axis
* this method collapse all ITreeItemAxis of the branch
* @param natTable
- *
+ *
*/
private static final void collapseFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
// NatTable nattable = this.eventData.getNatTable();
@@ -354,9 +354,9 @@ public class CollapseExpandActionHelper {
/**
* This method allows to expand the selected rows on 2 levels
- *
+ *
* @param natTable
- *
+ *
*/
private static final void expandOn2LevelsSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
@@ -397,9 +397,9 @@ public class CollapseExpandActionHelper {
/**
* This method allows to expand all the sub-item of the selected items
- *
+ *
* @param natTable
- *
+ *
*/
private static final void expandAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
@@ -415,7 +415,7 @@ public class CollapseExpandActionHelper {
* @param axis
* the axis for which we want to expand the whole branch
* @param natTable
- *
+ *
*/
private static final void expandFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
if (!axis.isExpanded() && axis.getChildren().size() > 0) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
index 3ec5d9925de..b753a2f4345 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.nattable.utils;
/**
- *
+ *
* The constants used in the Papyrus NatTable Framework
*
*/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CreatableEObjectAxisUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CreatableEObjectAxisUtils.java
index c3e50fa8594..3045583815c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CreatableEObjectAxisUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CreatableEObjectAxisUtils.java
@@ -19,13 +19,13 @@ import java.util.TreeSet;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
import org.eclipse.papyrus.infra.services.edit.utils.ElementTypeUtils;
/**
*
- * @author VL222926
+ * This class provides useful methods to know which kind of elements can be created for a given table
*
*/
public class CreatableEObjectAxisUtils {
@@ -44,7 +44,7 @@ public class CreatableEObjectAxisUtils {
* the list of the creatable element on the axis
*/
public static final Collection<String> getCreatableElementIds(final Table table, final boolean onColumn) {
- final INattableModelManager nattableModelManager = new NattableModelManager(table);
+ final INattableModelManager nattableModelManager = NattableModelManagerFactory.INSTANCE.createNatTableModelManager(table, new ObjectsSelectionExtractor());
return getCreatableElementIds(nattableModelManager, onColumn);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
index 4db5a64096d..7df40885882 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
@@ -223,7 +223,7 @@ public class LocationValue {
*/
@Override
public String toString() {
- String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject;
+ String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
return message;
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
index bd58e187ddb..d98360b7cdd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
@@ -13,7 +13,13 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.utils;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
import org.eclipse.nebula.widgets.nattable.style.ConfigAttribute;
+import org.eclipse.papyrus.infra.nattable.comparator.ObjectNameAndPathComparator;
+import org.eclipse.papyrus.infra.nattable.display.converter.ObjectNameAndPathDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusTextMatchingMode;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
@@ -60,4 +66,39 @@ public class NattableConfigAttributes {
*/
public static final String NATTABLE_MODEL_MANAGER_ID = "nattable_model_manager_id"; //$NON-NLS-1$
+ /**
+ * Attribute used to register a comparator for object, comparing this kind of string : "name - path"
+ */
+ public static final ConfigAttribute<ObjectNameAndPathComparator> OBJECT_NAME_AND_PATH_COMPARATOR = new ConfigAttribute<ObjectNameAndPathComparator>();
+
+ /**
+ * the id used for the previous comparator
+ */
+ public static final String OBJECT_NAME_AND_PATH_COMPARATOR_ID = "object_name_and_path_comparator_id"; //$NON-NLS-1$
+
+ /**
+ * the attribute used to register a converter (object to string) the string as the format : "name - path" where name is the name of the object and path its path in the model
+ */
+ public static final ConfigAttribute<ObjectNameAndPathDisplayConverter> OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER = new ConfigAttribute<ObjectNameAndPathDisplayConverter>();
+
+ /**
+ * the id of the previous converter
+ */
+ public static final String OBJECT_NAME_AND_PATH_DISPLAY_CONVERTER_ID = "object_name_and_path_display_converter_id"; //$NON-NLS-1$
+
+ /**
+ * the attribute used to store matched editor used for filtering in the table
+ */
+ public static final ConfigAttribute<IPapyrusMatcherEditorFactory<?>> MATCHER_EDITOR_FACTORY = new ConfigAttribute<IPapyrusMatcherEditorFactory<?>>();
+
+ /**
+ * the attribute used to define the matching mode to use for filter. The papyrus implements allows to use this one, or {@link TextMatchingMode}
+ */
+ public static final ConfigAttribute<PapyrusTextMatchingMode> STRING_FILTER_MATCHING_MODE = new ConfigAttribute<PapyrusTextMatchingMode>();
+
+ /**
+ * the config attribute used to register the class loading and storing filter state
+ */
+ public static final ConfigAttribute<IFilterValueToMatchManager> FILTER_VALUE_TO_MATCH_MANAGER = new ConfigAttribute<IFilterValueToMatchManager>();
+
} \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableModelManagerFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableModelManagerFactory.java
new file mode 100755
index 00000000000..b9d40cb9b93
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableModelManagerFactory.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
+
+/**
+ * This class allows to create a {@link INattableModelManager} from a table model
+ *
+ */
+public class NattableModelManagerFactory {
+
+ public static final NattableModelManagerFactory INSTANCE = new NattableModelManagerFactory();
+
+ private NattableModelManagerFactory() {
+ // to prevent instanciation
+ }
+
+ /**
+ *
+ * @param table
+ * the table model
+ * @return
+ * the INattableModelManager to use to manipulate the table
+ */
+ public INattableModelManager createNatTableModelManager(final Table table, ISelectionExtractor selectionExtractor) {
+ if (TableHelper.isTreeTable(table)) {
+ return new TreeNattableModelManager(table,selectionExtractor);
+ }
+ return new NattableModelManager(table, selectionExtractor);
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
index b0b23b99817..1ba3d9749ce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
@@ -23,12 +23,12 @@ public class PasteHelper {
/**
* the default separator used for row
*/
- public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1"
+ public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1" //$NON-NLS-1$
/**
* the default separator used for columns
*/
- public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1"
+ public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1" //$NON-NLS-1$
/**
* the default separator used for multivalue
@@ -110,7 +110,7 @@ public class PasteHelper {
int nbColumn = rows[0].split(columnSeparator).length;
String[] columns = new String[nbColumn];
for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
- columns[columnIndex] = "";
+ columns[columnIndex] = ""; //$NON-NLS-1$
}
for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
index e5b2820fad6..51678925abe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,19 +8,18 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.utils;
/**
* @author VL222926
- *
+ *
* This class provides code which can be provided by Paste Action in the table
*/
public class PasteSeverityCode {
- public static int PASTE_ERROR_NO_CONTAINMENT_FEATURE;
/**
* Constructor.
@@ -29,11 +28,16 @@ public class PasteSeverityCode {
private PasteSeverityCode() {
// to prevent instanciation
}
-
+
+ /**
+ * the severity code used when there is no containment feature declared in the configuration
+ */
+ public static final int PASTE_ERROR__NO_CONTAINMENT_FEATURE = 0;
+
/**
* the severity code used when there is no paste configuration found
*/
- public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = 0;
+ public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = PASTE_ERROR__NO_CONTAINMENT_FEATURE+1;
/**
* no element type defined for the paste
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
index 4019c53823e..efdd03c5693 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.utils;
@@ -32,7 +32,7 @@ public class PasteTreeUtils {
}
/**
- *
+ *
* @param nbReadCell
* the number of read cells (>0)
* @param maxDepth
@@ -72,7 +72,7 @@ public class PasteTreeUtils {
}
/**
- *
+ *
* @param nbReadCell
* the number of read cells (>0)
* @param maxDepth
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StyleUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StyleUtils.java
index 07feda740f6..21e1e15796e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StyleUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StyleUtils.java
@@ -77,7 +77,7 @@ public class StyleUtils {
}
/**
- *
+ *
* @param manager
* a table manager
* @param depth
@@ -90,7 +90,7 @@ public class StyleUtils {
}
/**
- *
+ *
* @param table
* a table
* @param depth
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
index 3aa0679a729..d8028afe31e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
@@ -161,7 +161,7 @@ public class TableClipboardUtils {
int nbColumn = rows[0].split(CELL_SEPARATOR).length;
String[] columns = new String[nbColumn];
for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
- columns[columnIndex] = "";
+ columns[columnIndex] = ""; //$NON-NLS-1$
}
for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
@@ -171,7 +171,7 @@ public class TableClipboardUtils {
if (currentColumns.length != 0) {
columns[columnIndex] += currentColumns[columnIndex];
} else {
- columns[columnIndex] += "";
+ columns[columnIndex] += ""; //$NON-NLS-1$
}
if (rowIndex < rows.length + 1) {
columns[columnIndex] += CELL_SEPARATOR;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
index b00d0174a6f..b0ab50dcb79 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.utils;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.tools.util.SelectionHelper;
public class TableSelectionHelper {
/**
- *
+ *
* @return
* the current table selection
*/
@@ -43,7 +43,7 @@ public class TableSelectionHelper {
}
/**
- *
+ *
* @return
* a map with the index and the object of the fully selected rows
*/
@@ -59,7 +59,7 @@ public class TableSelectionHelper {
}
/**
- *
+ *
* @return
* a map with the index and the object of the fully selected columns
*/
@@ -75,7 +75,7 @@ public class TableSelectionHelper {
}
/**
- *
+ *
* @return
* the position coordinate of the selected cells, or <code>null</code>
*/
@@ -105,10 +105,10 @@ public class TableSelectionHelper {
}
/**
- *
+ *
* @param tableManager
* the tableManager for which we want the selected columns
- *
+ *
* @return
* a map with the index and the object of the fully selected columns
*/
@@ -121,7 +121,7 @@ public class TableSelectionHelper {
}
/**
- *
+ *
* @param tableManager
* the tableManager for which we want the selected rows
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/AbstractTableWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/AbstractTableWizard.java
index b96979550e1..c6d1d54f5f8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/AbstractTableWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/AbstractTableWizard.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard;
@@ -61,7 +61,7 @@ public abstract class AbstractTableWizard extends Wizard {
}
/**
- *
+ *
* @return
* the nattable manager to use in the wizard
*/
@@ -75,7 +75,7 @@ public abstract class AbstractTableWizard extends Wizard {
*/
@Override
public void addPages() {
- getShell().setImage(Activator.getDefault().getImage(ImageConstants.PAPYRUS_ICON_PATH));
+ getShell().setImage(Activator.getDefault().getImage(ImageConstants.PAPYRUS_ICON_PATH)); //$NON-NLS-1$
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
index 941120bc7d2..ac5ab6c79bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard;
@@ -33,7 +33,7 @@ public class CategoriesWizardUtils {
}
/**
- *
+ *
* @param axis
* an axis
* @return
@@ -44,7 +44,7 @@ public class CategoriesWizardUtils {
}
/**
- *
+ *
* @param axis
* an axis
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
index e284ec96d43..8a28f6d41ac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard;
@@ -110,7 +110,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @param selector
* the reference selector
* @return
@@ -139,7 +139,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @return
* the created and initialized reference selector
*/
@@ -148,7 +148,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
/**
- *
+ *
* @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#createControls(org.eclipse.swt.widgets.Composite)
*
* @param parent
@@ -169,7 +169,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @return
* the page to use to select the categories to listen in the table
*/
@@ -182,7 +182,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @return
* the paste page used to configure the paste
*/
@@ -206,7 +206,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* The label provider to use for the selected elements viewer
*
*/
@@ -220,7 +220,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
private NatTable natTable;
/**
- *
+ *
* Constructor.
*
* @param wrappedProvider
@@ -317,7 +317,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @return
* the initial selection to use in the wizard page
*/
@@ -483,7 +483,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @param table
* @param representedAxisManager
* @param depth
@@ -502,7 +502,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
}
/**
- *
+ *
* @param table
* the table
* @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
index 1e3e5ed74f6..3e9a004b83d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
@@ -51,7 +51,7 @@ import org.eclipse.swt.widgets.Control;
* <li>the feature to listen</li>
* <li></li>
* </ul>
- *
+ *
* The create action allows to create new depth
*/
public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelectionWidget {
@@ -119,7 +119,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @return
* the context object to use
*/
@@ -130,8 +130,8 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
Object first = ((IStructuredSelection) selection).getFirstElement();
if (first instanceof ITreeItemAxis) {
ITreeItemAxis context = (ITreeItemAxis) first;
- while (context.getParent() != null) {
- context = context.getParent();
+ while (((ITreeItemAxis) context).getParent() != null) {
+ context = ((ITreeItemAxis) context).getParent();
}
return context;
}
@@ -234,7 +234,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
/**
- *
+ *
* @return
* the selected axis in the selectedElementsViewer
*/
@@ -253,15 +253,15 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
/**
- *
+ *
* @return
* the list with the current selection in the viewer.
* <ul>
* <li>if roots are in the selection, we returns only axis representing roots</li>
* <li>we returns only axis representing FillingCategories</li>
- *
+ *
* </ul>
- *
+ *
*/
protected List<ITreeItemAxis> getConsistentSelectionInSelectedElementsViewer() {
if (selectedElementsViewer == null) {
@@ -292,7 +292,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @param wantedClass
* the class represented the wanted type of the encapsulated element
* @return
@@ -403,13 +403,13 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
/**
- *
+ *
* @return
* <ul>
* <li>a list with the selected categories only when all selected elements are categories AND they have the same parent (a {@link IdTreeItemAxis} (which represents the depth))</li>
* <li>an empty list in all others case</li>
* </ul>
- *
+ *
*/
protected List<ITreeItemAxis> getSelectedCategoriesInSelectedElementsViewer() {
List<ITreeItemAxis> selection = getSelectedAxisInSelectedElementsViewer();
@@ -433,9 +433,9 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @author VL222926
- *
+ *
* This comparator allows to sort comparator
*
*/
@@ -480,7 +480,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canMove(boolean)
*
* @param up
@@ -504,7 +504,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @param up
* <code>true</code> if the elements must be move to up
*/
@@ -598,7 +598,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
/**
* Destroy recursively all categories axis
- *
+ *
* @param axis
* an axis
*/
@@ -630,7 +630,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @return
* the list of the selected element in the selection viewer
*/
@@ -651,14 +651,14 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @author VL222926
* This class is the factory used to create new ITreeItemAxis in the viewer of selected element
* It creates only {@link ITreeItemAxis} to represents depth to configure and its allows to edit only alias of categories
*/
public class CategoriesValueFactory implements ReferenceValueFactory {
/**
- *
+ *
* @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#validateObjects(java.util.Collection)
*
* @param objectsToValidate
@@ -670,7 +670,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)
*
* @param widget
@@ -708,7 +708,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @return
*/
@Override
@@ -721,7 +721,7 @@ public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelecti
}
/**
- *
+ *
* @return
*/
@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
index a515472e322..de00515e6cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
index a2a5bae1ce3..2cd07ebc843 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePastePage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePastePage.java
index 6bf0d725dc5..3d3a183ef89 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePastePage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePastePage.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
index b46c36014ce..b4f503cd34f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
@@ -26,7 +26,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemA
// TODO : move me?
public class ITreeItemContentProvider implements ITreeContentProvider {
/**
- *
+ *
*/
@Override
public void dispose() {
@@ -34,7 +34,7 @@ public class ITreeItemContentProvider implements ITreeContentProvider {
}
/**
- *
+ *
* @param arg0
* @return
*/
@@ -47,7 +47,7 @@ public class ITreeItemContentProvider implements ITreeContentProvider {
}
/**
- *
+ *
* @param arg0
* @return
*/
@@ -60,7 +60,7 @@ public class ITreeItemContentProvider implements ITreeContentProvider {
}
/**
- *
+ *
* @param arg0
* @return
*/
@@ -73,7 +73,7 @@ public class ITreeItemContentProvider implements ITreeContentProvider {
}
/**
- *
+ *
* @param arg0
* @return
*/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
index 6f7706e2650..0883c615a3c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 CEA LIST and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard.pages;
@@ -47,7 +47,7 @@ public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWiz
/**
* Constructor.
- *
+ *
* @param selector
*/
public SelectCategoriesWizardPage(IElementSelector selector) {
@@ -55,7 +55,7 @@ public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWiz
}
/**
- *
+ *
* Constructor.
*
* @param pageName
@@ -118,16 +118,16 @@ public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWiz
}
/**
- *
+ *
* @author VL222926
- *
+ *
* this class allows to refresh properly the next button after a double click on the left part of the widget
*
*/
private class SelectorListener implements IElementSelectionListener {
/**
- *
+ *
* @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])
*
* @param elements
@@ -137,7 +137,7 @@ public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWiz
Display.getDefault().asyncExec(new Runnable() {
/**
- *
+ *
* @see java.lang.Runnable#run()
*
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
index 331c9143e99..532b2b449df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
@@ -13,6 +13,7 @@
package org.eclipse.papyrus.infra.tools.util;
+import java.math.BigDecimal;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -50,7 +51,7 @@ public class TypeUtils {
*/
public static final boolean isIntegerValue(String str) {
/** the pattern that checks visual ids are valid integers */
- Pattern digit = Pattern.compile("\\d+");
+ Pattern digit = Pattern.compile("\\d+"); //$NON-NLS-1$
boolean result = false;
Matcher matcher = digit.matcher(str);
if (matcher != null) {
@@ -58,4 +59,59 @@ public class TypeUtils {
}
return result;
}
+
+ /**
+ *
+ * @param str
+ * a string
+ * @return
+ * <code>true</code> if the string represents a double
+ */
+ public static final boolean isDoubleValue(String str) {
+ try {
+ new BigDecimal(str);
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ *
+ * @param str
+ * a string
+ * @return
+ * <code>true</code> if the string represents a double
+ */
+ public static final boolean isNaturalValue(String str) {
+ boolean res = isIntegerValue(str);
+ if (res) {
+ int tmp = Integer.parseInt(str);
+ return tmp >= 0;
+ }
+ return res;
+ }
+
+ /**
+ *
+ * @param object
+ * an object
+ * @return
+ * <code>true</code> if the object represents a numeric value
+ */
+ public static final boolean isNumericValue(Object object) {
+ if (object instanceof String) {
+ try {
+ new BigDecimal((String) object);
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+ if(object instanceof Integer || object instanceof Double || object instanceof Float){
+ return true;
+ }
+ return false;
+
+ }
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
index 592a443125b..b595dd2ed57 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;s
ingleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.papyrus.uml.nattable.generic.config
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java
index 3b524a7bd2b..1ed0f194efa 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java
@@ -11,6 +11,7 @@ public class Activator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.generic.config"; //$NON-NLS-1$
+ public static final String TABLE_TYPE = "PapyrusGenericTable";//$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
index d2a2dccf3d9..f54ae895291 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
@@ -99,5 +99,28 @@
<postAction
postActionClass="org.eclipse.papyrus.uml.nattable.paste.ApplyStereotypePastePostAction">
</postAction>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.infra.nattable.filter.configuration">
+ <configuration
+ class="org.eclipse.papyrus.uml.nattable.filter.configuration.UMLBooleanEditorFilterConfiguration"
+ order="8000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.uml.nattable.filter.configuration.UMLIntegerEditorFilterConfiguration"
+ order="8000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.uml.nattable.filter.configuration.UMLRealEditorFilterConfiguration"
+ order="8000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.uml.nattable.filter.configuration.UMLUnlimitedNaturalEditorFilterConfiguration"
+ order="8000">
+ </configuration>
+ <configuration
+ class="org.eclipse.papyrus.uml.nattable.filter.configuration.UMLEnumerationEditorFilterConfiguration"
+ order="8000">
+ </configuration>
</extension>
</plugin>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
index df623bf8158..a50e5502706 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
@@ -38,7 +38,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
index 2ed4577eafa..241582c8391 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
@@ -73,7 +73,7 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
/**
* the id for this editor configuration
*/
- public static final String EDITOR_CONFIG_ID = "UML_EDITOR_CONFIG";
+ public static final String EDITOR_CONFIG_ID = "UML_EDITOR_CONFIG"; //$NON-NLS-1$
/**
@@ -432,7 +432,7 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
IDisplayConverter converter = null;
switch (editorKind) {
case SINGLE_REAL:
- converter = new DefaultDoubleDisplayConverter(){
+ converter = new DefaultDoubleDisplayConverter() {
@Override
public Object canonicalToDisplayValue(Object canonicalValue) {
@@ -463,7 +463,7 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
@Override
public Object canonicalToDisplayValue(Object canonicalValue) {// TODO : we should use the table label provider to do the conversion!
if (canonicalValue instanceof DynamicEObjectImpl) {
- EStructuralFeature feature = ((DynamicEObjectImpl) canonicalValue).eClass().getEStructuralFeature("base_Class");
+ EStructuralFeature feature = ((DynamicEObjectImpl) canonicalValue).eClass().getEStructuralFeature("base_Class"); //$NON-NLS-1$
return provider.getText(((DynamicEObjectImpl) canonicalValue).eGet(feature));
}
return provider.getText(canonicalValue);
@@ -485,14 +485,14 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
@Override
public Object canonicalToDisplayValue(Object sourceValue) {// TODO : we should use the table label provider to do the conversion!
if (sourceValue.equals(new Integer(-1))) {
- return "*";
+ return "*"; //$NON-NLS-1$
}
return sourceValue;
}
@Override
public Object displayToCanonicalValue(Object destinationValue) {
- if (destinationValue.equals("*")) {
+ if (destinationValue.equals("*")) { //$NON-NLS-1$
return new Integer(-1);
}
return new Integer((String) destinationValue);
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
index 2a9874c222c..2b07ccd554c 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
@@ -10,18 +10,18 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
* Christian W. Damus (CEA) - bug 402525
- *
+ * Vincent Lorenzo (CEA-LIST) - bug 458492
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.dataprovider;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.common.util.Enumerator;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
@@ -57,7 +57,7 @@ public class UMLStereotypeSingleEnumerationComboBoxDataProvider implements IComb
* The table axis element provider
*/
public UMLStereotypeSingleEnumerationComboBoxDataProvider(final Object axisElement, final ITableAxisElementProvider elementProvider) {
- this.axisElement = AxisUtils.getRepresentedElement(axisElement);
+ this.axisElement = axisElement;
this.elementProvider = elementProvider;
}
@@ -79,9 +79,9 @@ public class UMLStereotypeSingleEnumerationComboBoxDataProvider implements IComb
el = AxisUtils.getRepresentedElement(el);
rowElement = AxisUtils.getRepresentedElement(rowElement);
Element modelElement = null;
- if (rowElement instanceof Element && el == this.axisElement) {
+ if (rowElement instanceof Element && el.equals(AxisUtils.getRepresentedElement(this.axisElement))) {
modelElement = (Element) rowElement;
- } else if (rowElement == this.axisElement && el instanceof Element) {
+ } else if (rowElement.equals(AxisUtils.getRepresentedElement(this.axisElement)) && el instanceof Element) {
modelElement = (Element) el;
}
if (modelElement != null) {
@@ -90,31 +90,25 @@ public class UMLStereotypeSingleEnumerationComboBoxDataProvider implements IComb
final List<Stereotype> ste = UMLTableUtils.getApplicableStereotypesWithThisProperty(modelElement, id);
if (ste.size() == 1) {
final Stereotype current = ste.get(0);
- EEnum eenum = (EEnum) current.getProfile().getDefinition(property.getType());
- if (eenum == null) {
- // the enum is declared in an other file (external library)
- EClass stereotypeDef = (EClass) current.getProfile().getDefinition(current);
- List<EAttribute> attributes = stereotypeDef.getEAllAttributes();
- int i = 0;
- while (eenum == null && i < attributes.size()) {
- EAttribute attr = attributes.get(i);
- if (property.getName().equals(attr.getName())) {
- EClassifier tmp = attr.getEType();
- if (tmp instanceof EEnum) {
- eenum = (EEnum) tmp;
+ // the stereotype is maybe not applied on the element, but we allow to edit its values
+ EClass stereotypeDefinition = (EClass) current.getProfile().getDefinition(current);
+ if (stereotypeDefinition != null) {
+ EStructuralFeature feature = stereotypeDefinition.getEStructuralFeature(property.getName());
+ if (feature != null) {
+ EEnum eenum = null;
+ if (feature != null && feature.getEType() instanceof EEnum) {
+ eenum = (EEnum) feature.getEType();
+ }
+ if (eenum != null) {
+ for (EEnumLiteral literal : eenum.getELiterals()) {
+ Enumerator value = literal.getInstance();
+ literals.add(value);
}
}
- i++;
- }
- }
- if (eenum != null) {
- for (final EEnumLiteral instances : eenum.getELiterals()) {
- literals.add(instances.getInstance());
}
}
}
}
return literals;
}
-
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java
new file mode 100644
index 00000000000..3c76f831fb3
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * Configuration to filter UML Boolean value
+ *
+ */
+public class UMLBooleanEditorFilterConfiguration extends AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.boolean.checkboxcombo.with.NA"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param axis
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object axis) {
+ Object object = AxisUtils.getRepresentedElement(axis);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ return PrimitivesTypesUtils.UML_BOOLEAN.equals(type.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
new file mode 100644
index 00000000000..6df96e60c88
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
@@ -0,0 +1,285 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
+import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+import ca.odell.glazedlists.BasicEventList;
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.matchers.MatcherEditor;
+
+/**
+ * This configuration allows to filter UML Enumeration
+ *
+ */
+public class UMLEnumerationEditorFilterConfiguration extends EEnumFilterCellEditorFilterConfiguration {
+
+ /**
+ * the id of this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.uml.enumeration.checkboxcombo.with.NA";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ if (UMLTableUtils.isStringRepresentingStereotypeProperty(columnElement)) {
+ String string = (String) AxisUtils.getRepresentedElement(columnElement);
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ if (prop != null) {
+ return type instanceof Enumeration;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration#getLiteral(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param configRegistry
+ * @param axis
+ * @return
+ */
+ @Override
+ protected List<Enumerator> getLiteral(IConfigRegistry configRegistry, Object axis) {
+ String id = (String) AxisUtils.getRepresentedElement(axis);
+ INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ return UMLTableUtils.getLiteralsToTypeProperty(table.getContext(), id);
+ }
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration#createPapyrusMatcherFactory()
+ *
+ * @return
+ */
+ @Override
+ protected IPapyrusMatcherEditorFactory<Object> createPapyrusMatcherFactory() {
+ return new IPapyrusMatcherEditorFactory<Object>() {
+
+ @Override
+ public EventList<MatcherEditor<Object>> instantiateMatcherEditors(IColumnAccessor<Object> columnAccessor, Integer columnIndex, Object wantedValue, IConfigRegistry configRegistry) {
+ EventList<MatcherEditor<Object>> list = new BasicEventList<MatcherEditor<Object>>();
+ list.add(new UMLEnumerationMatcherEditor(columnAccessor, columnIndex, wantedValue, configRegistry));
+ return list;
+ }
+ };
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration#createFilterValueToMatchManager(java.lang.String, java.util.List)
+ *
+ * @param filterConfiguration
+ * @param literals
+ * @return
+ */
+ @Override
+ protected IFilterValueToMatchManager createFilterValueToMatchManager(String filterConfiguration, List<Enumerator> literals) {
+ return new UMLEnumerationFilterValueToMatchManager(filterConfiguration, literals);
+ }
+
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides a combo with checkbox to filter UML Enumeration, with N/A value"; //$NON-NLS-1$
+ }
+
+ public static class UMLEnumerationFilterValueToMatchManager extends EnumeratorFilterValueToMatchManager {
+
+ /**
+ * Constructor.
+ *
+ * @param filterConfigurationId
+ */
+ public UMLEnumerationFilterValueToMatchManager(String filterConfigurationId, List<Enumerator> literals) {
+ super(filterConfigurationId, literals);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager#getValueToMatch(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param configRegistry
+ * @param axis
+ * @return
+ */
+ @Override
+ public Object getValueToMatch(IConfigRegistry configRegistry, Object axis) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ NamedStyle style = getValueToMatchStyle(iaxis);
+ if (style != null) {
+ if (style instanceof StringListValueStyle) {
+ List<Object> returnedValues = new ArrayList<Object>();
+ Collection<String> coll = ((StringListValueStyle) style).getStringListValue();
+ for (String string : coll) {
+ if (ICellManager.NOT_AVALAIBLE.equals(string)) {
+ returnedValues.add(string);
+ continue;
+ }
+ for (Enumerator tmp : literals) {
+ if (tmp.getName().equals(string)) {
+ returnedValues.add(tmp);
+ continue;
+ }
+ }
+ }
+ return returnedValues;
+ }
+ if (style instanceof StringValueStyle) {
+ String val = ((StringValueStyle) style).getStringValue();
+ if (ICellManager.NOT_AVALAIBLE.equals(val)) {
+ return val;
+ }
+ for (Enumerator tmp : literals) {
+ if (tmp.getName().equals(val)) {
+ return tmp;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractFilterValueToMatchManager#getSaveValueToMatchCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,
+ * java.lang.Object, java.lang.Object)
+ *
+ * @param domain
+ * @param configRegistry
+ * @param axis
+ * @param newValue
+ * @return
+ */
+ @Override
+ protected Command getSaveValueToMatchCommand(TransactionalEditingDomain domain, IConfigRegistry configRegistry, Object axis, Object newValue) {
+ if (!(axis instanceof IAxis)) {
+ return null;
+ }
+ IAxis iaxis = (IAxis) axis;
+ CompoundCommand cc = new CompoundCommand("Set Filter Value Command");
+ NamedStyle keyStyle = getValueToMatchStyle(iaxis);
+ if (newValue instanceof Collection<?>) {
+ Collection<?> coll = (Collection<?>) newValue;
+ // we need to update the keystyle
+ if (keyStyle != null && !(keyStyle instanceof StringListValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createStringListValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+
+ List<String> values = new ArrayList<String>();
+ for (Object tmp : coll) {
+ if (tmp instanceof String) {
+ values.add((String) tmp);
+ } else {
+ Assert.isTrue(tmp instanceof Enumerator);
+ values.add(((Enumerator) tmp).getName());
+ }
+ }
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringListValueStyle_StringListValue(), values));
+ } else {
+ if (keyStyle != null && !(keyStyle instanceof StringValueStyle)) {
+ // we need to destroy the previous keystyle
+ Command cmd = getDestroyFilterValueToMatchCommand(domain, configRegistry, axis);
+ if (cmd != null && cmd.canExecute()) {
+ cc.append(cmd);
+ }
+ }
+ if (keyStyle == null) {
+ keyStyle = NattablestyleFactory.eINSTANCE.createEObjectValueStyle();
+ keyStyle.setName(FILTER_VALUE_TO_MATCH);
+ cc.append(AddCommand.create(domain, iaxis, NattablestylePackage.eINSTANCE.getNamedStyle(), keyStyle));
+ }
+ if (newValue instanceof String) {
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringValueStyle_StringValue(), newValue));
+ } else {
+ Assert.isTrue(newValue instanceof Enumerator);
+ // we store the name of the literal and a reference to the literal, for 2 reasons :
+ // - for static profile we get enumerator and not EEnumLiteral
+ // - in case of redefinition of the profile, the reference would be not correct
+ cc.append(SetCommand.create(domain, keyStyle, NattablestylePackage.eINSTANCE.getStringValueStyle_StringValue(), ((Enumerator) newValue).getName()));
+ }
+ }
+ return cc;
+ }
+
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationMatcherEditor.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationMatcherEditor.java
new file mode 100755
index 00000000000..42f2c3e9e0a
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationMatcherEditor.java
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor;
+import org.eclipse.papyrus.infra.nattable.filter.AbstractSinglePapyrusMatcher;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+
+import ca.odell.glazedlists.matchers.Matcher;
+
+/**
+ * Matcher Editor for UML Enumeration
+ *
+ */
+public class UMLEnumerationMatcherEditor extends AbstractPapyrusMatcherEditor {
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ */
+ public UMLEnumerationMatcherEditor(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ super(columnAccesor, columnIndex, matchOn, configRegistry);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.AbstractPapyrusMatcherEditor#createMatcher(org.eclipse.nebula.widgets.nattable.data.IColumnAccessor, int, java.lang.Object, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+ *
+ * @param columnAccesor
+ * @param columnIndex
+ * @param matchOn
+ * @param configRegistry
+ * @return
+ */
+ @Override
+ protected Matcher<Object> createMatcher(IColumnAccessor<Object> columnAccesor, int columnIndex, Object matchOn, IConfigRegistry configRegistry) {
+ return new UMLEnumerationMatcher(columnAccesor, matchOn, columnIndex, configRegistry);
+ }
+
+ /**
+ * This Matcher allows to know is an object is displayed in a cell
+ *
+ */
+ public static class UMLEnumerationMatcher extends AbstractSinglePapyrusMatcher<Object> {
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ * @param configRegistry
+ */
+ public UMLEnumerationMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex, IConfigRegistry configRegistry) {
+ super(accessor, columnIndex, wantedObject, configRegistry);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param accessor
+ * @param wantedObject
+ * @param columnIndex
+ */
+ public UMLEnumerationMatcher(IColumnAccessor<Object> accessor, Object wantedObject, int columnIndex) {
+ super(accessor, columnIndex, wantedObject);
+ }
+
+ /**
+ * @see ca.odell.glazedlists.matchers.Matcher#matches(java.lang.Object)
+ *
+ * @param item
+ * @return
+ */
+ @Override
+ public boolean matches(Object item) {
+ Object res = getColumnAccessor().getDataValue(item, getColumnIndex());
+ if (res != null) {
+ Object wantedObject = getObjectToMatch();
+ if (res instanceof Collection<?>) {
+ String wantedName=null;
+ if(wantedObject instanceof Enumerator){
+ wantedName = ((Enumerator) wantedObject).getName();
+ }else if(wantedObject instanceof String){
+ wantedName = (String)wantedObject;
+ }
+ Assert.isNotNull(wantedName);
+ for (Object tmp : (Collection<?>) res) {
+ if (tmp instanceof EnumerationLiteral) {
+ EnumerationLiteral lit = (EnumerationLiteral) tmp;
+ if (lit.getName().equals(wantedName)) {
+ return true;
+ }
+ }else if(tmp instanceof String){
+ if(wantedName.equals(tmp)){
+ return true;
+ }
+ }
+ }
+ return ((Collection<?>) res).contains(wantedObject);
+ } else if (res instanceof EnumerationLiteral && wantedObject instanceof Enumerator) {
+ return ((EnumerationLiteral) res).getName().equals(((Enumerator) wantedObject).getName());
+ }else if(res instanceof EnumerationLiteral && wantedObject instanceof String){
+ return wantedObject.equals(((EnumerationLiteral) res).getName());
+ }else if(res instanceof String && wantedObject instanceof String){
+ return wantedObject.equals(res);
+ }
+ }
+ return false;
+ }
+
+ }
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java
new file mode 100644
index 00000000000..558f473cffb
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java
@@ -0,0 +1,85 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * @author VL222926
+ *
+ */
+public class UMLIntegerEditorFilterConfiguration extends AbstractIntegerEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.integer.text";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ return PrimitivesTypesUtils.UML_INTEGER.equals(type.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLRealEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLRealEditorFilterConfiguration.java
new file mode 100644
index 00000000000..54bc829ab5c
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLRealEditorFilterConfiguration.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractDoubleEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * @author VL222926
+ *
+ */
+public class UMLRealEditorFilterConfiguration extends AbstractDoubleEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.real.text";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ return PrimitivesTypesUtils.UML_REAL.equals(type.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractNumericEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ }
+
+ /**
+ * @return the id
+ */
+ public static String getId() {
+ return ID;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLUnlimitedNaturalEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLUnlimitedNaturalEditorFilterConfiguration.java
new file mode 100644
index 00000000000..e4489ef5552
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLUnlimitedNaturalEditorFilterConfiguration.java
@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import static org.eclipse.nebula.widgets.nattable.style.DisplayMode.NORMAL;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.filterrow.TextMatchingMode;
+import org.eclipse.nebula.widgets.nattable.filterrow.config.FilterRowConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractNaturalEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.filter.validator.NaturalFilterDataValidator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * Filter configuration for unlimited natural
+ *
+ */
+public class UMLUnlimitedNaturalEditorFilterConfiguration extends AbstractNaturalEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.unlimited.natural.text";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ return PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(type.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractNumericEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getDataValidator(IConfigRegistry)
+ *
+ * @return
+ */
+ @Override
+ protected IDataValidator getDataValidator(IConfigRegistry configRegistry) {
+ return new NaturalFilterDataValidator(configRegistry.getConfigAttribute(FilterRowConfigAttributes.TEXT_DELIMITER, NORMAL), TextMatchingMode.REGULAR_EXPRESSION);
+ }
+
+ /**
+ * @return the id
+ */
+ public static String getId() {
+ return ID;
+ };
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/AbstractCreateStereotypePropertyMenuFactory.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/AbstractCreateStereotypePropertyMenuFactory.java
index 302d1a97403..c6fe67e2abb 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/AbstractCreateStereotypePropertyMenuFactory.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/AbstractCreateStereotypePropertyMenuFactory.java
@@ -107,7 +107,7 @@ public abstract class AbstractCreateStereotypePropertyMenuFactory extends Extens
if (current instanceof FeatureIdAxis) {
String el = ((FeatureIdAxis) current).getElement();
if (el.startsWith(Constants.PROPERTY_OF_STEREOTYPE_PREFIX)) {
- initialSelection.add(((FeatureIdAxis) current).getElement().replace(Constants.PROPERTY_OF_STEREOTYPE_PREFIX, ""));
+ initialSelection.add(((FeatureIdAxis) current).getElement().replace(Constants.PROPERTY_OF_STEREOTYPE_PREFIX, "")); //$NON-NLS-1$
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
index 33d92366138..57f2d094247 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
@@ -91,27 +91,29 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
alias = ((FeatureAxis) value).getAlias();
}
- ILabelProviderConfiguration conf =getLabelConfiguration(wrapper);
-
+ ILabelProviderConfiguration conf = getLabelConfiguration(wrapper);
+
String returnedValue = null;
if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
returnedValue = ""; //$NON-NLS-1$
} else {
String id = AxisUtils.getPropertyId(value);
final Property prop = UMLTableUtils.getRealStereotypeProperty(tableContext, id);
+ if (prop == null) {
+ id = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$
+ returnedValue = id + " " + REQUIRED_PROFILE_NOT_AVALAIBLE; //$NON-NLS-1$
+ return returnedValue;
+ }
if (alias != null && !alias.isEmpty()) {
returnedValue = alias;
} else {
- returnedValue = prop.getName();//getLabelProviderService(configRegistry).getLabelProvider(prop).getText(prop);
+ returnedValue = prop.getName();// getLabelProviderService(configRegistry).getLabelProvider(prop).getText(prop);
}
- if (conf != null && prop != null) {
+ if (conf != null) {
if (alias != null && !alias.equals("")) { //$NON-NLS-1$
returnedValue = alias;
}
returnedValue = getText((FeatureLabelProviderConfiguration) conf, configRegistry, returnedValue, prop.getType(), prop.isDerived(), prop.getLower(), prop.getUpper());
- } else if (prop == null) {
- id = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$
- returnedValue = id + " " + REQUIRED_PROFILE_NOT_AVALAIBLE; //$NON-NLS-1$
}
}
return returnedValue;
@@ -132,6 +134,7 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
}
return conf;
};
+
/**
*
* @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/TreeFillingStereotypePropertyLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/TreeFillingStereotypePropertyLabelProvider.java
index 16458550bfb..7ad6202cbab 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/TreeFillingStereotypePropertyLabelProvider.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/TreeFillingStereotypePropertyLabelProvider.java
@@ -42,7 +42,7 @@ public class TreeFillingStereotypePropertyLabelProvider extends StereotypeProper
ITreeItemAxis curr = (ITreeItemAxis) object;
Object el = curr.getElement();
if (el instanceof TreeFillingConfiguration) {
- final IAxis axis =((TreeFillingConfiguration) el).getAxisUsedAsAxisProvider();
+ final IAxis axis = ((TreeFillingConfiguration) el).getAxisUsedAsAxisProvider();
String id = AxisUtils.getPropertyId(axis);
return (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX));
}
@@ -50,7 +50,7 @@ public class TreeFillingStereotypePropertyLabelProvider extends StereotypeProper
}
return false;
}
-
+
/**
* @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getLabelConfiguration(org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper)
*
@@ -61,13 +61,13 @@ public class TreeFillingStereotypePropertyLabelProvider extends StereotypeProper
protected ILabelProviderConfiguration getLabelConfiguration(LabelProviderCellContextElementWrapper element) {
if (element instanceof ILabelProviderContextElementWrapper) {
final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
- if (object instanceof IAxis && ((IAxis)object).getElement() instanceof TreeFillingConfiguration) {
- return ((TreeFillingConfiguration) ((IAxis)object).getElement()).getLabelProvider();
+ if (object instanceof IAxis && ((IAxis) object).getElement() instanceof TreeFillingConfiguration) {
+ return ((TreeFillingConfiguration) ((IAxis) object).getElement()).getLabelProvider();
}
}
return null;
}
-
+
/**
*
* @param wrapper
@@ -77,8 +77,8 @@ public class TreeFillingStereotypePropertyLabelProvider extends StereotypeProper
@Override
protected Object getWrappedValue(final ILabelProviderContextElementWrapper wrapper) {
Object value = wrapper.getObject();
- if (value instanceof IAxis && ((IAxis)value).getElement() instanceof TreeFillingConfiguration) {
- return ((TreeFillingConfiguration) ((IAxis)value).getElement()).getAxisUsedAsAxisProvider();
+ if (value instanceof IAxis && ((IAxis) value).getElement() instanceof TreeFillingConfiguration) {
+ return ((TreeFillingConfiguration) ((IAxis) value).getElement()).getAxisUsedAsAxisProvider();
}
return super.getWrappedValue(wrapper);
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
index 4d0b23ac737..44338be8410 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.infra.widgets.providers.AbstractRestrictedContentProvider;
@@ -147,20 +146,20 @@ public class UMLFeatureRestrictedContentProvider extends AbstractRestrictedConte
}
for (Object object : elementsList) {
Object representedElement = AxisUtils.getRepresentedElement(object);
- if(representedElement instanceof Element){
+ if (representedElement instanceof Element) {
EClass eClass = ((EObject) representedElement).eClass();
eClassifiers.add(eClass);
eClassifiers.addAll(eClass.getEAllSuperTypes());
}
-// if (object instanceof EObject) {
-// EObject eObject = (EObject) object;
-// if (eObject instanceof EObjectAxis) {
-// eObject = ((EObjectAxis) eObject).getElement();
-// }
-// EClass eClass = eObject.eClass();
-// eClassifiers.add(eClass);
-// eClassifiers.addAll(eClass.getEAllSuperTypes());
-// }
+ // if (object instanceof EObject) {
+ // EObject eObject = (EObject) object;
+ // if (eObject instanceof EObjectAxis) {
+ // eObject = ((EObjectAxis) eObject).getElement();
+ // }
+ // EClass eClass = eObject.eClass();
+ // eClassifiers.add(eClass);
+ // eClassifiers.addAll(eClass.getEAllSuperTypes());
+ // }
}
} else {
eClassifiers = ePackage.getEClassifiers();
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
index 4fcd1d3d78b..baccd066f73 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
@@ -36,9 +36,9 @@ public class IsUMLElementTester implements ITableTester {
@Override
public IStatus isAllowed(Object context) {
if (context instanceof Element) {
- return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context is a UML Element");
+ return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context is a UML Element"); //$NON-NLS-1$
}
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The context is not an UML Element");
+ return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The context is not an UML Element"); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
index 0e143861df8..addef6c573d 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
@@ -32,7 +32,7 @@ public class Constants {
/**
* the prefix used to identify this post action
*/
- public static final String POST_ACTION_APPLY_STEREOTYPE_PREFIX = "applyStereotype:/";
+ public static final String POST_ACTION_APPLY_STEREOTYPE_PREFIX = "applyStereotype:/"; //$NON-NLS-1$
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
index ec37ba7fa39..90800f68bdb 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
@@ -14,16 +14,24 @@
package org.eclipse.papyrus.uml.nattable.utils;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.infra.nattable.utils.Constants;
import org.eclipse.papyrus.uml.nattable.paste.StereotypeApplicationStructure;
import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Profile;
import org.eclipse.uml2.uml.Property;
@@ -43,6 +51,32 @@ public class UMLTableUtils {
}
/**
+ *
+ * @param aString
+ * a string
+ * @return
+ * <code>true</code> if the string start with {@link #PROPERTY_OF_STEREOTYPE_PREFIX}
+ */
+ public static final boolean isStringRepresentingStereotypeProperty(String aString) {
+ return aString.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);
+ }
+
+ /**
+ *
+ * @param anAxis
+ * an object axis
+ * @return
+ * <code>true</code> if the axis represents a property of stereotype (so a string starting with {@link #PROPERTY_OF_STEREOTYPE_PREFIX}
+ */
+ public static final boolean isStringRepresentingStereotypeProperty(Object anAxis) {
+ anAxis = AxisUtils.getRepresentedElement(anAxis);
+ if (anAxis instanceof String) {
+ return isStringRepresentingStereotypeProperty((String) anAxis);
+ }
+ return false;
+ }
+
+ /**
*
* @param eobject
* an element of the model (currently, if it is not an UML::Element, we can't find the property)
@@ -56,12 +90,14 @@ public class UMLTableUtils {
Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
if (eobject instanceof Element) {
final Element element = (Element) eobject;
+ final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$
+ final String propertyName = NamedElementUtil.getNameFromQualifiedName(propertyQN);
+ final String stereotypeQN = NamedElementUtil.getParentQualifiedName(propertyQN);
+ final String stereotypeName = NamedElementUtil.getNameFromQualifiedName(stereotypeQN);
+ final String profileQN = NamedElementUtil.getParentQualifiedName(stereotypeQN);
+
+ // 1. we check if the profile is applied on the nearest package
if (element.getNearestPackage() != null) {
- final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$
- final String propertyName = NamedElementUtil.getNameFromQualifiedName(propertyQN);
- final String stereotypeQN = NamedElementUtil.getParentQualifiedName(propertyQN);
- final String stereotypeName = NamedElementUtil.getNameFromQualifiedName(stereotypeQN);
- final String profileQN = NamedElementUtil.getParentQualifiedName(stereotypeQN);
final Profile profile = element.getNearestPackage().getAppliedProfile(profileQN, true);
if (profile != null) {
final Stereotype ste = profile.getOwnedStereotype(stereotypeName);
@@ -69,6 +105,43 @@ public class UMLTableUtils {
}
}
+ // 2. if not, the profile could be applied on a sub-package of the nearest package
+ /* the table can show element which are not children of its context, so the profile could not be available in its context */
+ return getProperty(element.getNearestPackage().getNestedPackages(), propertyQN);
+ }
+ return null;
+ }
+
+ /**
+ *
+ * @param packages
+ * a list of package
+ * @param propertyQN
+ * the qualified name of the wanted property
+ * @return
+ * the property or <code>null</code> if not found
+ */
+ protected static Property getProperty(Collection<Package> packages, String propertyQN) {
+ final String propertyName = NamedElementUtil.getNameFromQualifiedName(propertyQN);
+ final String stereotypeQN = NamedElementUtil.getParentQualifiedName(propertyQN);
+ final String stereotypeName = NamedElementUtil.getNameFromQualifiedName(stereotypeQN);
+ final String profileQN = NamedElementUtil.getParentQualifiedName(stereotypeQN);
+ for (Package package1 : packages) {
+ for (Profile prof : package1.getAppliedProfiles()) {
+ if (prof.getQualifiedName().equals(profileQN)) {
+ NamedElement ste = prof.getMember(stereotypeName);
+ if (ste instanceof Stereotype) {
+ NamedElement prop = ((Stereotype) ste).getMember(propertyName);
+ if (prop instanceof Property && prop.getQualifiedName().equals(propertyQN)) {
+ return (Property) prop;
+ }
+ }
+ }
+ Property p = getProperty(package1.getNestedPackages(), propertyQN);
+ if (p != null) {
+ return p;
+ }
+ }
}
return null;
}
@@ -79,6 +152,41 @@ public class UMLTableUtils {
* an element of the model (currently, if it is not an UML::Element, we can't find the property)
* @param id
* the id used to identify the property of the stereotype
+ * @return
+ * a list of enumerator which contains the available literal
+ */
+ public static final List<Enumerator> getLiteralsToTypeProperty(final EObject modelElement, final String id) {
+ Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
+ if (modelElement instanceof Element) {
+ final Property property = UMLTableUtils.getRealStereotypeProperty(modelElement, id);
+ final Stereotype current = (Stereotype) property.getOwner();
+
+ EClass stereotypeDef = (EClass) current.getProfile().getDefinition(current);
+ EStructuralFeature feature = stereotypeDef.getEStructuralFeature(property.getName());
+ EEnum eenum = null;
+ if (feature != null && feature.getEType() instanceof EEnum) {
+ eenum = (EEnum) feature.getEType();
+ }
+
+ if (eenum != null) {
+ final List<Enumerator> literals = new ArrayList<Enumerator>();
+ for (EEnumLiteral literal : eenum.getELiterals()) {
+ Enumerator value = literal.getInstance();
+ literals.add(value);
+ }
+ return literals;
+ }
+ }
+ return Collections.emptyList();
+
+ }
+
+ /**
+ *
+ * @param eobject
+ * an element of the model (currently, if it is not an UML::Element, we can't find the property)
+ * @param id
+ * the id used to identify the property of the stereotype
* @param sharedMap
* a map owning interesting information, like {@link StereotypeApplicationStructure} which can be used to find stereotype, stereotype
* application and so on
@@ -86,7 +194,7 @@ public class UMLTableUtils {
* the UML::Property or <code>null</code> if we can't resolve it (the required profile is not applied)
*/
public static Property getRealStereotypeProperty(final EObject eobject, final String id, final Map<?, ?> sharedMap) {
- assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);
+ Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
if (eobject instanceof Element) {
final Element element = (Element) eobject;
final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$
@@ -125,7 +233,7 @@ public class UMLTableUtils {
* we can't resolve it (the required profile is not applied)
*/
public static final List<Stereotype> getAppliedStereotypesWithThisProperty(final Element element, final String id) {
- assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);
+ Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
final List<Stereotype> stereotypes = new ArrayList<Stereotype>();
if (element.eResource() != null) {
final Object prop = getRealStereotypeProperty(element, id);
@@ -152,7 +260,7 @@ public class UMLTableUtils {
* we can't resolve it (the required profile is not applied)
*/
public static final List<Stereotype> getApplicableStereotypesWithThisProperty(final Element element, final String id) {
- assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);
+ Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
final List<Stereotype> stereotypes = new ArrayList<Stereotype>();
if (element.eResource() != null) {
final Object prop = getRealStereotypeProperty(element, id);
@@ -181,7 +289,7 @@ public class UMLTableUtils {
* we can't resolve it (the required profile is not applied)
*/
public static final List<Stereotype> getAppliedStereotypesWithThisProperty(final Element element, final String id, Map<?, ?> sharedMap) {
- assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);
+ Assert.isTrue(id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX));
final List<Stereotype> stereotypes = new ArrayList<Stereotype>();
if (sharedMap != null) {
final List<StereotypeApplicationStructure> struct = findStereotypeApplicationDataStructure(element, id, sharedMap);
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
index b779a11d131..ad84786550c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
@@ -540,7 +540,7 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
// @Override
// public void run() {
// TODO Auto-generated method stub
- ((NattableModelManager) manager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+ ((ITreeNattableModelManager) manager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
// }
flushDisplayEvents();
@@ -713,7 +713,7 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
@Override
public void run() {
// TODO Auto-generated method stub
- ((NattableModelManager) manager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+ ((ITreeNattableModelManager) manager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
}
});
while (tmp) {
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
index 08e0c266f25..8cc78aa00a9 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,13 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.emf.common,
org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0"
Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
index d0a17ebd1ca..c672072f1a8 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
@@ -3,6 +3,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
about.html,\
- resources/,\
- plugin.properties
+ plugin.properties,\
+ resources/
src.includes = about.html
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.notation
new file mode 100755
index 00000000000..7a9a7d4c433
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.notation
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_6HKuIKYDEeSEj5euN5QFZw" name="GenericTable0" currentRowAxisProvider="_6HKuIqYDEeSEj5euN5QFZw" currentColumnAxisProvider="_6HKuIaYDEeSEj5euN5QFZw">
+ <context xmi:type="uml:Model" href="Bug458492_Edition_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>
+ <owner xmi:type="uml:Model" href="Bug458492_Edition_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_6HKuIaYDEeSEj5euN5QFZw" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_98WP8KYDEeSEj5euN5QFZw" element="property_of_stereotype:/profile::Task::color">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_98WP8aYDEeSEj5euN5QFZw" element="property_of_stereotype:/profile::Task::p">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_GsQeMKY3EeSNjoKaw0eOqQ" element="property_of_stereotype:/SysML::PortAndFlows::FlowPort::direction">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_6HKuIqYDEeSEj5euN5QFZw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_-aaE8KYDEeSEj5euN5QFZw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="Bug458492_Edition_Enumeration.uml#_ZofKMIFBEeSi2cK0RxwHRg"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_HhNJMKY3EeSNjoKaw0eOqQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Port" href="Bug458492_Edition_Enumeration.uml#_EwpGEKY3EeSNjoKaw0eOqQ"/>
+ </axis>
+ </rowAxisProvidersHistory>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.uml
new file mode 100755
index 00000000000..43344ad3aa8
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/Bug458492_Edition_Enumeration.uml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:PortAndFlows="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:profile="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0 model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA">
+ <uml:Model xmi:id="_OHyHIIFBEeSi2cK0RxwHRg" name="Model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ZofKMIFBEeSi2cK0RxwHRg" name="Class1" visibility="protected"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_CG3ncKY3EeSNjoKaw0eOqQ" name="Block1">
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_EwpGEKY3EeSNjoKaw0eOqQ" name="flowport1" aggregation="composite"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Uhs2kIFBEeSi2cK0RxwHRg">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WiO2kIHTEeSQAc7KMA100g" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2kYHTEeSQAc7KMA100g" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2koHTEeSQAc7KMA100g" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2k4HTEeSQAc7KMA100g" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lIHTEeSQAc7KMA100g" key="Date" value="2014-12-12"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lYHTEeSQAc7KMA100g" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiMl0IFBEeSi2cK0RxwHRg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0YFBEeSi2cK0RxwHRg" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0oFBEeSi2cK0RxwHRg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl04FBEeSi2cK0RxwHRg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1IFBEeSi2cK0RxwHRg" key="Date" value="2014-12-11"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1YFBEeSi2cK0RxwHRg" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiLXsIFBEeSi2cK0RxwHRg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzLK8KY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzLyAKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzNnMKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzOOQKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//modelelements"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzO1UKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzPcYKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzQDcKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzQqgKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzRRkKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzR4oKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzTGwKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzTt0KY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//activities"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzUU4KY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzU78KY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzWKEKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzWxIKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzXYMKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzX_QKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//interactions"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzZNYKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzZ0cKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//statemachines"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_AzbCkKY3EeSNjoKaw0eOqQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzbpoKY3EeSNjoKaw0eOqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//usecases"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ </uml:Model>
+ <profile:Task xmi:id="_jGGE8IQyEeSqaqLwsIy0SA" base_Class="_ZofKMIFBEeSi2cK0RxwHRg" p="medium" color="red"/>
+ <Blocks:Block xmi:id="_CG6DsKY3EeSNjoKaw0eOqQ" base_Class="_CG3ncKY3EeSNjoKaw0eOqQ"/>
+ <PortAndFlows:FlowPort xmi:id="_EwtXgKY3EeSNjoKaw0eOqQ" base_Port="_EwpGEKY3EeSNjoKaw0eOqQ" direction="in"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.notation
new file mode 100755
index 00000000000..c00ad3d8642
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.notation
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AjOooIHTEeSQAc7KMA100g" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_B7h4UIHTEeSQAc7KMA100g" type="2006">
+ <children xmi:type="notation:DecorationNode" xmi:id="_B7p0IIHTEeSQAc7KMA100g" type="5023"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_B7p0IYHTEeSQAc7KMA100g" type="7015">
+ <children xmi:type="notation:Shape" xmi:id="_F7_dEIHTEeSQAc7KMA100g" type="3017">
+ <element xmi:type="uml:EnumerationLiteral" href="library.uml#_F73hQIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_F7_dEYHTEeSQAc7KMA100g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Gu_AQIHTEeSQAc7KMA100g" type="3017">
+ <element xmi:type="uml:EnumerationLiteral" href="library.uml#_Gu9yIIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Gu_AQYHTEeSQAc7KMA100g"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HVC6sIHTEeSQAc7KMA100g" type="3017">
+ <element xmi:type="uml:EnumerationLiteral" href="library.uml#_HVBskIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_HVC6sYHTEeSQAc7KMA100g"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_B7p0IoHTEeSQAc7KMA100g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_B7p0I4HTEeSQAc7KMA100g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_B7p0JIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7p0JYHTEeSQAc7KMA100g"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7h4UYHTEeSQAc7KMA100g" x="194" y="38" width="480" height="299"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_AjOooYHTEeSQAc7KMA100g" name="diagram_compatibility_version" stringValue="1.0.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_AjOoooHTEeSQAc7KMA100g"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AjOoo4HTEeSQAc7KMA100g">
+ <owner xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+ </styles>
+ <element xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.uml
new file mode 100755
index 00000000000..e2de8b7165d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/library.uml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AipZ0IHTEeSQAc7KMA100g" name="model">
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_B49sgIHTEeSQAc7KMA100g" name="Color">
+ <ownedLiteral xmi:id="_F73hQIHTEeSQAc7KMA100g" name="black"/>
+ <ownedLiteral xmi:id="_Gu9yIIHTEeSQAc7KMA100g" name="red"/>
+ <ownedLiteral xmi:id="_HVBskIHTEeSQAc7KMA100g" name="blue"/>
+ </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.notation
new file mode 100755
index 00000000000..b461db8188b
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.notation
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yC-YkIFAEeSi2cK0RxwHRg" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_2buhgIFAEeSi2cK0RxwHRg" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2cMbkIFAEeSi2cK0RxwHRg" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoIFAEeSi2cK0RxwHRg" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoYFAEeSi2cK0RxwHRg" key="StereotypeList" value="StandardProfile::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCooFAEeSi2cK0RxwHRg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsIFAEeSi2cK0RxwHRg" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsYFAEeSi2cK0RxwHRg" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_2cCqkIFAEeSi2cK0RxwHRg" type="1084"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2cDRoIFAEeSi2cK0RxwHRg" x="595" y="333"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3AxIQIFAEeSi2cK0RxwHRg" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_3AxvUIFAEeSi2cK0RxwHRg" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_3A1ZsIFAEeSi2cK0RxwHRg" type="1071">
+ <children xmi:type="notation:Node" xmi:id="_GsO7kIFBEeSi2cK0RxwHRg" type="3002">
+ <element xmi:type="uml:Property" href="model.profile.uml#_GrzdwIFBEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GsO7kYFBEeSi2cK0RxwHRg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_SNfq8IHTEeSQAc7KMA100g" type="3002">
+ <element xmi:type="uml:Property" href="model.profile.uml#_SNKTwIHTEeSQAc7KMA100g"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_SNfq8YHTEeSQAc7KMA100g"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3A1ZsYFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_3A1ZsoFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_3A1Zs4FAEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A1ZtIFAEeSi2cK0RxwHRg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_3A2n0IFAEeSi2cK0RxwHRg" type="1019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3A2n0YFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_3A2n0oFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_3A2n04FAEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A2n1IFAEeSi2cK0RxwHRg"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="model.profile.uml#_2_8B0IFAEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3AxIQYFAEeSi2cK0RxwHRg" x="341" y="568"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_6uYCcIFAEeSi2cK0RxwHRg" type="2006">
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uYpgIFAEeSi2cK0RxwHRg" type="5023"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6uYpgYFAEeSi2cK0RxwHRg" type="1063">
+ <children xmi:type="notation:Node" xmi:id="_CuTtcIFBEeSi2cK0RxwHRg" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_CuQqIIFBEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CuTtcYFBEeSi2cK0RxwHRg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_DsDIEIFBEeSi2cK0RxwHRg" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_DsBS4IFBEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_DsDIEYFBEeSi2cK0RxwHRg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_EZVr4IFBEeSi2cK0RxwHRg" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_EZT2sIFBEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_EZVr4YFBEeSi2cK0RxwHRg"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6uYpgoFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6uYpg4FAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6uYphIFAEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYphYFAEeSi2cK0RxwHRg"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="model.profile.uml#_6rwMQIFAEeSi2cK0RxwHRg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYCcYFAEeSi2cK0RxwHRg" x="903" y="428" width="346" height="240"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_yC-YkYFAEeSi2cK0RxwHRg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_yC-YkoFAEeSi2cK0RxwHRg"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_yC-Yk4FAEeSi2cK0RxwHRg">
+ <owner xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+ </styles>
+ <element xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+ <edges xmi:type="notation:Connector" xmi:id="_3qurQIFAEeSi2cK0RxwHRg" type="1013" source="_3AxIQIFAEeSi2cK0RxwHRg" target="_2buhgIFAEeSi2cK0RxwHRg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3qurQYFAEeSi2cK0RxwHRg"/>
+ <element xmi:type="uml:Extension" href="model.profile.uml#_3qgBwIFAEeSi2cK0RxwHRg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3qurQoFAEeSi2cK0RxwHRg" points="[17, -14, -253, 213]$[277, -202, 7, 25]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ranwIFAEeSi2cK0RxwHRg" id="(0.4016393442622951,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RHVZUIQyEeSqaqLwsIy0SA" id="(0.16,1.0)"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.uml
new file mode 100755
index 00000000000..17ef675ac27
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/UMLEnumerationEdition/model.profile.uml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_x_EI8IFAEeSi2cK0RxwHRg" name="profile" metaclassReference="_2ba_gIFAEeSi2cK0RxwHRg">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLAYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_dymLAoQyEeSqaqLwsIy0SA" name="profile" nsURI="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLA4QyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/4.0.0/UML">
+ <references xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLF4QyEeSqaqLwsIy0SA" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGIQyEeSqaqLwsIy0SA" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGYQyEeSqaqLwsIy0SA" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGoQyEeSqaqLwsIy0SA" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLG4QyEeSqaqLwsIy0SA" key="Date" value="2014-12-15"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLHIQyEeSqaqLwsIy0SA" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_dymLBIQyEeSqaqLwsIy0SA" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLBYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2_8B0IFAEeSi2cK0RxwHRg"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dymLBoQyEeSqaqLwsIy0SA" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCIQyEeSqaqLwsIy0SA" name="p" ordered="false" lowerBound="1" eType="_dymLDIQyEeSqaqLwsIy0SA"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCoQyEeSqaqLwsIy0SA" name="color" ordered="false" lowerBound="1" eType="_dymLEYQyEeSqaqLwsIy0SA"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLDIQyEeSqaqLwsIy0SA" name="Priority">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLDYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_6rwMQIFAEeSi2cK0RxwHRg"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLDoQyEeSqaqLwsIy0SA" name="hight"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLD4QyEeSqaqLwsIy0SA" name="medium" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLEIQyEeSqaqLwsIy0SA" name="low" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLEYQyEeSqaqLwsIy0SA" name="model_Color">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLEoQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+ </eAnnotations>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLE4QyEeSqaqLwsIy0SA" name="black"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFIQyEeSqaqLwsIy0SA" name="red" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFYQyEeSqaqLwsIy0SA" name="blue" value="2"/>
+ </eClassifiers>
+ </contents>
+ </eAnnotations>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_2ba_gIFAEeSi2cK0RxwHRg" alias="Class">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </elementImport>
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_PfWpsIHTEeSQAc7KMA100g">
+ <importedPackage xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_2_8B0IFAEeSi2cK0RxwHRg" name="Task">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3qfasIFAEeSi2cK0RxwHRg" name="base_Class" association="_3qgBwIFAEeSi2cK0RxwHRg">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_GrzdwIFBEeSi2cK0RxwHRg" name="p" type="_6rwMQIFAEeSi2cK0RxwHRg"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_SNKTwIHTEeSQAc7KMA100g" name="color">
+ <type xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_3qgBwIFAEeSi2cK0RxwHRg" name="E_Task_Class1" memberEnd="_3qgBwYFAEeSi2cK0RxwHRg _3qfasIFAEeSi2cK0RxwHRg">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3qgBwYFAEeSi2cK0RxwHRg" name="extension_Task" type="_2_8B0IFAEeSi2cK0RxwHRg" aggregation="composite" association="_3qgBwIFAEeSi2cK0RxwHRg"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_6rwMQIFAEeSi2cK0RxwHRg" name="Priority">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CuQqIIFBEeSi2cK0RxwHRg" name="hight"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DsBS4IFBEeSi2cK0RxwHRg" name="medium"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EZT2sIFBEeSi2cK0RxwHRg" name="low"/>
+ </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.notation
new file mode 100755
index 00000000000..46410c4ea60
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.notation
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_tehaEKt-EeSbj-YWe2va_Q" name="GenericTable0" currentRowAxisProvider="_tehaEqt-EeSbj-YWe2va_Q" currentColumnAxisProvider="_tehaEat-EeSbj-YWe2va_Q">
+ <context xmi:type="uml:Model" href="FilterEEnumMatcherTest.uml#_nr57MKt-EeSbj-YWe2va_Q"/>
+ <owner xmi:type="uml:Model" href="FilterEEnumMatcherTest.uml#_nr57MKt-EeSbj-YWe2va_Q"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_tehaEat-EeSbj-YWe2va_Q" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_wUp5sKt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_tehaEqt-EeSbj-YWe2va_Q" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_xECIMKt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Comment" href="FilterEEnumMatcherTest.uml#_rnSLoKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_xECIMat-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterEEnumMatcherTest.uml#_oh4g8Kt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_xECIMqt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterEEnumMatcherTest.uml#_peRQsKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_xECIM6t-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterEEnumMatcherTest.uml#_qUvlsKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_xECINKt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterEEnumMatcherTest.uml#_qystAKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ </rowAxisProvidersHistory>
+ <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_ybzzcKt-EeSbj-YWe2va_Q" displayFilter="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.uml
new file mode 100755
index 00000000000..ca4fe43b638
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterEEnumMatcherTest.uml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_nr57MKt-EeSbj-YWe2va_Q" name="model">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_rnSLoKt-EeSbj-YWe2va_Q"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_oh4g8Kt-EeSbj-YWe2va_Q" name="public"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_peRQsKt-EeSbj-YWe2va_Q" name="private" visibility="private"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_qUvlsKt-EeSbj-YWe2va_Q" name="protected" visibility="protected"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_qystAKt-EeSbj-YWe2va_Q" name="package" visibility="package"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.notation
new file mode 100755
index 00000000000..dab3c326317
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.notation
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_-3Uj0Kt8EeSbj-YWe2va_Q" name="GenericTable0" currentRowAxisProvider="_-3Uj0qt8EeSbj-YWe2va_Q" currentColumnAxisProvider="_-3Uj0at8EeSbj-YWe2va_Q">
+ <context xmi:type="uml:Model" href="FilterNumericMatcherTest.uml#_To4jsKt8EeSbj-YWe2va_Q"/>
+ <owner xmi:type="uml:Model" href="FilterNumericMatcherTest.uml#_To4jsKt8EeSbj-YWe2va_Q"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_-3Uj0at8EeSbj-YWe2va_Q" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_KGi1UKt9EeSbj-YWe2va_Q" element="property_of_stereotype:/profile::Task::priority">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_-3Uj0qt8EeSbj-YWe2va_Q" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_OdeZUKt9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_Lt3_gKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_OdeZUat9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_MVCtMKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_OdeZUqt9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_NBp7kKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_OdeZU6t9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_NpR8QKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_Tvd3YKt9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_Q9DaIKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_TveecKt9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_RuxK8Kt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_Tveecat9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_SZSHkKt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_Tveecqt9EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_TIpH8Kt9EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_QkReMKuzEeSzg_yLPVs_aw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterNumericMatcherTest.uml#_QHy9kKuzEeSzg_yLPVs_aw"/>
+ </axis>
+ </rowAxisProvidersHistory>
+ <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_cJRa8Kt9EeSbj-YWe2va_Q" displayFilter="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.uml
new file mode 100755
index 00000000000..6ae022c7c58
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTest.uml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:profile="http:///schemas/profile/_Fxh84Kt9EeSbj-YWe2va_Q/3" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/profile/_Fxh84Kt9EeSbj-YWe2va_Q/3 FilterNumericMatcherTestProfile.profile.uml#_Fxh84at9EeSbj-YWe2va_Q">
+ <uml:Model xmi:id="_To4jsKt8EeSbj-YWe2va_Q" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_Lt3_gKt9EeSbj-YWe2va_Q" name="Class1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_MVCtMKt9EeSbj-YWe2va_Q" name="Class2"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_NBp7kKt9EeSbj-YWe2va_Q" name="Class3"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_NpR8QKt9EeSbj-YWe2va_Q" name="Class4"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_Q9DaIKt9EeSbj-YWe2va_Q" name="Class5"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_RuxK8Kt9EeSbj-YWe2va_Q" name="Class6"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_SZSHkKt9EeSbj-YWe2va_Q" name="Class7"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_TIpH8Kt9EeSbj-YWe2va_Q" name="Class8"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_QHy9kKuzEeSzg_yLPVs_aw" name="Class9"/>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_IbQ_QKt9EeSbj-YWe2va_Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IbwHcKt9EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IbwHcat9EeSbj-YWe2va_Q" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IbwHcqt9EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IbwHc6t9EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IbwHdKt9EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IbwugKt9EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IbvgYKt9EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FilterNumericMatcherTestProfile.profile.uml#_Fxh84at9EeSbj-YWe2va_Q"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FilterNumericMatcherTestProfile.profile.uml#_WcALkKt8EeSbj-YWe2va_Q"/>
+ </profileApplication>
+ </uml:Model>
+ <profile:Task xmi:id="_O2Z2sKt9EeSbj-YWe2va_Q" base_Element="_Lt3_gKt9EeSbj-YWe2va_Q" priority="1"/>
+ <profile:Task xmi:id="_POJBQKt9EeSbj-YWe2va_Q" base_Element="_MVCtMKt9EeSbj-YWe2va_Q" priority="2"/>
+ <profile:Task xmi:id="_PkOmAKt9EeSbj-YWe2va_Q" base_Element="_NBp7kKt9EeSbj-YWe2va_Q" priority="3"/>
+ <profile:Task xmi:id="_QDFsQKt9EeSbj-YWe2va_Q" base_Element="_NpR8QKt9EeSbj-YWe2va_Q" priority="4"/>
+ <profile:Task xmi:id="_VI6WkKt9EeSbj-YWe2va_Q" base_Element="_RuxK8Kt9EeSbj-YWe2va_Q" priority="-1"/>
+ <profile:Task xmi:id="_VkuI0Kt9EeSbj-YWe2va_Q" base_Element="_SZSHkKt9EeSbj-YWe2va_Q" priority="-2"/>
+ <profile:Task xmi:id="_V8koIKt9EeSbj-YWe2va_Q" base_Element="_TIpH8Kt9EeSbj-YWe2va_Q" priority="-3"/>
+ <profile:Task xmi:id="_ZA8_IKt9EeSbj-YWe2va_Q" base_Element="_Q9DaIKt9EeSbj-YWe2va_Q"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.notation
new file mode 100755
index 00000000000..7aafc675803
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.notation
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wc_DAKt8EeSbj-YWe2va_Q" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_Yg9s8Kt8EeSbj-YWe2va_Q" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_YhGP0Kt8EeSbj-YWe2va_Q" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_YhRO8Kt8EeSbj-YWe2va_Q" type="1071">
+ <children xmi:type="notation:Shape" xmi:id="_dqr_0Kt8EeSbj-YWe2va_Q" type="3002">
+ <element xmi:type="uml:Property" href="FilterNumericMatcherTestProfile.profile.uml#_dpKV0Kt8EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_dqr_0at8EeSbj-YWe2va_Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_YhRO8at8EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_YhRO8qt8EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_YhRO86t8EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YhRO9Kt8EeSbj-YWe2va_Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_YhR2AKt8EeSbj-YWe2va_Q" type="1019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_YhR2Aat8EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_YhR2Aqt8EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_YhR2A6t8EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YhR2BKt8EeSbj-YWe2va_Q"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="FilterNumericMatcherTestProfile.profile.uml#_YggZ8Kt8EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yg9s8at8EeSbj-YWe2va_Q" x="351" y="96" width="356" height="317"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_bxGoAKt8EeSbj-YWe2va_Q" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bxIdMKt8EeSbj-YWe2va_Q" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bxJEQKt8EeSbj-YWe2va_Q" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bxJEQat8EeSbj-YWe2va_Q" key="StereotypeList" value="StandardProfile::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bxJEQqt8EeSbj-YWe2va_Q" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bxJrUKt8EeSbj-YWe2va_Q" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bxJrUat8EeSbj-YWe2va_Q" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_bxHPEKt8EeSbj-YWe2va_Q" type="1084"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bxHPEat8EeSbj-YWe2va_Q" x="832" y="44"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Wc_DAat8EeSbj-YWe2va_Q" name="diagram_compatibility_version" stringValue="1.0.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_Wc_DAqt8EeSbj-YWe2va_Q"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Wc_DA6t8EeSbj-YWe2va_Q">
+ <owner xmi:type="uml:Profile" href="FilterNumericMatcherTestProfile.profile.uml#_WcALkKt8EeSbj-YWe2va_Q"/>
+ </styles>
+ <element xmi:type="uml:Profile" href="FilterNumericMatcherTestProfile.profile.uml#_WcALkKt8EeSbj-YWe2va_Q"/>
+ <edges xmi:type="notation:Connector" xmi:id="_cTPrwKt8EeSbj-YWe2va_Q" type="1013" source="_Yg9s8Kt8EeSbj-YWe2va_Q" target="_bxGoAKt8EeSbj-YWe2va_Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_cTPrwat8EeSbj-YWe2va_Q"/>
+ <element xmi:type="uml:Extension" href="FilterNumericMatcherTestProfile.profile.uml#_cS0N8Kt8EeSbj-YWe2va_Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cTPrwqt8EeSbj-YWe2va_Q" points="[47, -7, -242, 31]$[239, -39, -50, -1]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cT0TgKt8EeSbj-YWe2va_Q" id="(1.0,0.11041009463722397)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vv-xQKt8EeSbj-YWe2va_Q" id="(0.0,0.84)"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.uml
new file mode 100755
index 00000000000..a01e368d17d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterNumericMatcherTestProfile.profile.uml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_WcALkKt8EeSbj-YWe2va_Q" name="profile" metaclassReference="_bxBIcKt8EeSbj-YWe2va_Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i6Fc4Kt8EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_Fxh84at9EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_Fxh84Kt9EeSbj-YWe2va_Q/3" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FxkZIKt9EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FxkZIat9EeSbj-YWe2va_Q" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FxkZIqt9EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FxkZI6t9EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FxkZJKt9EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FxkZJat9EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fxh84qt9EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fxh846t9EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YggZ8Kt8EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fxh85Kt9EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fxh85qt9EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_wUM4oat8EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_wUM4oKt8EeSbj-YWe2va_Q/2" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wUNfsat8EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wUNfsqt8EeSbj-YWe2va_Q" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wUNfs6t8EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wUNftKt8EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wUNftat8EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wUNftqt8EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_wUM4oqt8EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wUM4o6t8EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YggZ8Kt8EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wUM4pKt8EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wUM4pqt8EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_sQzUoKt8EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_sQytkKt8EeSbj-YWe2va_Q/1" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sQ0iwKt8EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sQ1J0Kt8EeSbj-YWe2va_Q" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sQ1J0at8EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sQ1J0qt8EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sQ1J06t8EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sQ1J1Kt8EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_sQzUoat8EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sQzUoqt8EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YggZ8Kt8EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sQzUo6t8EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sQzUpat8EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_i6GrAKt8EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_i6CZkKt8EeSbj-YWe2va_Q/0" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i6MKkKt8EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i6MKkat8EeSbj-YWe2va_Q" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i6MKkqt8EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i6MKk6t8EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i6MKlKt8EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i6MKlat8EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_i6GrAat8EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i6GrAqt8EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YggZ8Kt8EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_i6GrA6t8EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_i6GrBat8EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ </eAnnotations>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_bxBIcKt8EeSbj-YWe2va_Q" alias="Element">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </elementImport>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_YggZ8Kt8EeSbj-YWe2va_Q" name="Task">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_cSy_0Kt8EeSbj-YWe2va_Q" name="base_Element" association="_cS0N8Kt8EeSbj-YWe2va_Q">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_dpKV0Kt8EeSbj-YWe2va_Q" name="priority">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_cS0N8Kt8EeSbj-YWe2va_Q" name="E_Task_Element1" memberEnd="_cS0N8at8EeSbj-YWe2va_Q _cSy_0Kt8EeSbj-YWe2va_Q">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_cS0N8at8EeSbj-YWe2va_Q" name="extension_Task" type="_YggZ8Kt8EeSbj-YWe2va_Q" aggregation="composite" association="_cS0N8Kt8EeSbj-YWe2va_Q"/>
+ </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.notation
new file mode 100755
index 00000000000..368b95d906a
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.notation
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_LnUnoKh0EeSdCYE6DduyjQ" name="GenericTable0" currentRowAxisProvider="_LnUnoqh0EeSdCYE6DduyjQ" currentColumnAxisProvider="_LnUnoah0EeSdCYE6DduyjQ">
+ <context xmi:type="uml:Model" href="FilterStringMatcherTest.uml#_5xLsgKhzEeSdCYE6DduyjQ"/>
+ <owner xmi:type="uml:Model" href="FilterStringMatcherTest.uml#_5xLsgKhzEeSdCYE6DduyjQ"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_LnUnoah0EeSdCYE6DduyjQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Oz7tkKh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_LnUnoqh0EeSdCYE6DduyjQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4poKh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_6xZzYKhzEeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4poah0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_7Y-wwKhzEeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4poqh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_JNRAAKh0EeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4po6h0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_76384KhzEeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4ppKh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_-C1H4KhzEeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4ppah0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_Bf0zMKh0EeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4ppqh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_DB6RAKh0EeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4pp6h0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_D9fvgKh0EeSdCYE6DduyjQ"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_PW4pqKh0EeSdCYE6DduyjQ">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterStringMatcherTest.uml#_D9gWkKh0EeSdCYE6DduyjQ"/>
+ </axis>
+ </rowAxisProvidersHistory>
+ <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_P8FocKh0EeSdCYE6DduyjQ" displayFilter="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.uml
new file mode 100755
index 00000000000..2cd6ddf4123
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterStringMatcherTest.uml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_5xLsgKhzEeSdCYE6DduyjQ" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_6xZzYKhzEeSdCYE6DduyjQ" name="Class1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_7Y-wwKhzEeSdCYE6DduyjQ" name="Class2"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_JNRAAKh0EeSdCYE6DduyjQ" name="Class1Class1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_76384KhzEeSdCYE6DduyjQ" name="Class3"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_-C1H4KhzEeSdCYE6DduyjQ" name="aClass1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_Bf0zMKh0EeSdCYE6DduyjQ" name="1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_DB6RAKh0EeSdCYE6DduyjQ" name="2"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_D9fvgKh0EeSdCYE6DduyjQ" name="3"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_D9gWkKh0EeSdCYE6DduyjQ" name="4"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.notation
new file mode 100755
index 00000000000..ad8598250bb
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.notation
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_JvgY4Kt-EeSbj-YWe2va_Q" name="GenericTable0" currentRowAxisProvider="_JvgY4qt-EeSbj-YWe2va_Q" currentColumnAxisProvider="_JvgY4at-EeSbj-YWe2va_Q">
+ <context xmi:type="uml:Model" href="FilterUMLEnumerationMatcherTest.uml#_I1QXIKt-EeSbj-YWe2va_Q"/>
+ <owner xmi:type="uml:Model" href="FilterUMLEnumerationMatcherTest.uml#_I1QXIKt-EeSbj-YWe2va_Q"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_JvgY4at-EeSbj-YWe2va_Q" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UYr-EKt-EeSbj-YWe2va_Q" element="property_of_stereotype:/profile::Task::priority">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_JvgY4qt-EeSbj-YWe2va_Q" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_SJJkYKt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterUMLEnumerationMatcherTest.uml#_Lxv9cKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_SJJkYat-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterUMLEnumerationMatcherTest.uml#_McgKoKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_SJJkYqt-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterUMLEnumerationMatcherTest.uml#_ND7-EKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_SJJkY6t-EeSbj-YWe2va_Q">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="uml:Class" href="FilterUMLEnumerationMatcherTest.uml#_N2XgkKt-EeSbj-YWe2va_Q"/>
+ </axis>
+ </rowAxisProvidersHistory>
+ <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_XnSBAKt-EeSbj-YWe2va_Q" displayFilter="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.uml
new file mode 100755
index 00000000000..e488388554c
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTest.uml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:profile="http:///schemas/profile/_CsgQMKt-EeSbj-YWe2va_Q/1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/profile/_CsgQMKt-EeSbj-YWe2va_Q/1 FilterUMLEnumerationMatcherTestProfile.profile.uml#_CsgQMat-EeSbj-YWe2va_Q">
+ <uml:Model xmi:id="_I1QXIKt-EeSbj-YWe2va_Q" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_Lxv9cKt-EeSbj-YWe2va_Q" name="Class1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_McgKoKt-EeSbj-YWe2va_Q" name="Class2"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_ND7-EKt-EeSbj-YWe2va_Q" name="Class3"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_N2XgkKt-EeSbj-YWe2va_Q" name="Class4"/>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RAXXYKt-EeSbj-YWe2va_Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RA0DUKt-EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA0DUat-EeSbj-YWe2va_Q" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA0DUqt-EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA0DU6t-EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA0DVKt-EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA0DVat-EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RAzcQKt-EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_CsgQMat-EeSbj-YWe2va_Q"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_k25SYKt9EeSbj-YWe2va_Q"/>
+ </profileApplication>
+ </uml:Model>
+ <profile:Task xmi:id="_VibNUKt-EeSbj-YWe2va_Q" base_Element="_McgKoKt-EeSbj-YWe2va_Q" priority="Medium"/>
+ <profile:Task xmi:id="_WZYqgKt-EeSbj-YWe2va_Q" base_Element="_ND7-EKt-EeSbj-YWe2va_Q" priority="Low"/>
+ <profile:Task xmi:id="_ZyvL8Kt-EeSbj-YWe2va_Q" base_Element="_Lxv9cKt-EeSbj-YWe2va_Q"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.di
new file mode 100755
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.notation
new file mode 100755
index 00000000000..2af5f981e58
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.notation
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+ <notation:Diagram xmi:id="_k26ggKt9EeSbj-YWe2va_Q" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_oY_gIKt9EeSbj-YWe2va_Q" type="2006">
+ <children xmi:type="notation:DecorationNode" xmi:id="_oZAHMKt9EeSbj-YWe2va_Q" type="5023"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_oZAuQKt9EeSbj-YWe2va_Q" type="1063">
+ <children xmi:type="notation:Shape" xmi:id="_zvyZQKt9EeSbj-YWe2va_Q" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_zvuH0Kt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zvyZQat9EeSbj-YWe2va_Q"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_0oQ5YKt9EeSbj-YWe2va_Q" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_0oOdIKt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_0oQ5Yat9EeSbj-YWe2va_Q"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_2JjtAKt9EeSbj-YWe2va_Q" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_2JgCoKt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2JjtAat9EeSbj-YWe2va_Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_oZAuQat9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_oZAuQqt9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_oZAuQ6t9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oZAuRKt9EeSbj-YWe2va_Q"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_oY7OsKt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oY_gIat9EeSbj-YWe2va_Q" x="323" y="186" width="179" height="115"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pd0aMKt9EeSbj-YWe2va_Q" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_pd1BQKt9EeSbj-YWe2va_Q" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pd1BQat9EeSbj-YWe2va_Q" type="1071">
+ <children xmi:type="notation:Shape" xmi:id="_uYQT4Kt9EeSbj-YWe2va_Q" type="3002">
+ <element xmi:type="uml:Property" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_uYNQkKt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uYQT4at9EeSbj-YWe2va_Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pd1BQqt9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pd1BQ6t9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pd1BRKt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pd1BRat9EeSbj-YWe2va_Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pd1oUKt9EeSbj-YWe2va_Q" type="1019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pd1oUat9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pd1oUqt9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pd1oU6t9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pd1oVKt9EeSbj-YWe2va_Q"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_pdxW4Kt9EeSbj-YWe2va_Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pd0aMat9EeSbj-YWe2va_Q" x="785" y="227"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_sghWMKt9EeSbj-YWe2va_Q" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sgikUKt9EeSbj-YWe2va_Q" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sgikUat9EeSbj-YWe2va_Q" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sgjLYKt9EeSbj-YWe2va_Q" key="StereotypeList" value="StandardProfile::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sgjLYat9EeSbj-YWe2va_Q" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sgjLYqt9EeSbj-YWe2va_Q" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sgjLY6t9EeSbj-YWe2va_Q" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_sgh9QKt9EeSbj-YWe2va_Q" type="1084"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sgh9Qat9EeSbj-YWe2va_Q" x="789" y="101"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_k26ggat9EeSbj-YWe2va_Q" name="diagram_compatibility_version" stringValue="1.0.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_k26ggqt9EeSbj-YWe2va_Q"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_k26gg6t9EeSbj-YWe2va_Q">
+ <owner xmi:type="uml:Profile" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_k25SYKt9EeSbj-YWe2va_Q"/>
+ </styles>
+ <element xmi:type="uml:Profile" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_k25SYKt9EeSbj-YWe2va_Q"/>
+ <edges xmi:type="notation:Connector" xmi:id="_tme4sKt9EeSbj-YWe2va_Q" type="1013" source="_pd0aMKt9EeSbj-YWe2va_Q" target="_sghWMKt9EeSbj-YWe2va_Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_tme4sat9EeSbj-YWe2va_Q"/>
+ <element xmi:type="uml:Extension" href="FilterUMLEnumerationMatcherTestProfile.profile.uml#_tmanQKt9EeSbj-YWe2va_Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tme4sqt9EeSbj-YWe2va_Q" points="[-15, -18, 91, 130]$[-156, -147, -50, 1]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tmrtAKt9EeSbj-YWe2va_Q" id="(0.38028169014084506,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xLZw8Kt9EeSbj-YWe2va_Q" id="(0.5,1.0)"/>
+ </edges>
+ </notation:Diagram>
+ <css:ModelStyleSheets xmi:id="_moZFMKt9EeSbj-YWe2va_Q"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.uml
new file mode 100755
index 00000000000..1ee40f35af0
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/filter/FilterUMLEnumerationMatcherTestProfile.profile.uml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_k25SYKt9EeSbj-YWe2va_Q" name="profile" metaclassReference="_sgcdsKt9EeSbj-YWe2va_Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5R_dkat9EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_CsgQMat-EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_CsgQMKt-EeSbj-YWe2va_Q/1" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CsgQMqt-EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/4.1.0/UML" references="_5SAEoKt9EeSbj-YWe2va_Q"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Csg3Qat-EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Csg3Qqt-EeSbj-YWe2va_Q" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Csg3Q6t-EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Csg3RKt-EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Csg3Rat-EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Csg3Rqt-EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_CsgQM6t-EeSbj-YWe2va_Q" name="Priority">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CsgQNKt-EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_oY7OsKt9EeSbj-YWe2va_Q"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CsgQNat-EeSbj-YWe2va_Q" name="Hight"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CsgQNqt-EeSbj-YWe2va_Q" name="Medium" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CsgQN6t-EeSbj-YWe2va_Q" name="Low" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CsgQOKt-EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CsgQOat-EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pdxW4Kt9EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CsgQOqt-EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_CsgQPKt-EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1" eType="_5SAEoat9EeSbj-YWe2va_Q"/>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_5SAEoKt9EeSbj-YWe2va_Q" name="profile" nsURI="http:///schemas/profile/_5R_dkKt9EeSbj-YWe2va_Q/0" nsPrefix="profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5SArsKt9EeSbj-YWe2va_Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5SArsat9EeSbj-YWe2va_Q" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5SArsqt9EeSbj-YWe2va_Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5SArs6t9EeSbj-YWe2va_Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5SArtKt9EeSbj-YWe2va_Q" key="Date" value="2015-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5SArtat9EeSbj-YWe2va_Q" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_5SAEoat9EeSbj-YWe2va_Q" name="Priority">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5SAEoqt9EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_oY7OsKt9EeSbj-YWe2va_Q"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5SAEo6t9EeSbj-YWe2va_Q" name="Hight"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5SAEpKt9EeSbj-YWe2va_Q" name="Medium" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5SAEpat9EeSbj-YWe2va_Q" name="Low" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_5SAEpqt9EeSbj-YWe2va_Q" name="Task">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5SAEp6t9EeSbj-YWe2va_Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pdxW4Kt9EeSbj-YWe2va_Q"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5SAEqKt9EeSbj-YWe2va_Q" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5SAEqqt9EeSbj-YWe2va_Q" name="priority" ordered="false" lowerBound="1" eType="_5SAEoat9EeSbj-YWe2va_Q"/>
+ </eClassifiers>
+ </contents>
+ </eAnnotations>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_sgcdsKt9EeSbj-YWe2va_Q" alias="Element">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </elementImport>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_oY7OsKt9EeSbj-YWe2va_Q" name="Priority">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zvuH0Kt9EeSbj-YWe2va_Q" name="Hight"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0oOdIKt9EeSbj-YWe2va_Q" name="Medium"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2JgCoKt9EeSbj-YWe2va_Q" name="Low"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_pdxW4Kt9EeSbj-YWe2va_Q" name="Task">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tmaAMKt9EeSbj-YWe2va_Q" name="base_Element" association="_tmanQKt9EeSbj-YWe2va_Q">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_uYNQkKt9EeSbj-YWe2va_Q" name="priority" type="_oY7OsKt9EeSbj-YWe2va_Q"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_tmanQKt9EeSbj-YWe2va_Q" name="E_Task_Element1" memberEnd="_tmanQat9EeSbj-YWe2va_Q _tmaAMKt9EeSbj-YWe2va_Q">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tmanQat9EeSbj-YWe2va_Q" name="extension_Task" type="_pdxW4Kt9EeSbj-YWe2va_Q" aggregation="composite" association="_tmanQKt9EeSbj-YWe2va_Q"/>
+ </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractFilterMatcherTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractFilterMatcherTest.java
new file mode 100755
index 00000000000..7a4e837272a
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractFilterMatcherTest.java
@@ -0,0 +1,188 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.edit.command.UpdateDataCommand;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.nattable.generic.tests.Activator;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
+
+/**
+ * Abstract Class used to test filter
+ *
+ */
+public abstract class AbstractFilterMatcherTest extends AbstractGenericTableTest {
+
+ /**
+ * the path where the Papyrus model to test are stored
+ */
+ public static final String PATH = "/resources/filter/"; //$NON-NLS-1$
+
+
+ public void initModel() throws Exception {
+ initModel("table", getClass().getSimpleName(), getBundle()); //$NON-NLS-1$
+
+ // this test work only for false
+ Assert.assertTrue(!FilterPreferences.displayInconsistentValueWithFilter(null));
+// openGenericTableForTest();
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ flushDisplayEvents();
+ //this test work only for false
+ Assert.assertTrue(!FilterPreferences.displayInconsistentValueWithFilter(null));
+ }
+
+ public void initModelWithAdditionalModels(Collection<String> otherModelToLoad) throws Exception {
+ initModelWithAdditionalModels("table", getClass().getSimpleName(), getBundle(), otherModelToLoad); //$NON-NLS-1$
+// openGenericTableForTest();
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ flushDisplayEvents();
+ //this test work only for false
+ Assert.assertTrue(!FilterPreferences.displayInconsistentValueWithFilter(null));
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.uml.nattable.generic.tests.tests.AbstractGenericTableTest#getSourcePath()
+ *
+ * @return
+ * the folder where the model are stored
+ */
+ @Override
+ protected String getSourcePath() {
+ return PATH;
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.uml.nattable.generic.tests.tests.AbstractGenericTableTest#getBundle()
+ *
+ * @return
+ * the curernt bundler
+ */
+ @Override
+ protected Bundle getBundle() {
+ return Activator.getDefault().getBundle();
+ }
+
+ /**
+ * Close all the opened editors
+ */
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+
+ /**
+ *
+ * @param tableManager
+ * the table manager
+ * @return
+ * the nattable widget to use
+ */
+ protected NatTable getNatTable(INattableModelManager tableManager) {
+ NatTable natTable = (NatTable) tableManager.getAdapter(NatTable.class);
+ return natTable;
+ }
+
+ /**
+ *
+ * @param matchOn
+ * the filter value : the object on which we do the math
+ * @param columnPosition
+ * the position of the filtered column
+ * @param rowPosition
+ * the row position of the filter
+ * @param nbElementsInTheTable
+ * the initial number of elements in the table
+ * @param nbMatchingElement
+ * the number of elements matching the filter
+ * @throws Exception
+ */
+ protected void checkFilter(Object matchOn, int columnPosition, int rowPosition, int nbElementsInTheTable, int nbMatchingElement) throws Exception {
+ INattableModelManager manager = getTableManager();
+ List<Object> elements = manager.getRowElementsList();
+ Assert.assertEquals(nbElementsInTheTable, elements.size());
+ checkUnicityOfElements(elements);
+
+ NatTable natTable = getNatTable(manager);
+
+ // 1. we apply the filter
+ natTable.getLayer().doCommand(new UpdateDataCommand(natTable.getLayer(), columnPosition, rowPosition, matchOn));
+ flushDisplayEvents();
+
+ // 2. we check the result
+ checkUnicityOfElements(elements);
+ int newSize = elements.size();
+ Assert.assertEquals(nbMatchingElement, newSize);
+
+ // 3. we undo the filter
+ TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(manager.getTable());
+ domain.getCommandStack().undo();
+ flushDisplayEvents();
+
+ // 4. we check the undo result
+ checkUnicityOfElements(elements);
+ newSize = elements.size();
+ Assert.assertEquals(nbElementsInTheTable, newSize);
+
+ // 5. we reapply the filter
+ domain.getCommandStack().redo();
+ flushDisplayEvents();
+
+ // 6. we check the result
+ newSize = elements.size();
+ Assert.assertEquals(nbMatchingElement, newSize);
+ }
+
+ /**
+ *
+ * @param rowElements
+ *
+ * This method check than the row elements list doesn't contain duplicated elements
+ */
+ protected void checkUnicityOfElements(List<?> rowElements) {
+ int initialSize = rowElements.size();
+ Set<Object> set = new HashSet<Object>();
+ for (Object current : rowElements) {
+ set.add(current);
+ }
+ Assert.assertEquals("Some objects seems duplicated in the row elements list", initialSize, set.size()); //$NON-NLS-1$
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java
new file mode 100755
index 00000000000..a52510c2972
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java
@@ -0,0 +1,142 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.Collection;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.nattable.generic.tests.Activator;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author VL222926
+ *
+ */
+public abstract class AbstractGenericTableTest extends AbstractEditorIntegrationTest {
+
+ /**
+ * Inits this.editor
+ * Fails or throws an exception if an error occurs
+ *
+ * @param bundle
+ * the source bundle where the model is store
+ * @param projectName
+ * the project that will created at runtime to execute test
+ * @param modelName
+ * the model that will be copied and test executed on.
+ * @param otherModelsToLoad
+ * model to load
+ */
+ protected void initModelWithAdditionalModels(String projectName, String modelName, Bundle bundle, Collection<String> otherModelsToLoad) throws Exception {
+ project = ProjectUtils.createProject(projectName);
+ for (String current : otherModelsToLoad) {
+ final IFile project1 = PapyrusProjectUtils.copyPapyrusModel(project, bundle, getSourcePath(), current); //$NON-NLS-1$
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(project1);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+ }
+ this.diModelFile = PapyrusProjectUtils.copyPapyrusModel(project, bundle, getSourcePath(), modelName);
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(diModelFile);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ Assert.assertNotNull(editor);
+ }
+
+ /**
+ * this method opens the generic table (must be the first editor available in the page manager)
+ *
+ * @throws Exception
+ */
+
+ public void loadGenericTable() throws Exception {
+ IEditorPart tableEditor = editor.getActiveEditor();
+ Assert.assertNull(tableEditor);
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ Table table = (Table) notationResource.getContents().get(0);
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table)));
+ // to refresh the table content
+ // while(!Display.getDefault().isDisposed() && Display.getDefault().readAndDispatch());
+ tableEditor = editor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager);
+ Assert.assertEquals(org.eclipse.papyrus.uml.nattable.generic.config.Activator.TABLE_TYPE, manager.getTable().getTableConfiguration().getType());
+ }
+
+ protected Table getTable() throws ServiceException {
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ Table table = (Table) notationResource.getContents().get(0);
+ return table;
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return "/resources/"; //$NON-NLS-1$
+ }
+
+ @Override
+ protected Bundle getBundle() {
+ return Activator.getDefault().getBundle();
+ }
+
+
+ protected INattableModelManager getTableManager() {
+ IEditorPart tableEditor = editor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+ return manager;
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
index c772a0f8289..79b08a8e6eb 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
@@ -19,7 +19,12 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({ RevealGenericTableTest.class })
+@SuiteClasses({ Bug458492_Edition_Enumeration.class,
+ RevealGenericTableTest.class,
+ FilterStringMatcherTest.class,
+ FilterEEnumMatcherTest.class,
+ FilterNumericMatcherTest.class,
+ FilterUMLEnumerationMatcherTest.class })
public class AllTests {
// JUnit 4 test suite
}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java
new file mode 100755
index 00000000000..a9596736c64
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java
@@ -0,0 +1,501 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.nattable.dataprovider.UMLStereotypeSingleEnumerationComboBoxDataProvider;
+import org.eclipse.papyrus.uml.nattable.generic.tests.Activator;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * This test checks properties typed with Enumeration:
+ * <ul>
+ * <li>property owned by a stereotype and typed with an UML Enumeration declared in the same profile</li>
+ * <li>property owned by a stereotype and typed with an UML Enumeration declared in an external library</li>
+ * <li>property owned by a stereotype and typed with an UML Enumerationn when it is a static profile (SysML FlowPort::direction)</li>
+ * </ul>
+ *
+ * We check the available literals AND the set action for each of them
+ */
+public class Bug458492_Edition_Enumeration extends AbstractGenericTableTest {
+
+
+ private static final String CLASS_NAME = "Class1"; //$NON-NLS-1$
+
+ private static final String TASK_COLOR_PROPERTY_QN = "profile::Task::color"; //$NON-NLS-1$
+
+ private static final String TASK_COLOR_PROPERTY_NAME = "color"; //$NON-NLS-1$
+
+ private static final String TASK_PRIORITY_PROPERTY_QN = "profile::Task::p"; //$NON-NLS-1$
+
+ private static final String TASK_STEREOTYPE_QN = "profile::Task"; //$NON-NLS-1$
+
+ private static final String TASK_PRIORIY_PROPERTY_NAME = "p"; //$NON-NLS-1$
+
+ public static final String PASTE_FOLDER_PATH = "/resources/UMLEnumerationEdition/"; //$NON-NLS-1$
+
+ private static final String PORT_NAME = "flowport1"; //$NON-NLS-1$
+
+ private static final String FLOW_PORT_STEREOTYPE_QN = "SysML::PortAndFlows::FlowPort"; //$NON-NLS-1$
+
+ private static final String DIRECTION_QN = "SysML::PortAndFlows::FlowPort::direction"; //$NON-NLS-1$
+
+ private static final String DIRECTION_PROPERTY_NAME = "direction"; //$NON-NLS-1$
+
+ @Before
+ public void initModel() throws Exception {
+ initModel("table", getClass().getSimpleName(), getBundle()); //$NON-NLS-1$
+ }
+
+ /**
+ * Inits this.editor
+ * Fails or throws an exception if an error occurs
+ *
+ * @param bundle
+ * the source bundle where the model is store
+ * @param projectName
+ * the project that will created at runtime to execute test
+ * @param modelName
+ * the model that will be copied and test executed on.
+ */
+ protected void initModel(String projectName, String modelName, Bundle bundle) throws Exception {
+ project = ProjectUtils.createProject(projectName);
+ final IFile project1 = PapyrusProjectUtils.copyPapyrusModel(project, bundle, getSourcePath(), "library"); //$NON-NLS-1$
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(project1);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ final IFile project2 = PapyrusProjectUtils.copyPapyrusModel(project, bundle, getSourcePath(), "model.profile"); //$NON-NLS-1$
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(project2);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ this.diModelFile = PapyrusProjectUtils.copyPapyrusModel(project, bundle, getSourcePath(), modelName);
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(diModelFile);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ Assert.assertNotNull(editor);
+ }
+
+
+ @Test
+ public void availableColorTest() throws Exception {
+
+ StringBuilder builder = new StringBuilder(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX);
+ builder.append(TASK_COLOR_PROPERTY_QN); //$NON-NLS-1$
+ String wantedProperty = builder.toString();
+ loadGenericTable();
+ List<IAxis> iAxis = getTable().getCurrentColumnAxisProvider().getAxis();
+ IAxis colorAxis = null;
+ Object representedElement = null;
+
+ for (IAxis current : iAxis) {
+ representedElement = AxisUtils.getRepresentedElement(current);
+ if (wantedProperty.equals(representedElement)) {
+ colorAxis = current;
+ break;
+ }
+ }
+ Assert.assertNotNull(colorAxis);
+ Assert.assertNotNull(representedElement);
+
+ UMLStereotypeSingleEnumerationComboBoxDataProvider provider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(colorAxis, getTableManager());
+ List<?> values = provider.getValues(iAxis.indexOf(colorAxis), 0);
+ boolean findBlack = false;
+ boolean findRed = false;
+ boolean findBlue = false;
+ for (Object current : values) {
+ Assert.assertTrue(current instanceof EEnumLiteral);
+ EEnumLiteral lit = (EEnumLiteral) current;
+ if (lit.getLiteral().equals("black")) { //$NON-NLS-1$
+ findBlack = true;
+ }
+ if (lit.getLiteral().equals("red")) { //$NON-NLS-1$
+ findRed = true;
+ }
+ if (lit.getLiteral().equals("blue")) { //$NON-NLS-1$
+ findBlue = true;
+ }
+ }
+
+
+ Assert.assertTrue(findBlack);
+ Assert.assertTrue(findRed);
+ Assert.assertTrue(findBlue);
+ }
+
+ @Test
+ public void availablePriorityTest() throws Exception {
+ StringBuilder builder = new StringBuilder(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX);
+ builder.append(TASK_PRIORITY_PROPERTY_QN); //$NON-NLS-1$
+ String wantedProperty = builder.toString();
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ List<IAxis> iAxis = getTable().getCurrentColumnAxisProvider().getAxis();
+ IAxis priorityAxis = null;
+ Object representedElement = null;
+
+ for (IAxis current : iAxis) {
+ representedElement = AxisUtils.getRepresentedElement(current);
+ if (wantedProperty.equals(representedElement)) {
+ priorityAxis = current;
+ break;
+ }
+ }
+ Assert.assertNotNull(priorityAxis);
+ Assert.assertNotNull(representedElement);
+
+ UMLStereotypeSingleEnumerationComboBoxDataProvider provider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(priorityAxis, getTableManager());
+ List<?> values = provider.getValues(iAxis.indexOf(priorityAxis), 0);
+ boolean findHight = false;
+ boolean findMedium = false;
+ boolean findLow = false;
+ for (Object current : values) {
+ Assert.assertTrue(current instanceof EEnumLiteral);
+ EEnumLiteral lit = (EEnumLiteral) current;
+ if (lit.getLiteral().equals("hight")) { //$NON-NLS-1$
+ findHight = true;
+ }
+ if (lit.getLiteral().equals("medium")) { //$NON-NLS-1$
+ findMedium = true;
+ }
+ if (lit.getLiteral().equals("low")) { //$NON-NLS-1$
+ findLow = true;
+ }
+ }
+
+
+ Assert.assertTrue(findHight);
+ Assert.assertTrue(findMedium);
+ Assert.assertTrue(findLow);
+ }
+
+
+
+
+ @Test
+ public void testSetPriorityOnStereotypedClass() throws Exception {
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ List<Object> elements = getTableManager().getRowElementsList();
+ Assert.assertEquals(2, elements.size());
+ // we look for the class to edit
+ Class clazz = null;
+ Object classObject = null;
+ for (Object object : elements) {
+ Object tmp = AxisUtils.getRepresentedElement(object);
+ if (tmp instanceof Class && ((Class) tmp).getName().equals(CLASS_NAME)) {
+ clazz = (Class) tmp;
+ classObject = object;
+ }
+ }
+
+ Stereotype appliedStereotype = clazz.getAppliedStereotype(TASK_STEREOTYPE_QN);
+ Assert.assertNotNull(appliedStereotype);
+ // we look for the column to edit
+ Object priorityColumn = null;
+ List<Object> columns = getTableManager().getColumnElementsList();
+ List<Object> rows = getTableManager().getRowElementsList();
+ for (Object current : columns) {
+ Object representedElement = AxisUtils.getRepresentedElement(current);
+ if (representedElement instanceof String && ((String) representedElement).contains(TASK_PRIORITY_PROPERTY_QN)) {
+ priorityColumn = current;
+ break;
+ }
+ }
+
+ Assert.assertNotNull(priorityColumn);
+ Assert.assertNotNull(clazz);
+ Stereotype ste = clazz.getApplicableStereotype(TASK_STEREOTYPE_QN);
+ Assert.assertNotNull(ste);
+
+
+ EObject stereotypeDef = ste.getProfile().getDefinition(ste);
+ Assert.assertNotNull(stereotypeDef);
+ EStructuralFeature priority = ((EClass) stereotypeDef).getEStructuralFeature(TASK_PRIORIY_PROPERTY_NAME);
+ Assert.assertNotNull(priority);
+
+ UMLStereotypeSingleEnumerationComboBoxDataProvider contentProvider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(priorityColumn, getTableManager());
+ Object values = contentProvider.getValues(columns.indexOf(priorityColumn), rows.indexOf(classObject));
+ Assert.assertTrue(values instanceof Collection<?>);
+ Collection<?> coll = (Collection<?>) values;
+ Assert.assertEquals(3, coll.size());
+ boolean findHight = false;
+ boolean findMedium = false;
+ boolean findLow = false;
+ for (Object current : coll) {
+ Assert.assertTrue(current instanceof EEnumLiteral);
+ EEnumLiteral lit = (EEnumLiteral) current;
+ if (lit.getLiteral().equals("hight")) { //$NON-NLS-1$
+ findHight = true;
+ }
+ if (lit.getLiteral().equals("medium")) { //$NON-NLS-1$
+ findMedium = true;
+ }
+ if (lit.getLiteral().equals("low")) { //$NON-NLS-1$
+ findLow = true;
+ }
+ }
+ // we check that values are wanted values
+ Assert.assertTrue(findHight);
+ Assert.assertTrue(findMedium);
+ Assert.assertTrue(findLow);
+ Iterator<?> iter = coll.iterator();
+
+ // we check the set Value command
+ while (iter.hasNext()) {
+ Object newValue = iter.next();
+ Assert.assertTrue(newValue instanceof EEnumLiteral);
+ CellManagerFactory.INSTANCE.setCellValue(getTransactionalEditingDomain(), priorityColumn, clazz, newValue, getTableManager());
+ Stereotype stee = clazz.getAppliedStereotype("profile::Task"); //$NON-NLS-1$
+ Assert.assertNotNull(stee);
+ Object value = clazz.getValue(stee, TASK_PRIORIY_PROPERTY_NAME);
+ Assert.assertTrue(value instanceof EnumerationLiteral);
+ Assert.assertEquals(((EEnumLiteral) newValue).getLiteral(), ((EnumerationLiteral) value).getName());
+ }
+
+
+ }
+
+
+ @Test
+ public void testSetColorOnStereotypedClass() throws Exception {
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ List<Object> elements = getTableManager().getRowElementsList();
+ // we look for the class to edit
+ Class clazz = null;
+ Object classObject = null;
+ for (Object object : elements) {
+ Object representedObject = AxisUtils.getRepresentedElement(object);
+ if (representedObject instanceof Class && ((Class) representedObject).getName().equals(CLASS_NAME)) {
+ clazz = (Class) representedObject;
+ classObject = object;
+ }
+ }
+
+ Stereotype appliedStereotype = clazz.getAppliedStereotype(TASK_STEREOTYPE_QN);
+ Assert.assertNotNull(appliedStereotype);
+ // we look for the column to edit
+ Object priorityColumn = null;
+ List<Object> columns = getTableManager().getColumnElementsList();
+ List<Object> rows = getTableManager().getRowElementsList();
+ for (Object current : columns) {
+ Object representedElement = AxisUtils.getRepresentedElement(current);
+ if (representedElement instanceof String && ((String) representedElement).contains(TASK_COLOR_PROPERTY_QN)) {
+ priorityColumn = current;
+ break;
+ }
+ }
+
+ Assert.assertNotNull(priorityColumn);
+ Assert.assertNotNull(clazz);
+ Stereotype ste = clazz.getApplicableStereotype(TASK_STEREOTYPE_QN);
+ Assert.assertNotNull(ste);
+
+
+ EObject stereotypeDef = ste.getProfile().getDefinition(ste);
+ Assert.assertNotNull(stereotypeDef);
+ EStructuralFeature priority = ((EClass) stereotypeDef).getEStructuralFeature(TASK_COLOR_PROPERTY_NAME);
+ Assert.assertNotNull(priority);
+
+ UMLStereotypeSingleEnumerationComboBoxDataProvider contentProvider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(priorityColumn, getTableManager());
+ Object values = contentProvider.getValues(columns.indexOf(priorityColumn), rows.indexOf(classObject));
+ Assert.assertTrue(values instanceof Collection<?>);
+ Collection<?> coll = (Collection<?>) values;
+ Assert.assertEquals(3, coll.size());
+ boolean findBlack = false;
+ boolean findRed = false;
+ boolean findBlue = false;
+ for (Object current : coll) {
+ Assert.assertTrue(current instanceof EEnumLiteral);
+ EEnumLiteral lit = (EEnumLiteral) current;
+ if (lit.getLiteral().equals("black")) { //$NON-NLS-1$
+ findBlack = true;
+ }
+ if (lit.getLiteral().equals("red")) { //$NON-NLS-1$
+ findRed = true;
+ }
+ if (lit.getLiteral().equals("blue")) { //$NON-NLS-1$
+ findBlue = true;
+ }
+ }
+
+
+ Assert.assertTrue(findBlack);
+ Assert.assertTrue(findRed);
+ Assert.assertTrue(findBlue);
+ Iterator<?> iter = coll.iterator();
+
+ // we check the set Value command
+ while (iter.hasNext()) {
+ Object newValue = iter.next();
+ Assert.assertTrue(newValue instanceof EEnumLiteral);
+ CellManagerFactory.INSTANCE.setCellValue(getTransactionalEditingDomain(), priorityColumn, clazz, newValue, getTableManager());
+ Stereotype stee = clazz.getAppliedStereotype("profile::Task"); //$NON-NLS-1$
+ Assert.assertNotNull(stee);
+ Object value = clazz.getValue(stee, TASK_COLOR_PROPERTY_NAME);
+ Assert.assertNotNull("The stereotype property is null", value);
+ Assert.assertTrue(value instanceof EnumerationLiteral);
+ Assert.assertEquals(((EEnumLiteral) newValue).getLiteral(), ((EnumerationLiteral) value).getName());
+ }
+ }
+
+ @Test
+ public void testSetFlowPortDirection() throws Exception {
+ loadGenericTable(); //$NON-NLS-1$ //$NON-NLS-2$
+ List<Object> elements = getTableManager().getRowElementsList();
+ // we look for the port to edit
+ Port port = null;
+ Object portObject = null;
+ for (Object object : elements) {
+ Object representedObject = AxisUtils.getRepresentedElement(object);
+ if (representedObject instanceof Port && ((Port) representedObject).getName().equals(PORT_NAME)) {
+ port = (Port) representedObject;
+ portObject = object;
+ }
+ }
+
+ Stereotype appliedStereotype = port.getAppliedStereotype(FLOW_PORT_STEREOTYPE_QN);
+ Assert.assertNotNull(appliedStereotype);
+ // we look for the column to edit
+ Object directionColumn = null;
+ List<Object> columns = getTableManager().getColumnElementsList();
+ List<Object> rows = getTableManager().getRowElementsList();
+
+ for (Object current : columns) {
+ Object representedElement = AxisUtils.getRepresentedElement(current);
+ if (representedElement instanceof String && ((String) representedElement).contains(DIRECTION_QN)) {
+ directionColumn = current;
+ break;
+ }
+ }
+
+ Assert.assertNotNull(directionColumn);
+ Assert.assertNotNull(port);
+ Stereotype ste = port.getApplicableStereotype(FLOW_PORT_STEREOTYPE_QN);
+ Assert.assertNotNull(ste);
+
+
+ EObject stereotypeDef = ste.getProfile().getDefinition(ste);
+ Assert.assertNotNull(stereotypeDef);
+ EStructuralFeature priority = ((EClass) stereotypeDef).getEStructuralFeature(DIRECTION_PROPERTY_NAME);
+ Assert.assertNotNull(priority);
+
+ UMLStereotypeSingleEnumerationComboBoxDataProvider contentProvider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(directionColumn, getTableManager());
+ Object values = contentProvider.getValues(columns.indexOf(directionColumn), rows.indexOf(portObject));
+ Assert.assertTrue(values instanceof Collection<?>);
+ Collection<?> coll = (Collection<?>) values;
+ Assert.assertEquals(3, coll.size());
+ boolean findIn = false;
+ boolean findout = false;
+ boolean findInOut = false;
+ for (Object current : coll) {
+ Assert.assertTrue(current instanceof Enumerator);
+ Enumerator lit = (Enumerator) current;
+ if (lit.getLiteral().equals("in")) { //$NON-NLS-1$
+ findIn = true;
+ }
+ if (lit.getLiteral().equals("out")) { //$NON-NLS-1$
+ findout = true;
+ }
+ if (lit.getLiteral().equals("inout")) { //$NON-NLS-1$
+ findInOut = true;
+ }
+ }
+
+
+ Assert.assertTrue(findIn);
+ Assert.assertTrue(findout);
+ Assert.assertTrue(findInOut);
+ Iterator<?> iter = coll.iterator();
+
+ // we check the set Value command
+ while (iter.hasNext()) {
+ Object newValue = iter.next();
+ Assert.assertTrue(newValue instanceof Enumerator);
+ CellManagerFactory.INSTANCE.setCellValue(getTransactionalEditingDomain(), directionColumn, port, newValue, getTableManager());
+ Stereotype stee = port.getAppliedStereotype(FLOW_PORT_STEREOTYPE_QN);
+ Assert.assertNotNull(stee);
+ Object value = port.getValue(stee, DIRECTION_PROPERTY_NAME);
+ Assert.assertTrue(value == newValue);
+ }
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return PASTE_FOLDER_PATH;
+ }
+
+ @Override
+ protected Bundle getBundle() {
+ return Activator.getDefault().getBundle();
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+} \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterEEnumMatcherTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterEEnumMatcherTest.java
new file mode 100755
index 00000000000..a9440160808
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterEEnumMatcherTest.java
@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This tests check the filter on enumeration
+ *
+ */
+public class FilterEEnumMatcherTest extends AbstractFilterMatcherTest {
+
+ /**
+ * @see org.eclipse.papyrus.uml.nattable.generic.tests.tests.AbstractFilterMatcherTest#initModel()
+ *
+ * @throws Exception
+ */
+ @Before
+ @Override
+ public void initModel() throws Exception {
+ super.initModel();
+ }
+
+ /**
+ *
+ * @param axis
+ * an axis
+ * @return
+ * a list containing the possible Enumerator for the axis
+ */
+ private List<Enumerator> getVisibilityLiteral() {
+ final List<Enumerator> literals = new ArrayList<Enumerator>();
+ EEnum eenum = (EEnum) UMLPackage.eINSTANCE.getNamedElement_Visibility().getEType();
+ for (EEnumLiteral current : eenum.getELiterals()) {
+ literals.add(current.getInstance());
+ }
+ return literals;
+ }
+
+ @Test
+ public void testEEnumMatchingMode_1() throws Exception {
+ List<Enumerator> eenum = getVisibilityLiteral();
+ for (Enumerator current : eenum) {
+ if (current.getName().equals("public")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, 5, 1);
+ return;
+ }
+ }
+ }
+
+ @Test
+ public void testEEnumMatchingMode_2() throws Exception {
+ List<Enumerator> eenum = getVisibilityLiteral();
+ for (Enumerator current : eenum) {
+ if (current.getName().equals("private")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, 5, 1);
+ return;
+ }
+ }
+ }
+
+ @Test
+ public void testEEnumMatchingMode_3() throws Exception {
+ List<Enumerator> eenum = getVisibilityLiteral();
+ for (Enumerator current : eenum) {
+ if (current.getName().equals("protected")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, 5, 1);
+ return;
+ }
+ }
+ }
+
+ @Test
+ public void testEEnumMatchingMode_4() throws Exception {
+ List<Enumerator> eenum = getVisibilityLiteral();
+ for (Enumerator current : eenum) {
+ if (current.getName().equals("package")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, 5, 1);
+ return;
+ }
+ }
+ }
+
+ @Test
+ public void testEEnumMatchingMode_5() throws Exception {
+ checkFilter(Collections.singleton(ICellManager.NOT_AVALAIBLE), 2, 2, 5, 1);
+ }
+
+ @Test
+ public void testEEnumMatchingMode_6() throws Exception {
+ List<Object> matchOn = new ArrayList<Object>();
+ matchOn.add(ICellManager.NOT_AVALAIBLE);
+ matchOn.add(getVisibilityLiteral().get(0));
+ checkFilter(matchOn, 2, 2, 5, 2);
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterNumericMatcherTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterNumericMatcherTest.java
new file mode 100755
index 00000000000..d5f62d9f978
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterNumericMatcherTest.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class provides tests for numeric value (integer)
+ *
+ */
+public class FilterNumericMatcherTest extends AbstractFilterMatcherTest {
+
+ private static final int nbElement = 9;
+
+ /**
+ * @see org.eclipse.papyrus.uml.nattable.generic.tests.tests.AbstractFilterMatcherTest#initModel()
+ *
+ * @throws Exception
+ */
+ @Before
+ @Override
+ public void initModel() throws Exception {
+ Collection<String> additionalModels = new ArrayList<String>();
+ additionalModels.add("FilterNumericMatcherTestProfile.profile"); //$NON-NLS-1$
+ initModelWithAdditionalModels(additionalModels);
+ }
+
+ @Test
+ public void test1() throws Exception{
+ checkFilter("1", 2, 2, nbElement, 1); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test2() throws Exception{
+ checkFilter("-1", 2, 2, nbElement, 1); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test3() throws Exception{
+ checkFilter(">1", 2, 2, nbElement, 3); //$NON-NLS-1$
+ }
+ @Test
+ public void test4() throws Exception{
+ checkFilter(">=1", 2, 2, nbElement, 4); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test5() throws Exception{
+ checkFilter("<0", 2, 2, nbElement, 3); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test6() throws Exception{
+ checkFilter("<=0", 2, 2, nbElement, 4); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test7() throws Exception{
+ checkFilter("=0", 2, 2, nbElement, 1); //$NON-NLS-1$
+ }
+
+ @Test
+ public void test8() throws Exception{
+ checkFilter("<>0", 2, 2, nbElement, 7); //$NON-NLS-1$
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterStringMatcherTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterStringMatcherTest.java
new file mode 100755
index 00000000000..12abd4dab2d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterStringMatcherTest.java
@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusTextMatchingMode;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class allows us to test text filters, with the different mode
+ *
+ */
+public class FilterStringMatcherTest extends AbstractFilterMatcherTest {
+
+
+ private static final int NB_ELEMENTS = 9;
+
+ @Before
+ public void initModel() throws Exception {
+ super.initModel();
+ }
+
+ @Test
+ public void testContainsMatchingMode() throws Exception {
+ checkFilter("Block", 2, 2, NB_ELEMENTS, 0); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testNumeric_1_MatchingMode() throws Exception {
+ checkFilter("num:>3", 2, 2, NB_ELEMENTS, 1); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testNumeric_2_MatchingMode() throws Exception {
+ checkFilter("num:>=3", 2, 2, NB_ELEMENTS, 2); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testNumeric_3_MatchingMode() throws Exception {
+ checkFilter("num:<4", 2, 2, NB_ELEMENTS, 3); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testNumeric_4_MatchingMode() throws Exception {
+ checkFilter("num:<=4", 2, 2, NB_ELEMENTS, 4); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testNumeric_5_MatchingMode() throws Exception {
+ checkFilter("num:<>4", 2, 2, NB_ELEMENTS, 3); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testStartWith_1_MatchingMode() throws Exception {
+ checkFilter("start:Class", 2, 2, NB_ELEMENTS, 4); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testStartWith_2_MatchingMode() throws Exception {
+ checkFilter("start:Class1", 2, 2, NB_ELEMENTS, 2); //$NON-NLS-1$
+ }
+
+
+ @Test
+ public void testRegexFind_1_MatchingMode() throws Exception {
+ checkFilter("regex:^Cl", 2, 2, NB_ELEMENTS, 4); //$NON-NLS-1$
+ }
+
+ @Test
+ public void testRegexFind_2_MatchingMode() throws Exception {
+ checkFilter("regex:^aCl", 2, 2, NB_ELEMENTS, 1); //$NON-NLS-1$
+ }
+
+
+ @Test
+ public void testRegexMatch_1_MatchingMode() throws Exception {
+ String matchOn = "^C\\D*\\d";//match all ligne where the string start with C, contains some NON digit char and ends with 0 or 1 digit //$NON-NLS-1$
+ StringBuilder builder = new StringBuilder();
+ builder.append(PapyrusTextMatchingMode.REGEX_MATCH.getMode());
+ builder.append(matchOn);
+ checkFilter(builder.toString(), 2, 2, NB_ELEMENTS, 3);
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterUMLEnumerationMatcherTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterUMLEnumerationMatcherTest.java
new file mode 100755
index 00000000000..1a4084cb3c0
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/FilterUMLEnumerationMatcherTest.java
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.uml.nattable.dataprovider.UMLStereotypeSingleEnumerationComboBoxDataProvider;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test filters for UML Enumeration
+ *
+ */
+public class FilterUMLEnumerationMatcherTest extends AbstractFilterMatcherTest {
+
+ private int nbElementInTheTable = 4;
+
+ /**
+ * @see org.eclipse.papyrus.uml.nattable.generic.tests.tests.AbstractFilterMatcherTest#initModel()
+ *
+ * @throws Exception
+ */
+ @Before
+ @Override
+ public void initModel() throws Exception {
+ Collection<String> additionalModels = new ArrayList<String>();
+ additionalModels.add("FilterUMLEnumerationMatcherTestProfile.profile"); //$NON-NLS-1$
+ initModelWithAdditionalModels(additionalModels);
+ }
+
+ protected List<?> getAvailablePriorityLiterals() {
+ StringBuilder builder = new StringBuilder(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX);
+ builder.append("profile::Task::priority"); //$NON-NLS-1$
+ UMLStereotypeSingleEnumerationComboBoxDataProvider p = new UMLStereotypeSingleEnumerationComboBoxDataProvider(builder.toString(), getTableManager());
+ return p.getValues(0, 1);
+ }
+
+ @Test
+ public void test1() throws Exception {
+ List<?> literals = getAvailablePriorityLiterals();
+ for (Object current : literals) {
+ if (current instanceof Enumerator && ((Enumerator) current).getName().equals("Hight")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, nbElementInTheTable, 1);
+ }
+ }
+ }
+
+ @Test
+ public void test2() throws Exception {
+ List<?> literals = getAvailablePriorityLiterals();
+ for (Object current : literals) {
+ if (current instanceof Enumerator && ((Enumerator) current).getName().equals("Medium")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, nbElementInTheTable, 1);
+ }
+ }
+ }
+
+ @Test
+ public void test3() throws Exception {
+ List<?> literals = getAvailablePriorityLiterals();
+ for (Object current : literals) {
+ if (current instanceof Enumerator && ((Enumerator) current).getName().equals("Low")) { //$NON-NLS-1$
+ checkFilter(Collections.singleton(current), 2, 2, nbElementInTheTable, 1);
+ }
+ }
+ }
+
+ @Test
+ public void test4() throws Exception {
+ checkFilter(Collections.singleton(ICellManager.NOT_AVALAIBLE), 2, 2, nbElementInTheTable, 1);
+ }
+
+ @Test
+ public void test5() throws Exception {
+ List<?> literals = getAvailablePriorityLiterals();
+ Collection<Object> matchOn = new ArrayList<Object>();
+ matchOn.add(literals.get(0));
+ matchOn.add(literals.get(1));
+ checkFilter(matchOn, 2, 2, nbElementInTheTable, 2);
+ }
+
+ @Test
+ public void test6() throws Exception {
+ List<?> literals = getAvailablePriorityLiterals();
+ Collection<Object> matchOn = new ArrayList<Object>();
+ matchOn.add(literals.get(0));
+ matchOn.add(ICellManager.NOT_AVALAIBLE);
+ checkFilter(matchOn, 2, 2, nbElementInTheTable, 2);
+ }
+}

Back to the top