Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-01-17 17:27:59 +0000
committerChristian W. Damus2016-01-22 15:57:11 +0000
commitb089eab1fca586752027404cc398a173237337f8 (patch)
tree3d5f106bd6ba19ab6364284dec8cd34341cfd758 /plugins
parente8587f9c60ed458d6daee5128186f5b1ee54ac00 (diff)
downloadorg.eclipse.papyrus-b089eab1fca586752027404cc398a173237337f8.tar.gz
org.eclipse.papyrus-b089eab1fca586752027404cc398a173237337f8.tar.xz
org.eclipse.papyrus-b089eab1fca586752027404cc398a173237337f8.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Move UI-dependent APIs from the org.eclipse.papyrus.infra.tools bundle to org.eclipse.papyrus.infra.ui. Accordingly move tests into a new org.eclipse.papyrus.infra.ui.tests bundle. Two crucial UI dependencies are inverted by introduction of new OSGi services with core interfaces specified in the non-UI layer: * IExecutorService extends Java Platform's ExecutorService with APIs for synchronous execution (a la Display.syncExec). A new CoreExecutors class in the infra.tools bundle supplies the instance provided by the OSGi service implementation in the infra.ui bundle. This provides compatibility for clients of various UIUtil APIs that they can no longer access * IContextualServiceRegistryTracker abstracts the concept of the default ServicesRegistry found in the currently active editor, which the ServiceUtilsForHandlers class (and hence all of its clients) relies on. Again an OSGi service implementation in the infra.ui bundle supplies the implementation of this tracker, which is exposed in infra.core through the service-utils API Also move UI-dependent APIs from the org.eclipse.papyrus.infra.core bundle into org.eclipse.papyrus.infra.ui. This includes * moving the 'papyrusDiagram' and 'papyrusContentOutline' extension points into the org.eclipse.papyrus.infra.ui namespace * moving various UI-related services such as EditorLifeycleManager, SaveLayoutBeforeClose, and the IMultiDiagramEditor, itself, into the org.eclipse.papyrus.infra.ui bundle This necessitates not only widespread refactorings on the moved APIs, but also concomitant move of other APIs in other bundles because they cannot plausibly use these moved APIs from their new home in org.eclipse.papyrus.infra.ui and/or they cannot reasonably also be moved to the UI bundle and/or they must be used by bundles that now have no UI dependency: * the DI/sash-windows EMF model is moved out of infra.core.sasheditor.di bundle into a new model-only org.eclipse.papyrus.infra.sashwindows.di bundle (which symbolic name incidentally now better reflects the contained Java package names) * the IPageManager and ILocalPageService interfaces are moved out of infra.core.sasheditor.di bundle because they need to remain accessible by headless code such as the edit advices that ensure deletion of sash-model pages for notations that are deleted. These are now in a package named org.eclipse.papyrus.infra.code.sashwindows.di.service. Accordingly the class hierarchy implementing the IPageManager interface is changed: the obsolete PageMngrImpl is deleted, replaced by a BasicPageManagerImpl which now the PageManagerImpl extends. A service factory creates the basic page manager in a headless context, but is overridden by the UI-aware implementation when the UI bundles are installed * the MultiDiagramEditorGefDelegate (which has a GEF 3 dependency) is moved from the org.eclipse.papyrus.infra.core.sasheditor bundle to a new org.eclipse.papyrus.infra.gmfdiag.gef bundle. Its usage for an adapter of ActionRegistry type is extracted out of the CoreMultiDiagramEditor class into a new external adapter-factory in the infra.gmfdiag.gef bundle Tests all still pass (inasmuch as they do in the nightly master builds). Change-Id: I573dee5d9312d6e5746d74575350d0152b591ab3
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend4
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend2
-rw-r--r--plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java116
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF3
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java2
-rw-r--r--plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java2
-rw-r--r--plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath1
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF9
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties4
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java17
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/PageContext.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java320
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java207
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java14
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java98
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java7
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java114
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project28
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs291
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF21
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/about.html28
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/build.properties9
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/di.ecore (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore)436
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di)70
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di2 (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di2)1724
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.genmodel (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel)382
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.notation (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation)0
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.uml (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml)0
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.properties8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.xml (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml)55
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml14
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java)114
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java)116
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java)284
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java)3142
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java)130
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java)372
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java)124
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java)172
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java)544
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java)206
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java)176
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java)172
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java)270
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java)228
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/exception/SashEditorException.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/exception/SashEditorException.java)108
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java)362
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java)438
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java)774
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java)2088
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java)390
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java)1014
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java)382
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java)484
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java)1734
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java)838
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java)560
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java)484
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java)712
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java)632
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java)726
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceFactoryImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceFactoryImpl.java)94
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceImpl.java)68
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java)848
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/AbstractLocalPageService.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/service/AbstractLocalPageService.java)2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/BasicPageManagerImpl.java398
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/ILocalPageService.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/service/ILocalPageService.java)2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageManager.java)43
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/CompositePageRemovalValidator.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/CompositePageRemovalValidator.java)0
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java)92
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/PageRemovalValidator.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/PageRemovalValidator.java)0
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF22
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml364
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/schema/readme.txt5
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java41
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/sashmodel/BasicPageManagerServiceFactory.java69
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/sashmodel/TransactionalBasicPageManagerImpl.java102
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java20
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java9
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/spi/IContextualServiceRegistryTracker.java32
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java71
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java7
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java106
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/hyperlink/HyperlinkNavigationAction.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePageFactory.java4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePageService.java8
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/commands/AbstractWelcomePageHandler.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/commands/ResetWelcomePageHandler.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/commands/SaveDefaultWelcomePageHandler.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/commands/ShowWelcomePageHandler.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/dnd/WelcomeSectionTransfer.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/AbstractPageLayoutToggleValue.java6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/LanguagesObservableList.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/PrivateLayoutValue.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/RestoreActivePageValue.java2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/handler/CreateDiagramHandler.java4
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java19
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java10
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReferencedModelReadOnlyHandler.java2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml7
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/RemovePageHelper.java11
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/MoDiscoContentProvider.java2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java14
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForHandlers.java22
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeCreationDialog.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeEditionDialog.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditorsContributionItem.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandDescriptor.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandExtensionFactory.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/OpenDiagramCommand.java8
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/RenameDiagramHandler.java9
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java16
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/DiagramReloadContextProvider.java8
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/GmfEditorFactory.java8
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/PaletteViewerReloadContextProvider.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramOutlineAdapterFactory.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramOutlineReloadContextProvider.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramHelper.java16
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/internal/sync/UISyncServiceInitializer.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramPropertyTester.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/MDTUtil.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ViewServiceUtil.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportAllDiagramsEngine.java13
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportDiagramLocalPageService.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/SelectionHelper.java15
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.classpath7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.project28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.core.prefs291
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF21
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/about.html28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties21
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties13
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.xml26
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/pom.xml14
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/Activator.java50
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/CoreMultiDiagramEditorAdapterFactory.java49
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/MultiDiagramEditorGefDelegate.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java)52
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperLinkPopupBarEditPolicy.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/NavigationEditPolicy.java42
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/providers/SpecificViewContentProvider.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/AdvancedHLManager.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/LocalDefaultLinkDiagramTab.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/AbstractDiagramHandler.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menuContributor/OwnedDiagramsButton.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.xml2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/src/org/eclipse/papyrus/infra/gmfdiag/viewersearcher/DiagramViewerSearcher.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF4
-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.nattable.common/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/commands/CreateAndOpenTableEditorCommand.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NattableReloadContextProvider.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java13
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/RenameTableHandler.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java15
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java12
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF9
-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/handler/AbstractTableHandler.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.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/cell/StringResolutionProblemWrapperCellManager.java6
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractPasteInSelectionNattableCommandProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInNattableCommandProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInTableCommandProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellHelper.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java15
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java19
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF11
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java41
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/DelegatingUIExecutorService.java191
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java25
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java43
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java57
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/.classpath2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF33
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/build.properties4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/PapyrusLogo32x32.png (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/icons/papyrus/32x32/PapyrusLogo32x32.png)bin2001 -> 2001 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/Papyrus_32x32_t.gif (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/icons/papyrus/32x32/Papyrus_32x32_t.gif)bin1264 -> 1264 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus.gif (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/icons/papyrus/Papyrus.gif)bin561 -> 561 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus_16x16.gif (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/icons/papyrus/Papyrus_16x16.gif)bin561 -> 561 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties13
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml361
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/schema/contentOutline.exsd (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/schema/contentOutline.exsd)288
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd)22
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java47
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/ContentOutlineRegistry.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/IPapyrusContentOutlinePage.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/NestedEditorDelegatedOutlinePage.java)12
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/converter/AbstractStringValueConverter.java)13
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/converter/ConvertedValueContainer.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java (renamed from plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFStringValueConverter.java)28
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/converter/IStringValueConverter.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/converter/MultiConvertedValueContainer.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/converter/StringValueConverterStatus.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/dnd/PapyrusTransfer.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ContentProviderServiceFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java)90
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiSashModelManagerServiceFactory.java)8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiSashModelMngrServiceFactory.java)8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/IMultiDiagramEditor.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/IPapyrusPageInput.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/IReloadableEditor.java)20
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramEditorSelectionContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/MultiDiagramEditorSelectionContext.java)14
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramPropertySheetPage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/MultiDiagramPropertySheetPage.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageIconRegistryServiceFactory.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageMngrServiceFactory.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PapyrusPageInput.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/CompositeReloadContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/DelegatingReloadContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/EMFSelectionContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/EMFTreeViewerContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/EditorReloadAdapter.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/EditorReloadEvent.java)8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/IDisposableReloadContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/IEditorReloadListener.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IInternalEMFSelectionContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/IInternalEMFSelectionContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/IReloadContextProvider.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/SelectionContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/reload/TreeViewerContext.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactoryExtended.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistry.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistryExtended.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageIconsRegistry.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageModelFactoryRegistry.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/anytype/AnyTypeEditorFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/anytype/AnyTypeEditorFactory.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCondition.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/IModelCreationCommand.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/PerspectiveContextDependence.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/AbstractEditorFactory.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptor.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptorExtensionFactory.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorFactoryProxy.java)12
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorIconFactory.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorNotFoundException.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/IPluggableEditorFactory.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/MultiDiagramException.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/PluggableEditorFactoryReader.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/PageLayoutStorageState.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/commands/PageLayoutStorageState.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashLayoutCommandFactory.java)5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/TogglePageLayoutStorageHandler.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/commands/TogglePageLayoutStorageHandler.java)9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferencePage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/preferences/EditorPreferencePage.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferences.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/preferences/EditorPreferences.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/Messages.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/preferences/Messages.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/YesNo.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/preferences/YesNo.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/preferences/messages.properties)0
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/DoSaveEvent.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/IEditorInputChangedListener.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ILifeCycleEventsProvider.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveAndDirtyService.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveEventListener.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProvider.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProviderServiceFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/Messages.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/Messages.java)96
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/messages.properties (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/messages.properties)20
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/IActionBarContributorFactory.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/AbstractPapyrusPreferenceStore.java)8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/PapyrusScopedPreferenceStore.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractApplyValueOnPreferenceKeyDialog.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractPreferenceKeyDialog.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/EditorLifecycleEventListener.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/EditorLifecycleManager.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/Messages.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/Messages.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ResourceUpdateService.java)21
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/SaveLayoutBeforeClose.java)21
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/EditorLifecycleManagerImpl.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/EditorLifecycleManagerImpl.java)8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/InternalEditorLifecycleManager.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/InternalEditorLifecycleManager.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/messages.properties)0
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/AbstractCreateMenuFromCommandCategory.java)6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DisplayUtils.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java)18
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EditorHelper.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorUtils.java)18
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ICallableWithProgress.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/LocalMemento.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/LocalMemento.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusImageUtils.java)4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/SelectionHelper.java)2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtilsForActionHandlers.java)45
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java (renamed from plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtilsForWorkbenchPage.java)3
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java81
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/UIUtil.java)64
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java (renamed from plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/WorkbenchPartHelper.java)2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF9
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java7
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/UncontrolModeSaveListener.java8
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/service/ControlModeService.java9
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/OptionalMessageDialog.java11
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java8
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java13
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java4
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java2
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java2
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java2
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF3
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java2
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF6
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF3
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java2
-rw-r--r--plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorWizard.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/Activator.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/commands/SaveModelCommand.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/DecoratorModelsObservableList.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/Activator.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/commands/UnloadDecoratorModelHandler.java2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/providers/AvailableDecoratorModelsSnippet.java4
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/ActivityDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/commands/CreateActionLocalConditionViewCommand.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateActivityParameterNodeDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateAttributeDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateParameterDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/WarningAndLinkDialog.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityParameterAndParameterSynchronizer.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizer.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InterruptibleEdgeListener.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/ActivityDiagramContributionPolicyClass.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSection.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/ClassDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java31
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/ClassDiagramContributionPolicyClass.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/AbstractAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/InterfaceManagerDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/hyperlink/DirectedRelationshipSourceHyperlinkContributor.java34
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/hyperlink/DirectedRelationshipTargetHyperlinkContributor.java32
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/AbstractActionStateSourceProvider.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/resourceupdate/PartActivationListener.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/resourceupdate/ResourceUpdateService.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/resourceupdate/SaveListener.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PaletteProfileApplicationListener.java8
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/AbstractPreConditionAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/AssociationEndPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePropertiesInCompartmentPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/GraphicalPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ModelPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/SemanticPostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/StereotypePostAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLModelTester.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLSelectionTester.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/ComponentDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/CompositeDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/hyperlink/NestedPackageHyperlinkContributor.java31
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/hyperlink/NestingPackageHyperlinkContributor.java17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/DeploymentDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF7
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CreateSnapshotForInteractionFromViewDescriptorCommand.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CreateSnapshotFromContextMenuCommand.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/DiagramContentProvider.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/utils/CreateDiagramImage.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractGraphicalParametricAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractParametricAction.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGraphicalCommandHandler.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideRelatedLinkHandler.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/toolbar/ZoomToolbar.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/src/org/eclipse/papyrus/uml/diagram/modelexplorer/provider/DiagramContentProvider.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/InteractionUseUtil.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/AbstractModifcationTriggerListener.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/TimingDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UseCaseDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/CustomShortCutDiagramEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/schema/templates.exsd2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java8
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramKindPage.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/NotationTreeTableAxisManager.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/src/org/eclipse/papyrus/uml/nattable/xtext/valuespecification/manager/cell/ValueSpecificationCellManager.java15
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java8
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java2
-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/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/handler/AbstractEMFCommandHandler.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchLibraryHandler.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeApplicationRepairSnippet.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairService.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryDialog.java7
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java7
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/ZombieStereotypeDialogPresenter.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/ZombieStereotypesDialog.java13
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/AbstractPapyrusQuery.java21
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/handlers/AbstractCreateCommandHandler.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/handlers/AbstractCreateElementCommandHandler.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExtensionHelper.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/menu/AbstractCreateUmlChildMenu.java2
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/AbstractBaseHandler.java301
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF3
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contentassist/UmlStateProposalProvider.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLStringValueConverter.java20
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/model/UmlUtils.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContentProvider.java2
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF4
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/LinkHelper.java10
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPage.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerTreeViewerContext.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java61
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actionprovider/EditingDomainActionProvider.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/OpenWithMenu.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/MultiViewPageBookView.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java8
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/AbstractModelExplorerHandler.java6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CloseHandler.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DeleteCommandHandler.java14
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java15
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/listener/DoubleClickListener.java14
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java11
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/AbstractGetEditorIconQuery.java6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsOpenedPage.java9
-rw-r--r--plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF3
-rw-r--r--plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java2
-rw-r--r--plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF3
-rw-r--r--plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationView.java2
604 files changed, 15369 insertions, 13686 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
index 760b8b2e38c..590c26f7440 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
@@ -481,8 +481,8 @@ def selectionChanged (GenEditorView it)'''
«generatedMemberComment»
@Override
public void selectionChanged(org.eclipse.ui.IWorkbenchPart part, org.eclipse.jface.viewers.ISelection selection) {
- if (getSite().getPage().getActiveEditor() instanceof org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor) {
- org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor editor = (org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor) getSite().getPage().getActiveEditor();
+ if (getSite().getPage().getActiveEditor() instanceof org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor) {
+ org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor editor = (org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor) getSite().getPage().getActiveEditor();
// If not the active editor, ignore selection changed.
if (this.equals(editor.getActiveEditor())) {
updateActions(getSelectionActions());
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
index 47cf84a0fcd..90283e76a92 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
@@ -46,6 +46,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.gmfdiag.common,
org.eclipse.papyrus.uml.service.types,
org.eclipse.papyrus.infra.widgets,
+ org.eclipse.papyrus.infra.ui,
+ org.eclipse.papyrus.infra.core.sashwindows.di,
«IF printingEnabled» org.eclipse.gmf.runtime.diagram.ui.printing,
org.eclipse.gmf.runtime.diagram.ui.printing.render,
«ENDIF»
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java
deleted file mode 100644
index 585e65a24e8..00000000000
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.papyrus.elementtypesconfigurations.developer.generator;
-
-import com.google.common.collect.Iterables;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-@SuppressWarnings("all")
-public class ElementTypeRegistryGenerator {
- public static Iterable<EObject> allContentsIterable(final Resource resource) {
- TreeIterator<EObject> _allContents = resource.getAllContents();
- return IteratorExtensions.<EObject>toIterable(_allContents);
- }
-
- public static String camelToUnderScore(final String in) {
- String regex = "([a-z])([A-Z])";
- String replacement = "$1_$2";
- return in.replaceAll(regex, replacement);
- }
-
- public static String safeName(final String in) {
- String result = ElementTypeRegistryGenerator.camelToUnderScore(in);
- String _replaceAll = result.replaceAll("[^A-Za-z0-9]", "_");
- result = _replaceAll;
- String _replaceAll_1 = result.replaceAll("_{2,}", "_");
- result = _replaceAll_1;
- String _upperCase = result.toUpperCase();
- result = _upperCase;
- String _replaceAll_2 = result.replaceAll("UML_", "");
- result = _replaceAll_2;
- return result;
- }
-
- public static CharSequence generateRegistry(final Resource it, final String outputType) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("/*****************************************************************************");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* Copyright (c) 2014 CEA LIST.");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("*");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* All rights reserved. This program and the accompanying materials");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* are made available under the terms of the Eclipse Public License v1.0");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* which accompanies this distribution, and is available at");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* http://www.eclipse.org/legal/epl-v10.html");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("*");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* Contributors:");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("* \t\tCEA LIST - Initial API and implementation");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("*");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("*****************************************************************************/");
- _builder.newLine();
- _builder.append("import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;");
- _builder.newLine();
- _builder.append("import org.eclipse.gmf.runtime.emf.type.core.IHintedType;");
- _builder.newLine();
- _builder.newLine();
- _builder.append("public class ");
- _builder.append(outputType, "");
- _builder.append(" extends AbstractElementTypeEnumerator {");
- _builder.newLineIfNotEmpty();
- _builder.newLine();
- _builder.append("\t");
- _builder.append("/** Constant for UML nature */");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("public static final String UML_NATURE = \"UML_Nature\";");
- _builder.newLine();
- _builder.append("\t");
- _builder.newLine();
- {
- Iterable<EObject> _allContentsIterable = ElementTypeRegistryGenerator.allContentsIterable(it);
- Iterable<ElementTypeConfiguration> _filter = Iterables.<ElementTypeConfiguration>filter(_allContentsIterable, ElementTypeConfiguration.class);
- for(final ElementTypeConfiguration elementTypeConfiguration : _filter) {
- _builder.append("\t");
- _builder.append("public static final IHintedType ");
- String _name = elementTypeConfiguration.getName();
- String _safeName = ElementTypeRegistryGenerator.safeName(_name);
- String _upperCase = _safeName.toUpperCase();
- _builder.append(_upperCase, "\t");
- _builder.append(" = (IHintedType)getElementType(\"");
- String _identifier = elementTypeConfiguration.getIdentifier();
- _builder.append(_identifier, "\t");
- _builder.append("\"); //$NON-NLS-1$");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.newLine();
- }
- }
- _builder.newLine();
- _builder.append("}");
- _builder.newLine();
- return _builder;
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index 50466118b98..5800a5549da 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore.edit;bundle-version="2.9.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
com.google.guava;bundle-version="11.0.0",
- org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100"
+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
index 6bbd14fe10d..bd09f994fc3 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
@@ -34,9 +34,9 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.PlatformUI;
import org.eclipse.uml2.uml.Element;
diff --git a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
index 8615fee5bf2..3d066d90dad 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
+++ b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.editor;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;
import org.eclipse.ui.IEditorActionBarContributor;
diff --git a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
index cf889d72ff8..a1d532815ab 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
+++ b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.editor;
-import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;
/**
* Papyrus main MultiEditor. This class add GMF adaptation dedicated to Papyrus.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath
index cf9a62af9c3..badbd655541 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="custom-src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index ae5263cb498..3d881990d21 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -2,11 +2,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands,
org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils,
- org.eclipse.papyrus.infra.core.sashwindows.di,
- org.eclipse.papyrus.infra.core.sashwindows.di.exception,
- org.eclipse.papyrus.infra.core.sashwindows.di.impl,
- org.eclipse.papyrus.infra.core.sashwindows.di.util
+ org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
@@ -21,7 +17,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.5.0",
org.eclipse.uml2.types;visibility:=reexport,
org.eclipse.uml2.common;visibility:=reexport,
org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
index abbb33c3b41..f7235933ad9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
@@ -1,8 +1,8 @@
#
#Mon Sep 12 09:30:11 CEST 2011
output..=bin/
-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html
+bin.includes=.,META-INF/,plugin.properties,about.html
jars.compile.order=.
src.includes = about.html
-source..=src/,custom-src/
+source..=custom-src/
bin..=bin/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java
index 5737b1ff72a..2d242f0b080 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java
@@ -1,6 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013, 2015 Cedric Dumoulin, Christian W. Damus, and others.
- *
+ * Copyright (c) 2013, 2016 Cedric Dumoulin, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +8,7 @@
*
* Contributors:
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bug 469188
+ * Christian W. Damus - bugs 469188, 485220
*
*****************************************************************************/
@@ -21,8 +20,6 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.CurrentFolderAndPageManager;
@@ -34,6 +31,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.Tra
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
@@ -246,15 +244,6 @@ public class DiSashModelManager {
}
/**
- * Get the IPageMngr providing basic methods to manage Pages in the sash model.
- *
- * @return
- */
- public IPageMngr getIPageMngr() {
- return getIPageManager();
- }
-
- /**
* Get the IPageManager providing basic methods to manage Pages in the sash model.
*
* @return
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java
index 9fb452b4a0e..75a65785394 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java
@@ -17,13 +17,13 @@ package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageManagerImpl;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
index 1ae6b592b8c..c9a5991f9e7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
@@ -16,8 +16,8 @@ import java.util.Collections;
import java.util.Map;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/PageContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/PageContext.java
index e64c3890932..168a4877f9b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/PageContext.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/PageContext.java
@@ -17,13 +17,13 @@ import java.util.Collection;
import java.util.Collections;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.ISources;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
index bdf672416fc..9ce92353972 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
@@ -1,6 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
+ * Copyright (c) 2009, 2016 CEA LIST, LIFL, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,7 @@
*
* Contributors:
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
*
*****************************************************************************/
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
@@ -24,6 +23,7 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
/**
@@ -130,7 +130,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
* TabFolder.
*
* @param pageIdentifier
- * @deprecated Not used by SashContainer. Use {@link IPageMngr#addPage(Object)} instead
+ * @deprecated Not used by SashContainer. Use {@link IPageManager#openPage(Object)} instead
*/
@Deprecated
@Override
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java
index bb3b6a56c1f..9430edf2787 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java
@@ -16,28 +16,13 @@
package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.service.ILocalPageService;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator;
import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.BasicPageManagerImpl;
import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.FrameworkUtil;
/**
@@ -47,7 +32,16 @@ import org.osgi.framework.FrameworkUtil;
* @author cedric dumoulin
*
*/
-public class PageManagerImpl extends PageMngrImpl implements IPageManager {
+public class PageManagerImpl extends BasicPageManagerImpl {
+
+ /**
+ * An object used to get the current folder, or to ask to set the
+ * active page.
+ * This is usually backuped by the SashWindowContainer. <br>
+ */
+ private ICurrentFolderAndPageMngr folderAndPageMngr;
+
+ private ContentChangedEventProvider contentChangedEventProvider;
/**
* Constructor.
@@ -64,7 +58,10 @@ public class PageManagerImpl extends PageMngrImpl implements IPageManager {
*
*/
protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {
- super(diSashModel, contentChangedEventProvider);
+ super(diSashModel);
+
+ this.contentChangedEventProvider = contentChangedEventProvider;
+ this.folderAndPageMngr = new DefaultCurrentFolderAndPageMngr(diSashModel);
}
/**
@@ -78,233 +75,46 @@ public class PageManagerImpl extends PageMngrImpl implements IPageManager {
* the folder and page mngr
*/
protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {
- super(diSashModel, contentChangedEventProvider, folderAndPageMngr);
- }
+ super(diSashModel);
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager#closeAllOpenedPages(java.lang.Object)
- *
- * @param pageIdentifier
- */
- @Override
- public void closeAllOpenedPages(Object pageIdentifier) {
- while (isOpen(pageIdentifier)) {
- closePage(pageIdentifier);
- }
+ this.contentChangedEventProvider = contentChangedEventProvider;
+ this.folderAndPageMngr = folderAndPageMngr;
}
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#addPage(java.lang.Object)
- *
- * @param pageIdentifier
- */
@Override
- public void addPage(Object pageIdentifier) {
- // Nothing
+ protected TabFolder getCurrentFolder() {
+ return folderAndPageMngr.getCurrentFolder();
}
- /**
- * Reload the Diagram
- * This used when a resource is reloaded, the related diagrams are reloaded as well
- *
- * @see org.eclipse.papyrus.infra.services.controlmode.listener.LoadResourceSnippet
- *
- * @param diagramProxy
- * Identifier of the page to reload
- */
@Override
- public void reloadPage(Object diagramProxy) {
-
- if (diagramProxy instanceof EObject) {
-
- PageRef proxyRef = diSashModel.getSashModel().lookupPage(diagramProxy);
-
- if (proxyRef.eContainer() instanceof TabFolder) {
- TabFolder folder = (TabFolder) proxyRef.eContainer();
-
-
- if (folder != null) {
- if (folder.getChildren() != null) {
- // get the initial index of the Diagram Tab
- int i = folder.getChildren().indexOf(proxyRef);
-
- if (i >= 0) {
- // Create a new Page
- PageRef newRef = DiFactory.eINSTANCE.createPageRef();
- newRef.setEmfPageIdentifier((EObject) diagramProxy);
- // Replace the previous by the new one
- folder.getChildren().set(i, newRef);
- }
- }
- }
- }
- }
+ protected boolean isLegacyMode() {
+ // We are never in legacy mode even if there is a page list
+ return false;
}
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#allPages()
- *
- * @return
- */
@Override
- public List<Object> allPages() {
- // FIXME: Temporary, naive code. Need to implement a mechanism to contribute page providers
- List<Object> result = new LinkedList<Object>();
- List<Resource> notationResources = getResources("notation");
- for (Resource notationResource : notationResources) {
- for (EObject content : notationResource.getContents()) {
- if (isPage(content)) {
- result.add(content);
- }
- }
- }
-
-
- return result;
+ protected boolean isPage(EObject content) {
+ return Platform.getAdapterManager().getAdapter(content, IOpenable.class) != null;
}
- /**
- * Gets the local pages.
- *
- * @param model
- * the model
- * @return the local pages
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager#allLocalPages()
- */
@Override
- public List<Object> allLocalPages(ILocalPageService service) {
- List<Object> result = new LinkedList<Object>();
-
- List<Resource> notationResources = getResources("notation");
- for (Resource notationResource : notationResources) {
- for (EObject content : notationResource.getContents()) {
- if (isPage(content)) {
-
- if (service.isLocalPage(content)) {
- result.add(content);
- }
- }
- }
- }
-
- return result;
+ public void closePage(Object pageIdentifier) {
+ // Suppress event notifications
+ doExecute(() -> super.closePage(pageIdentifier));
}
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager#getAssociatedPages(org.eclipse.emf.common.util.URI)
- *
- * @param uriTrim
- * @return
- */
@Override
- public List<Object> getAssociatedPages(Object uriTrim) {
-
- List<Object> list = new ArrayList<Object>();
-
- SashModel sashModel = diSashModel.getSashModel();
- Iterator<?> iter = sashModel.eAllContents();
-
- while (iter.hasNext()) {
- Object next = iter.next();
- if (next instanceof PageRef) {
- PageRef pageRef = (PageRef) next;
-
- // pageRef is one of the pages referred into the sash resource
- if (pageRef != null) {
- EObject pageID = pageRef.getEmfPageIdentifier();
- if (pageID != null) {
- URI uriContainer;
- if (pageID.eIsProxy()) {
- InternalEObject internal = (InternalEObject) pageID;
- uriContainer = internal.eProxyURI().trimFragment().trimFileExtension();
-
- } else {
- uriContainer = pageID.eResource().getURI().trimFileExtension();
- }
- if (uriTrim instanceof URI) {
- if (uriContainer.equals(uriTrim)) {
- list.add(pageID);
- }
- }
- }
- }
-
- }
-
- }
- return list;
+ public void closeAllOpenedPages() {
+ // Suppress event notifications
+ doExecute(() -> super.closeAllOpenedPages());
}
- /**
- * Gets the resources.
- *
- * @param fileExtension
- * the file extension
- * @return the resources
- */
- private List<Resource> getResources(String fileExtension) {
- List<Resource> resourcesList = new LinkedList<Resource>();
-
- // Get resource set from Di Sash model
- ResourceSet resourceSet = diSashModel.eResource().getResourceSet();
-
- for (Resource resource : resourceSet.getResources()) {
-
- // Verify if the resource exist and is loaded
- if (resource != null && resource.isLoaded()) {
- // Verify if its extension correspond
- if (fileExtension.equals(resource.getURI().fileExtension())) {
- resourcesList.add(resource);
- }
-
- }
- }
-
- return resourcesList;
- }
-
- /**
- * Checks if is page.
- *
- * @param content
- * the content
- * @return true, if is page
- */
- private boolean isPage(EObject content) {
- return Platform.getAdapterManager().getAdapter(content, IOpenable.class) != null;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#openPage(java.lang.Object)
- *
- * @param pageIdentifier
- */
@Override
- public void openPage(Object pageIdentifier) {
- diSashModel.getSashModel().addPage(getCurrentFolder(), pageIdentifier);
+ public void closeOtherPages(Object pageIdentifier) {
+ // Suppress event notifications
+ doExecute(() -> super.closeOtherPages(pageIdentifier));
}
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager#openPage(java.lang.Object, java.lang.String)
- *
- * @param pageIdentifier
- * @param editorID
- */
- @Override
- public void openPage(Object pageIdentifier, String editorID) {
- PageRef newPage = DiFactory.eINSTANCE.createPageRef();
- newPage.setFavoriteEditor(editorID);
- newPage.setPageIdentifier(pageIdentifier);
- diSashModel.getSashModel().addPage(getCurrentFolder(), newPage);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager#selectPage(java.lang.Object)
- *
- * @param pageIdentifier
- */
@Override
public void selectPage(final Object pageIdentifier) {
Display.getDefault().syncExec(new Runnable() {
@@ -317,16 +127,6 @@ public class PageManagerImpl extends PageMngrImpl implements IPageManager {
}
/**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#removePage(java.lang.Object)
- *
- * @param pageIdentifier
- */
- @Override
- public void removePage(Object pageIdentifier) {
- closeAllOpenedPages(pageIdentifier);
- }
-
- /**
* Sets the current folder and page mngr.
*
* @param currentFolderAndPageMngr
@@ -337,57 +137,27 @@ public class PageManagerImpl extends PageMngrImpl implements IPageManager {
}
- /**
- * Executes an operation on my internal sash model.
- *
- * @param <T>
- * the generic type
- * @param sashModelOperation
- * the operation to execute
- * @return the operation's result
- * @throws IllegalAccessException
- * on attempt to execute an operation defined by a client bundle
- */
- public <T> T execute(SashModelOperation<T> sashModelOperation) throws IllegalAccessException {
+ @Override
+ protected <T> T doExecute(SashModelOperation<T> sashModelOperation) {
T result;
- if (FrameworkUtil.getBundle(sashModelOperation.getClass()) != Activator.getDefault().getBundle()) {
- throw new IllegalAccessException("Attempt to access bundle-private API."); //$NON-NLS-1$
- }
-
- ContentChangedEventProvider eventProvider = getContentChangedEventProvider();
- final boolean deliver = eventProvider.isDeliver();
+ final boolean deliver = contentChangedEventProvider.isDeliver();
- eventProvider.setDeliver(false);
+ contentChangedEventProvider.setDeliver(false);
try {
- result = sashModelOperation.execute(diSashModel);
+ result = super.doExecute(sashModelOperation);
} finally {
- eventProvider.setDeliver(deliver);
+ contentChangedEventProvider.setDeliver(deliver);
}
return result;
}
- //
- // Private interfaces
- //
-
- /**
- * An operation on the internal sash model of a page manager.
- *
- * @param <T>
- * the generic type
- */
- public static interface SashModelOperation<T> {
-
- /**
- * Execute.
- *
- * @param sashWindowsManager
- * the sash windows manager
- * @return the t
- */
- T execute(SashWindowsMngr sashWindowsManager);
+ private void doExecute(Runnable sashModelOperation) {
+ doExecute(ignored -> {
+ sashModelOperation.run();
+ return ignored;
+ });
}
} \ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java
deleted file mode 100644
index a23a6d8ffb5..00000000000
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 LIFL, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 433371
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-
-
-/**
- * Implementation of the page manager.
- * The page manager provides basic methods to access the DiSashModel and its PageList.
- * This is the users interface to add, open, close and remove pages.
- *
- * @author cedric dumoulin
- */
-public class PageMngrImpl implements IPageMngr {
-
- /** Internal EMF model */
- protected SashWindowsMngr diSashModel;
-
- /**
- * An object used to get the current folder, or to ask to set the
- * active page.
- * This is usually backuped by the SashWindowContainer. <br>
- */
- protected ICurrentFolderAndPageMngr folderAndPageMngr;
-
- private ContentChangedEventProvider contentChangedEventProvider;
-
- protected PageMngrImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {
- this.diSashModel = diSashModel;
- this.contentChangedEventProvider = contentChangedEventProvider;
- folderAndPageMngr = new DefaultCurrentFolderAndPageMngr(diSashModel);
- }
-
- protected PageMngrImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {
- this.diSashModel = diSashModel;
- this.contentChangedEventProvider = contentChangedEventProvider;
- this.folderAndPageMngr = folderAndPageMngr;
- }
-
- /**
- * Add a page to the PageList. Do not open the corresponding editor.
- * The page will be visible in the list.
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#addEditor(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- @Deprecated
- public void addPage(Object pageIdentifier) {
-
- // We do not need to disable event delivering,
- // as addition to pageList doesn't fire events.
-
- diSashModel.getPageList().addPage(pageIdentifier);
- }
-
- /**
- * Get the folder model {@link TabFolder} of the current folder.
- *
- * @return
- */
- protected TabFolder getCurrentFolder() {
- return folderAndPageMngr.getCurrentFolder();
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#allPages()
- *
- * @return
- */
- @Override
- public List<Object> allPages() {
- // TODO : use and return a shadow list ?
- List<Object> list = new ArrayList<Object>();
- for (PageRef pageRef : diSashModel.getPageList().getAvailablePage()) {
-
- list.add(pageRef.getPageIdentifier());
- }
- return list;
- }
-
- /**
- * Remove the page from the SashModel
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- public void closePage(Object pageIdentifier) {
-
- contentChangedEventProvider.setDeliver(false);
- diSashModel.getSashModel().removePageAndEmptyFolder(pageIdentifier);
- contentChangedEventProvider.setDeliver(true);
- }
-
- /**
- * Remove all pages from the SashModel. Left only the top level folder
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- public void closeAllOpenedPages() {
-
- contentChangedEventProvider.setDeliver(false);
- diSashModel.getSashModel().removeAllPages();
- contentChangedEventProvider.setDeliver(true);
-
- }
-
- /**
- * Remove all pages from the SashModel. Left only the top level folder
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- public void closeOtherPages(Object pageIdentifier) {
- contentChangedEventProvider.setDeliver(false);
- diSashModel.getSashModel().removeOtherPages(pageIdentifier);
- contentChangedEventProvider.setDeliver(true);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPage(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- public void openPage(Object pageIdentifier) {
- // Add the page to the SashModel and to the PageList
-
- // We do not need to disable event delivering as the operation already fired
- // one single event.
-
- Iterator<PageRef> iterator = diSashModel.getPageList().getAvailablePage().iterator();
- boolean found = false;
- while (iterator.hasNext() && found == false) {
- // Bug #288806 : the test should be inversed
- if (pageIdentifier.equals(iterator.next().getPageIdentifier())) {
- found = true;
- }
- }
- if (!found) {
- diSashModel.getPageList().addPage(pageIdentifier);
- }
- diSashModel.getSashModel().addPage(getCurrentFolder(), pageIdentifier);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#removePage(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- */
- @Override
- @Deprecated
- public void removePage(Object pageIdentifier) {
- // remove from pageList and from SashModel
- diSashModel.getPageList().removePage(pageIdentifier);
-
- contentChangedEventProvider.setDeliver(false);
- diSashModel.getSashModel().removePageAndEmptyFolder(pageIdentifier);
- contentChangedEventProvider.setDeliver(true);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#isOpen(java.lang.Object)
- * @param pageIdentifier
- * @return
- *
- */
- @Override
- public boolean isOpen(Object pageIdentifier) {
- return diSashModel.getSashModel().lookupPage(pageIdentifier) != null;
- }
-
- ContentChangedEventProvider getContentChangedEventProvider() {
- return contentChangedEventProvider;
- }
-
-}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
index b81764aedf9..ff49592f87e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
@@ -27,21 +29,21 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
*/
public class TransactionalPageManagerImpl extends PageManagerImpl {
- protected EditingDomain editingDomain;
+ private EditingDomain editingDomain;
public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {
super(diSashModel, contentChangedEventProvider);
+
+ this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);
}
public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {
super(diSashModel, contentChangedEventProvider, folderAndPageMngr);
+
+ this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);
}
protected EditingDomain getEditingDomain() {
- if (editingDomain == null) {
- editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);
- }
-
return editingDomain;
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java
index cac86d97047..a719de92179 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java
@@ -16,25 +16,11 @@
package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;
-import java.util.HashMap;
-import java.util.Map;
-
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl.SashModelOperation;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch;
/**
@@ -84,90 +70,6 @@ public class IPageUtils {
}
/**
- * Obtains a command that will close all of the pages in the given {@code pageManager} that reference the specified {@code pageIdentifier},
- * regardless of whether they still reference that identifier at the time of execution (this is the "memoization").
- *
- * @param domain
- * the editing domain in which the command will be executed
- * @param pageManager
- * the page manager for which to construct the command
- * @param pageIdentifier
- * the identifier of the page(s) to be removed
- *
- * @return the memoized close-all-pages command, or {@code null} if there are no pages to close
- */
- public static Command getMemoizedCloseAllPagesCommand(final TransactionalEditingDomain domain, final IPageManager pageManager, final Object pageIdentifier) {
- Command result = null;
-
- final PageManagerImpl pageMan = (PageManagerImpl) pageManager;
-
- final Map<PageRef, TabFolder> pages = execute(pageMan, new SashModelOperation<Map<PageRef, TabFolder>>() {
-
- @Override
- public Map<PageRef, TabFolder> execute(SashWindowsMngr sashWindowsManager) {
- return new DiSwitch<Map<PageRef, TabFolder>>() {
-
- private Map<PageRef, TabFolder> pages = new HashMap<PageRef, TabFolder>();
-
- @Override
- public Map<PageRef, TabFolder> defaultCase(EObject object) {
- for (EObject next : object.eContents()) {
- doSwitch(next);
- }
- return pages;
- }
-
- @Override
- public Map<PageRef, TabFolder> casePageRef(PageRef object) {
- if (object.getPageIdentifier() == pageIdentifier) {
- pages.put(object, object.getParent());
- }
- return pages;
- }
- }.doSwitch(sashWindowsManager.getSashModel());
- }
- });
-
-
- if (!pages.isEmpty()) {
- final SashModelOperation<Void> removeOp = new SashModelOperation<Void>() {
-
- @Override
- public Void execute(SashWindowsMngr sashWindowsManager) {
- SashModel sashModel = sashWindowsManager.getSashModel();
- for (Map.Entry<PageRef, TabFolder> next : pages.entrySet()) {
- PageRef page = next.getKey();
- TabFolder folder = next.getValue();
-
- folder.getChildren().remove(page);
- sashModel.removeEmptyFolder(folder);
- }
- return null;
- }
- };
-
- result = new RecordingCommand(domain, "Remove Editor Page(s)") { //$NON-NLS-1$
-
- @Override
- protected void doExecute() {
- IPageUtils.execute(pageMan, removeOp);
- }
- };
- }
-
- return result;
- }
-
- private static <T> T execute(PageManagerImpl pageManager, SashModelOperation<T> sashOperation) {
- try {
- return pageManager.execute(sashOperation);
- } catch (IllegalAccessException e) {
- // Won't happen because this is our own operation
- throw new IllegalAccessError(e.getLocalizedMessage());
- }
- }
-
- /**
* Queries whether the user should be permitted to close a {@code page}.
*
* @param page
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
index 4aacb6463d6..0254626caac 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;
@@ -24,8 +26,9 @@ import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
* This helper can be used to run (safe) transactions outside the CommandStack
*
* @author Camille Letavernier
- *
+ * @deprecated Use the {@code org.eclipse.papyrus.infra.core.util.TransactionHelper}, instead
*/
+@Deprecated
public class TransactionHelper {
public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
index 44f6d28ccd1..c741a7e7faf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
@@ -4,5 +4,5 @@
#
# $Id$
-pluginName = Papyrus Sashwindows di Model
+pluginName = Papyrus Sashwindows DI Content Provider
providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
index 969c4d16bae..b30c3ac802c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
@@ -1,11 +1,9 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.core.sasheditor,
org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.contentprovider.service,
org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
org.eclipse.papyrus.infra.core.sasheditor.editor,
org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor,
- org.eclipse.papyrus.infra.core.sasheditor.editor.gef,
org.eclipse.papyrus.infra.core.sasheditor.internal,
org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy,
org.eclipse.papyrus.infra.core.sasheditor.multipage.editor,
@@ -21,7 +19,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.e4.core.contexts;bundle-version="1.0.0";resolution:=optional,
org.eclipse.e4.ui.model.workbench;bundle-version="0.10.0";resolution:=optional,
org.eclipse.core.expressions;bundle-version="3.4.300",
- org.eclipse.gef;bundle-version="3.8.1",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
deleted file mode 100644
index 91e674901c7..00000000000
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
-
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
-
-
-/**
- * Interface providing method to manage pages in the Sash Windows system.
- * This interface can be provided by ContentProvider whishing to provide a standard
- * way to manage pages. This interface is not mandatory for the Sasheditor.
- * This interface provide basic access to the Sash Windows system.
- * It is intended to be used from the application in order to interact with the ContentProvider. Then,
- * the {@link SashWindowsContainer} will refresh its views.
- *
- *
- * @author dumoulin
- *
- * @deprecated Use IPageManager instead
- */
-@Deprecated
-public interface IPageMngr {
-
- /**
- * Add a Page identifier to the list of pages, do not open it.
- *
- * @param page
- * The object identifying the page to add. This object will be passed to the {@link IPageModelFactory#createIPageModel(EObject)}. This
- * identifier is stored in the sash model.
- * It should be a reference on a EMF object identifying the page.
- * @deprecated The pages are now computed dynamically
- */
- @Deprecated
- public void addPage(Object pageIdentifier);
-
- /**
- * Remove the page from the SashWindows system and from the list of page.
- * The page will not be available anymore.
- *
- * @param pageIdentifier
- * The object identifying the page
- *
- * @deprecated The pages are now computed dynamically. Use {@link IPageManager#closeAllOpenedPages(Object)} instead
- */
- @Deprecated
- public void removePage(Object pageIdentifier);
-
- /**
- * Close the page corresponding to the identifier.
- * The identifier is removed from the Sash Windows, but not from the list of pages.
- *
- * @param pageIdentifier
- * The object identifying the page
- */
- public void closePage(Object pageIdentifier);
-
-
- /**
- * Close all opened pages.
- *
- */
- public void closeAllOpenedPages();
-
- /**
- * Close all opened pages except the one provided as parameter.
- *
- * @param pageIdentifier
- */
- public void closeOtherPages(Object pageIdentifier);
-
- /**
- * Open a Page corresponding to the identifier. If the page is not in the list of pages, add it.
- * The identifier is first added to the current folder model. Then the Sash Windows should react and
- * ask the {@link IPageModelFactory} to create the IPageModel. This later is then used to create the
- * SWT page.
- * If
- *
- * @param page
- * The object identifying the page to add. This object will be passed to the {@link IPageModelFactory#createIPageModel(EObject)}. This
- * identifier is stored in the sash model.
- * It should be a reference on a EMF object identifying the page.
- */
- public void openPage(Object pageIdentifier);
-
- /**
- * Return all available page identifiers (open and closed pages).
- *
- * @return List of registered page identifiers.
- */
- public List<Object> allPages();
-
- /**
- * Return true if a page is open for the specified pageIdentifier.
- *
- * @param diagram
- * @return
- */
- public boolean isOpen(Object pageIdentifier);
-
-}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath
new file mode 100644
index 00000000000..50aae142c50
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project
new file mode 100644
index 00000000000..1efb06ad197
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.core.sashwindows.di</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4e7d0584e0b
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.core.sashwindows.di,
+ org.eclipse.papyrus.infra.core.sashwindows.di.exception,
+ org.eclipse.papyrus.infra.core.sashwindows.di.impl,
+ org.eclipse.papyrus.infra.core.sashwindows.di.service,
+ org.eclipse.papyrus.infra.core.sashwindows.di.util
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.5.0";visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sashwindows.di;singleton:=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>November 14, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/build.properties
new file mode 100644
index 00000000000..700accc4834
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/build.properties
@@ -0,0 +1,9 @@
+#
+#Mon Sep 12 09:30:11 CEST 2011
+output..=bin/
+bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html
+jars.compile.order=.
+src.includes = about.html
+source.. = src-gen/,\
+ src/
+bin..=bin/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/di.ecore
index 42cbafe650a..fe18fc920bd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/di.ecore
@@ -1,218 +1,218 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" nsPrefix="di">
- <eAnnotations source="resource=XMI"/>
- <eClassifiers xsi:type="ecore:EClass" name="SashModel">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Root node of the model describing the sash windows, panels and pages.&#xD;&#xA;A SashModel can have several windows containing panels separated by sashes. Such panels can be folders &#xD;&#xA;containing pages."/>
- </eAnnotations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="removePage" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="lookupPage" ordered="false" lowerBound="1" eType="#//PageRef">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Lookup the pageRef identified by the pageIdentifier.&#xD;&#xA;Return the pageRef or null if not found.&#xD;&#xA;Lookup in the entire SashModel structure."/>
- </eAnnotations>
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="movePage" ordered="false" lowerBound="1">
- <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="srcIndex" ordered="false" lowerBound="1" eType="#//int"/>
- <eParameters name="targetParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="targetIndex" ordered="false" lowerBound="1" eType="#//int"/>
- </eOperations>
- <eOperations name="insertFolder" ordered="false" lowerBound="1">
- <eParameters name="folderToInsert" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="refFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="refFolderSide" ordered="false" lowerBound="1" eType="#//int"/>
- </eOperations>
- <eOperations name="movePage" ordered="false" lowerBound="1">
- <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="srcIndex" ordered="false" lowerBound="1" eType="#//int"/>
- <eParameters name="targetParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- </eOperations>
- <eOperations name="removeEmptyFolder" ordered="false" lowerBound="1">
- <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- </eOperations>
- <eOperations name="removeAllPages" ordered="false" lowerBound="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Remove all pages from the model. Only left one empty top level folder."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="removeOtherPages" ordered="false" lowerBound="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Remove pages other than the one specified from the model. Intermediate folders are also removed."/>
- </eAnnotations>
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="lookupFirstWindow" ordered="false" lowerBound="1" eType="#//Window">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the first available window."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="lookupFirstFolder" ordered="false" lowerBound="1" eType="#//TabFolder">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Lookup the first available folder."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="removePageAndEmptyFolder" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="setCurrentSelectionSilently" ordered="false" lowerBound="1">
- <eParameters name="selection" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- </eOperations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
- <eParameters name="pageRef" ordered="false" lowerBound="1" eType="#//PageRef"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="windows" ordered="false"
- upperBound="-1" eType="#//Window" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" ordered="false"
- unique="false" lowerBound="1" eType="#//TabFolder"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="restoreActivePage" ordered="false"
- lowerBound="1" eType="#//boolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Window" eSuperTypes="#//PanelParent">
- <eStructuralFeatures xsi:type="ecore:EReference" name="position" ordered="false"
- unique="false" lowerBound="1" eType="#//Position"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="size" ordered="false" unique="false"
- lowerBound="1" eType="#//Size"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="panel" ordered="false"
- unique="false" lowerBound="1" eType="#//AbstractPanel" volatile="true" transient="true"
- derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Redefine children."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PanelParent" abstract="true">
- <eOperations name="replaceChild" ordered="false" lowerBound="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Replace the specified child by the new value.&#xD;&#xA;Don't need to be implemented in TabFolder.&#xD;&#xA;Used to insert a new SashPanel."/>
- </eAnnotations>
- <eParameters name="oldChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
- <eParameters name="newChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
- lowerBound="2" upperBound="2" eType="#//AbstractPanel" containment="true"
- eOpposite="#//AbstractPanel/parent"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractPanel" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
- unique="false" lowerBound="1" eType="#//PanelParent" eOpposite="#//PanelParent/children"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Position">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" unique="false"
- lowerBound="1" eType="#//int"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" unique="false"
- lowerBound="1" eType="#//int"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="int" instanceClassName="int">
- <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
- <details key="originalName" value="Integer"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Size">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false"
- unique="false" lowerBound="1" eType="#//int"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" ordered="false"
- unique="false" lowerBound="1" eType="#//int"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TabFolder" eSuperTypes="#//AbstractPanel">
- <eOperations name="movePage" ordered="false" lowerBound="1">
- <eParameters name="oldIndex" ordered="false" lowerBound="1" eType="#//int"/>
- <eParameters name="newIndex" ordered="false" lowerBound="1" eType="#//int"/>
- </eOperations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="removePage" ordered="false" lowerBound="1">
- <eParameters name="pageIndex" ordered="false" lowerBound="1" eType="#//int"/>
- </eOperations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="index" ordered="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="pageRef" ordered="false" lowerBound="1" eType="#//PageRef"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
- upperBound="-1" eType="#//PageRef" containment="true" eOpposite="#//PageRef/parent"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" ordered="false"
- eType="#//PageRef">
- <eAnnotations source="subsets" references="#//TabFolder/children"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PageRef">
- <eOperations name="isForIdentifier" ordered="false" lowerBound="1" eType="#//boolean">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="emfPageIdentifier" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageIdentifier" ordered="false"
- unique="false" lowerBound="1" eType="#//JavaObject" volatile="true" transient="true"
- derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="pageIdentifier can be a plain JavaObject or an EObject.&#xD;&#xA;They are not stored in the same place."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectPageIdentifier" ordered="false"
- unique="false" lowerBound="1" eType="#//JavaObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Storage to store Identifier that are not EObject."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="favoriteEditor" ordered="false"
- eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
- unique="false" eType="#//TabFolder" eOpposite="#//TabFolder/children"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="JavaObject" instanceClassName="java.lang.Object"/>
- <eClassifiers xsi:type="ecore:EDataType" name="boolean" instanceClassName="boolean"/>
- <eClassifiers xsi:type="ecore:EClass" name="SashPanel" eSuperTypes="#//AbstractPanel #//PanelParent">
- <eOperations name="setChildren" ordered="false" lowerBound="1">
- <eParameters name="leftChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
- <eParameters name="rightChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
- <eParameters name="direction" ordered="false" lowerBound="1" eType="#//int"/>
- </eOperations>
- <eOperations name="delete" ordered="false" lowerBound="1">
- <eParameters name="childToDelete" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="sashPosition" ordered="false"
- unique="false" lowerBound="1" eType="#//Float">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Position of the sash in the panel. The position is in percent. The value should be between 0 and 100."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"
- unique="false" lowerBound="1" eType="#//int"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="Float" instanceClassName="float"/>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractPage">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageIdentifier" ordered="false"
- unique="false" lowerBound="1" eType="#//JavaObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PageList">
- <eOperations name="addPage" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eOperations name="removePage" ordered="false" lowerBound="1">
- <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="availablePage" ordered="false"
- upperBound="-1" eType="#//PageRef" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SashWindowsMngr">
- <eStructuralFeatures xsi:type="ecore:EReference" name="pageList" ordered="false"
- unique="false" lowerBound="1" eType="#//PageList" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sashModel" ordered="false"
- unique="false" lowerBound="1" eType="#//SashModel" containment="true"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" nsPrefix="di">
+ <eAnnotations source="resource=XMI"/>
+ <eClassifiers xsi:type="ecore:EClass" name="SashModel">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Root node of the model describing the sash windows, panels and pages.&#xD;&#xA;A SashModel can have several windows containing panels separated by sashes. Such panels can be folders &#xD;&#xA;containing pages."/>
+ </eAnnotations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="removePage" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="lookupPage" ordered="false" lowerBound="1" eType="#//PageRef">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Lookup the pageRef identified by the pageIdentifier.&#xD;&#xA;Return the pageRef or null if not found.&#xD;&#xA;Lookup in the entire SashModel structure."/>
+ </eAnnotations>
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="movePage" ordered="false" lowerBound="1">
+ <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="srcIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ <eParameters name="targetParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="targetIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ </eOperations>
+ <eOperations name="insertFolder" ordered="false" lowerBound="1">
+ <eParameters name="folderToInsert" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="refFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="refFolderSide" ordered="false" lowerBound="1" eType="#//int"/>
+ </eOperations>
+ <eOperations name="movePage" ordered="false" lowerBound="1">
+ <eParameters name="srcParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="srcIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ <eParameters name="targetParentFolder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ </eOperations>
+ <eOperations name="removeEmptyFolder" ordered="false" lowerBound="1">
+ <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ </eOperations>
+ <eOperations name="removeAllPages" ordered="false" lowerBound="1">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Remove all pages from the model. Only left one empty top level folder."/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="removeOtherPages" ordered="false" lowerBound="1">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Remove pages other than the one specified from the model. Intermediate folders are also removed."/>
+ </eAnnotations>
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="lookupFirstWindow" ordered="false" lowerBound="1" eType="#//Window">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Get the first available window."/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="lookupFirstFolder" ordered="false" lowerBound="1" eType="#//TabFolder">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Lookup the first available folder."/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="removePageAndEmptyFolder" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="setCurrentSelectionSilently" ordered="false" lowerBound="1">
+ <eParameters name="selection" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ </eOperations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="folder" ordered="false" lowerBound="1" eType="#//TabFolder"/>
+ <eParameters name="pageRef" ordered="false" lowerBound="1" eType="#//PageRef"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="windows" ordered="false"
+ upperBound="-1" eType="#//Window" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" ordered="false"
+ unique="false" lowerBound="1" eType="#//TabFolder"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="restoreActivePage" ordered="false"
+ lowerBound="1" eType="#//boolean"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Window" eSuperTypes="#//PanelParent">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="position" ordered="false"
+ unique="false" lowerBound="1" eType="#//Position"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="size" ordered="false" unique="false"
+ lowerBound="1" eType="#//Size"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="panel" ordered="false"
+ unique="false" lowerBound="1" eType="#//AbstractPanel" volatile="true" transient="true"
+ derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Redefine children."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PanelParent" abstract="true">
+ <eOperations name="replaceChild" ordered="false" lowerBound="1">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Replace the specified child by the new value.&#xD;&#xA;Don't need to be implemented in TabFolder.&#xD;&#xA;Used to insert a new SashPanel."/>
+ </eAnnotations>
+ <eParameters name="oldChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
+ <eParameters name="newChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
+ lowerBound="2" upperBound="2" eType="#//AbstractPanel" containment="true"
+ eOpposite="#//AbstractPanel/parent"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractPanel" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
+ unique="false" lowerBound="1" eType="#//PanelParent" eOpposite="#//PanelParent/children"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Position">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" unique="false"
+ lowerBound="1" eType="#//int"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" unique="false"
+ lowerBound="1" eType="#//int"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="int" instanceClassName="int">
+ <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <details key="originalName" value="Integer"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Size">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false"
+ unique="false" lowerBound="1" eType="#//int"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" ordered="false"
+ unique="false" lowerBound="1" eType="#//int"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TabFolder" eSuperTypes="#//AbstractPanel">
+ <eOperations name="movePage" ordered="false" lowerBound="1">
+ <eParameters name="oldIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ <eParameters name="newIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ </eOperations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="removePage" ordered="false" lowerBound="1">
+ <eParameters name="pageIndex" ordered="false" lowerBound="1" eType="#//int"/>
+ </eOperations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="index" ordered="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="pageRef" ordered="false" lowerBound="1" eType="#//PageRef"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
+ upperBound="-1" eType="#//PageRef" containment="true" eOpposite="#//PageRef/parent"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" ordered="false"
+ eType="#//PageRef">
+ <eAnnotations source="subsets" references="#//TabFolder/children"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PageRef">
+ <eOperations name="isForIdentifier" ordered="false" lowerBound="1" eType="#//boolean">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="emfPageIdentifier" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageIdentifier" ordered="false"
+ unique="false" lowerBound="1" eType="#//JavaObject" volatile="true" transient="true"
+ derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="pageIdentifier can be a plain JavaObject or an EObject.&#xD;&#xA;They are not stored in the same place."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectPageIdentifier" ordered="false"
+ unique="false" lowerBound="1" eType="#//JavaObject">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Storage to store Identifier that are not EObject."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="favoriteEditor" ordered="false"
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
+ unique="false" eType="#//TabFolder" eOpposite="#//TabFolder/children"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="JavaObject" instanceClassName="java.lang.Object"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="boolean" instanceClassName="boolean"/>
+ <eClassifiers xsi:type="ecore:EClass" name="SashPanel" eSuperTypes="#//AbstractPanel #//PanelParent">
+ <eOperations name="setChildren" ordered="false" lowerBound="1">
+ <eParameters name="leftChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
+ <eParameters name="rightChild" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
+ <eParameters name="direction" ordered="false" lowerBound="1" eType="#//int"/>
+ </eOperations>
+ <eOperations name="delete" ordered="false" lowerBound="1">
+ <eParameters name="childToDelete" ordered="false" lowerBound="1" eType="#//AbstractPanel"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sashPosition" ordered="false"
+ unique="false" lowerBound="1" eType="#//Float">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Position of the sash in the panel. The position is in percent. The value should be between 0 and 100."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"
+ unique="false" lowerBound="1" eType="#//int"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="Float" instanceClassName="float"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractPage">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageIdentifier" ordered="false"
+ unique="false" lowerBound="1" eType="#//JavaObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PageList">
+ <eOperations name="addPage" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eOperations name="removePage" ordered="false" lowerBound="1">
+ <eParameters name="pageIdentifier" ordered="false" lowerBound="1" eType="#//JavaObject"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="availablePage" ordered="false"
+ upperBound="-1" eType="#//PageRef" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SashWindowsMngr">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pageList" ordered="false"
+ unique="false" lowerBound="1" eType="#//PageList" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sashModel" ordered="false"
+ unique="false" lowerBound="1" eType="#//SashModel" containment="true"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di
index 5efd747784a..aaa346654af 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="sashwindowsdi.notation#_lk72EG8gEeKx9Kegn5X27A"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
- </children>
- <children>
- <emfPageIdentifier href="sashwindowsdi.notation#_lk72EG8gEeKx9Kegn5X27A"/>
- </children>
- <children>
- <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
- </children>
- <children>
- <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList>
+ <availablePage>
+ <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
+ </availablePage>
+ <availablePage>
+ <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
+ </availablePage>
+ <availablePage>
+ <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
+ </availablePage>
+ <availablePage>
+ <emfPageIdentifier href="sashwindowsdi.notation#_lk72EG8gEeKx9Kegn5X27A"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="sashwindowsdi.notation#_xRNpEGyFEeKx9Kegn5X27A"/>
+ </children>
+ <children>
+ <emfPageIdentifier href="sashwindowsdi.notation#_lk72EG8gEeKx9Kegn5X27A"/>
+ </children>
+ <children>
+ <emfPageIdentifier href="sashwindowsdi.notation#_0m_xwGyIEeKx9Kegn5X27A"/>
+ </children>
+ <children>
+ <emfPageIdentifier href="sashwindowsdi.notation#_CCrlsGyHEeKx9Kegn5X27A"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di2 b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di2
index 69f634adc89..487e44caa67 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.di2
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.di2
@@ -1,862 +1,862 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML">
- <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
- </owner>
- </di2:Diagram>
- <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="overview" type="ClassDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="157:209" size="207:284">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_wdFgUEV4Ed6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="243:310" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_m7xPsEa4Ed6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="290:330" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_e9ojYEbXEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="281:344" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_q8zekEbsEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="288:366" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_vnqNcEoIEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="254:381" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_Kvf9cEoJEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="234:399" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_OoMtUEoJEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_vaMqoE4OEd-B2uXHu4qMXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_1jUIgE4PEd-B2uXHu4qMXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_4qi_ME4PEd-B2uXHu4qMXg"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_UiIMMEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="364:285" graphEdge="/1/@contained.8"/>
- <anchorage position="301:208" graphEdge="/1/@contained.15"/>
- <anchorage position="156:278" graphEdge="/1/@contained.19"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="446:233" size="158:105">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_yWfIQESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_z0glcESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_Xa5wIEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="445:285" graphEdge="/1/@contained.8"/>
- <anchorage position="525:232" graphEdge="/1/@contained.12"/>
- <anchorage position="604:280" graphEdge="/1/@contained.28"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="741:231" size="151:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_Zx2ZYEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="808:331" graphEdge="/1/@contained.6"/>
- <anchorage position="825:331" graphEdge="/1/@contained.7"/>
- <anchorage position="811:230" graphEdge="/1/@contained.9"/>
- <anchorage position="740:280" graphEdge="/1/@contained.28"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="619:437" size="178:159">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_8rplQESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_1nx64EbpEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_eGcSEEoLEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_tzrhgEuAEd6kcPOdk0bn7w"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_eE7YIEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="741:436" graphEdge="/1/@contained.6"/>
- <anchorage position="689:436" graphEdge="/1/@contained.27"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="830:434" size="162:143">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_Cqh_oEViEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="940:489" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_oZu3cEWEEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="910:531" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_oEQBQEblEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_fbWYgEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="882:433" graphEdge="/1/@contained.7"/>
- <anchorage position="992:486" graphEdge="/1/@contained.10"/>
- <anchorage position="916:433" graphEdge="/1/@contained.15"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1082:433" size="211:160">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <property key="PropStereoDisplay" value="Ecore::EAttribute"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_GrqUYEnkEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_RkM5UEnmEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1165:506" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_BxkKcEbaEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_h_HVwEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="1081:486" graphEdge="/1/@contained.10"/>
- <anchorage position="1167:593" graphEdge="/1/@contained.13"/>
- <anchorage position="1293:517" graphEdge="/1/@contained.26"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.3/@anchorage.0 /1/@contained.2/@anchorage.0">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_7VZokEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.4/@anchorage.0 /1/@contained.2/@anchorage.1">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_71vVgEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.0 /1/@contained.1/@anchorage.0">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-73:6" size="74:34">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-30:-21" size="22:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_9JomUEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.11/@anchorage.1 /1/@contained.2/@anchorage.2">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:0" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="8:-36" size="68:34">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1:-31" size="58:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-32:-23" size="24:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#__CVNUEJVEd6kIY39uis5Uw"/>
- </semanticModel>
- <waypoints>810:142</waypoints>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.4/@anchorage.1 /1/@contained.5/@anchorage.0">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-77:8" size="68:34">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_AM_CkEJWEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="496:57" size="242:120">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_yG3I4EoKEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_86BAgEJWEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="610:177" graphEdge="/1/@contained.12"/>
- <anchorage position="738:142" graphEdge="/1/@contained.9"/>
- <anchorage position="636:177" graphEdge="/1/@contained.27"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.1/@anchorage.1 /1/@contained.11/@anchorage.0">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_95DboEJWEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.16/@anchorage.0 /1/@contained.5/@anchorage.1">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:0" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="14:7" size="107:34">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_viyZUEJZEd6kIY39uis5Uw"/>
- </semanticModel>
- <waypoints>228:672</waypoints>
- <waypoints>1167:672</waypoints>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1400:550" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
- </semanticModel>
- <anchorage position="1399:562" graphEdge="/1/@contained.26"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.1 /1/@contained.4/@anchorage.2">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="10:-28" size="123:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-35:-38" size="24:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_mT2jkEJkEd6kIY39uis5Uw"/>
- </semanticModel>
- <waypoints>301:34</waypoints>
- <waypoints>914:35</waypoints>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="159:515" size="261:118">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="221:434" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_i92ooEa4Ed6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="310:453" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_ocolgEa4Ed6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_b7a4cEMaEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="229:633" graphEdge="/1/@contained.13"/>
- <anchorage position="158:577" graphEdge="/1/@contained.18"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="8:101" size="151:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_-9vywEMaEd6kIY39uis5Uw"/>
- </semanticModel>
- <anchorage position="116:201" graphEdge="/1/@contained.19"/>
- <anchorage position="59:201" graphEdge="/1/@contained.18"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.17/@anchorage.1 /1/@contained.16/@anchorage.1">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-79:-27" size="72:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_9k0bgEMbEd6kIY39uis5Uw"/>
- </semanticModel>
- <waypoints>58:578</waypoints>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.17/@anchorage.0 /1/@contained.0/@anchorage.2">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-87:-38" size="87:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-27:10" size="24:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_-EQwkEMbEd6kIY39uis5Uw"/>
- </semanticModel>
- <waypoints>116:278</waypoints>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1044:55" size="182:120">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_m9q14ESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_pmDNYESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_jc9vQESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1049:182" size="187:88">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_s1CR4ESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="252"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Property" href="sashwindowsdi.uml#_vnZr0ESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="sashwindowsdi.uml#_lh4NUESDEd6kIY39uis5Uw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1055:284" size="191:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="PropStereoDisplay" value="Ecore::EDataType"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_Hkk78EVbEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1329:290" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="PropStereoDisplay" value="Ecore::EDataType"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_A-BP8EVhEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1309:179" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="PropStereoDisplay" value="Ecore::EDataType"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_IEBx4EV4Ed6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1368:436" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="PropStereoDisplay" value="Ecore::EDataType"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_SNSWAEbaEd6g-YgfS2DHrA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.5/@anchorage.2 /1/@contained.14/@anchorage.0">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-98:16" size="130:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-48:-21" size="24:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_b3enUEnjEd6ussMWxXGeXg"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.3/@anchorage.1 /1/@contained.11/@anchorage.2">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_UH6OsEsDEd6MxdnlcgT3eA"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.1/@anchorage.2 /1/@contained.2/@anchorage.3">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- <property key="PropStereoDisplay" value="Ecore::EReference"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- <property key="custom_disp" value="1166"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-35:-25" size="24:17">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
- <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
- <property key="QUALIFIED_NAME_DEPTH" value="0"/>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Association" href="sashwindowsdi.uml#_li3-0EsFEd6MxdnlcgT3eA"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
- </owner>
- </di2:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML">
+ <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
+ <owner xsi:type="di2:Uml1SemanticModelBridge">
+ <element xsi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
+ </owner>
+ </di2:Diagram>
+ <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="overview" type="ClassDiagram">
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="157:209" size="207:284">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_wdFgUEV4Ed6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="243:310" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_m7xPsEa4Ed6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="290:330" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_e9ojYEbXEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="281:344" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_q8zekEbsEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="288:366" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_vnqNcEoIEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="254:381" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_Kvf9cEoJEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="234:399" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_OoMtUEoJEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_vaMqoE4OEd-B2uXHu4qMXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_1jUIgE4PEd-B2uXHu4qMXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_4qi_ME4PEd-B2uXHu4qMXg"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_UiIMMEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="364:285" graphEdge="/1/@contained.8"/>
+ <anchorage position="301:208" graphEdge="/1/@contained.15"/>
+ <anchorage position="156:278" graphEdge="/1/@contained.19"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="446:233" size="158:105">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_yWfIQESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_z0glcESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_Xa5wIEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="445:285" graphEdge="/1/@contained.8"/>
+ <anchorage position="525:232" graphEdge="/1/@contained.12"/>
+ <anchorage position="604:280" graphEdge="/1/@contained.28"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="741:231" size="151:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_Zx2ZYEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="808:331" graphEdge="/1/@contained.6"/>
+ <anchorage position="825:331" graphEdge="/1/@contained.7"/>
+ <anchorage position="811:230" graphEdge="/1/@contained.9"/>
+ <anchorage position="740:280" graphEdge="/1/@contained.28"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="619:437" size="178:159">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_8rplQESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_1nx64EbpEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_eGcSEEoLEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_tzrhgEuAEd6kcPOdk0bn7w"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_eE7YIEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="741:436" graphEdge="/1/@contained.6"/>
+ <anchorage position="689:436" graphEdge="/1/@contained.27"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="830:434" size="162:143">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_Cqh_oEViEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="940:489" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_oZu3cEWEEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="910:531" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_oEQBQEblEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_fbWYgEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="882:433" graphEdge="/1/@contained.7"/>
+ <anchorage position="992:486" graphEdge="/1/@contained.10"/>
+ <anchorage position="916:433" graphEdge="/1/@contained.15"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1082:433" size="211:160">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <property key="PropStereoDisplay" value="Ecore::EAttribute"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_GrqUYEnkEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_RkM5UEnmEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1165:506" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_BxkKcEbaEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_h_HVwEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="1081:486" graphEdge="/1/@contained.10"/>
+ <anchorage position="1167:593" graphEdge="/1/@contained.13"/>
+ <anchorage position="1293:517" graphEdge="/1/@contained.26"/>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.3/@anchorage.0 /1/@contained.2/@anchorage.0">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_7VZokEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.4/@anchorage.0 /1/@contained.2/@anchorage.1">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_71vVgEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.0 /1/@contained.1/@anchorage.0">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-73:6" size="74:34">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-30:-21" size="22:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_9JomUEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.11/@anchorage.1 /1/@contained.2/@anchorage.2">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:0" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="8:-36" size="68:34">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1:-31" size="58:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-32:-23" size="24:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#__CVNUEJVEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <waypoints>810:142</waypoints>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.4/@anchorage.1 /1/@contained.5/@anchorage.0">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-77:8" size="68:34">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_AM_CkEJWEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="496:57" size="242:120">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_yG3I4EoKEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_86BAgEJWEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="610:177" graphEdge="/1/@contained.12"/>
+ <anchorage position="738:142" graphEdge="/1/@contained.9"/>
+ <anchorage position="636:177" graphEdge="/1/@contained.27"/>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.1/@anchorage.1 /1/@contained.11/@anchorage.0">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_95DboEJWEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.16/@anchorage.0 /1/@contained.5/@anchorage.1">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:0" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="14:7" size="107:34">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_viyZUEJZEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <waypoints>228:672</waypoints>
+ <waypoints>1167:672</waypoints>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1400:550" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
+ </semanticModel>
+ <anchorage position="1399:562" graphEdge="/1/@contained.26"/>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.1 /1/@contained.4/@anchorage.2">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="10:-28" size="123:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-35:-38" size="24:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_mT2jkEJkEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <waypoints>301:34</waypoints>
+ <waypoints>914:35</waypoints>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="159:515" size="261:118">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="221:434" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_i92ooEa4Ed6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="310:453" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Operation" href="sashwindowsdi.uml#_ocolgEa4Ed6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_b7a4cEMaEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="229:633" graphEdge="/1/@contained.13"/>
+ <anchorage position="158:577" graphEdge="/1/@contained.18"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="8:101" size="151:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_-9vywEMaEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <anchorage position="116:201" graphEdge="/1/@contained.19"/>
+ <anchorage position="59:201" graphEdge="/1/@contained.18"/>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.17/@anchorage.1 /1/@contained.16/@anchorage.1">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-79:-27" size="72:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_9k0bgEMbEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <waypoints>58:578</waypoints>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.17/@anchorage.0 /1/@contained.0/@anchorage.2">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-87:-38" size="87:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-27:10" size="24:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_-EQwkEMbEd6kIY39uis5Uw"/>
+ </semanticModel>
+ <waypoints>116:278</waypoints>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1044:55" size="182:120">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_m9q14ESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_pmDNYESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_jc9vQESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1049:182" size="187:88">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_s1CR4ESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="252"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Property" href="sashwindowsdi.uml#_vnZr0ESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Class" href="sashwindowsdi.uml#_lh4NUESDEd6kIY39uis5Uw"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1055:284" size="191:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="PropStereoDisplay" value="Ecore::EDataType"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_Hkk78EVbEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1329:290" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="PropStereoDisplay" value="Ecore::EDataType"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_A-BP8EVhEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1309:179" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="PropStereoDisplay" value="Ecore::EDataType"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_IEBx4EV4Ed6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1368:436" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="PropStereoDisplay" value="Ecore::EDataType"/>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:PrimitiveType" href="sashwindowsdi.uml#_SNSWAEbaEd6g-YgfS2DHrA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.5/@anchorage.2 /1/@contained.14/@anchorage.0">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-98:16" size="130:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-48:-21" size="24:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_b3enUEnjEd6ussMWxXGeXg"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.3/@anchorage.1 /1/@contained.11/@anchorage.2">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Generalization" href="sashwindowsdi.uml#_UH6OsEsDEd6MxdnlcgT3eA"/>
+ </semanticModel>
+ </contained>
+ <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.1/@anchorage.2 /1/@contained.2/@anchorage.3">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ <property key="PropStereoDisplay" value="Ecore::EReference"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ <property key="custom_disp" value="1166"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-35:-25" size="24:17">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100">
+ <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+ <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+ </contained>
+ <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+ <element xsi:type="uml:Association" href="sashwindowsdi.uml#_li3-0EsFEd6MxdnlcgT3eA"/>
+ </semanticModel>
+ </contained>
+ <owner xsi:type="di2:Uml1SemanticModelBridge">
+ <element xsi:type="uml:Model" href="sashwindowsdi.uml#_NuHhwEJVEd6kIY39uis5Uw"/>
+ </owner>
+ </di2:Diagram>
+</xmi:XMI>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.genmodel
index 1673dbb947d..df767c77bd6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.genmodel
@@ -1,190 +1,192 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
- modelDirectory="/org.eclipse.papyrus.infra.core.sasheditor.di/src"
- modelPluginID="org.eclipse.papyrus.infra.core.sasheditor.di" modelName="Sashwindowsdi"
- codeFormatting="true" commentFormatting="true" importerID="org.eclipse.uml2.uml.ecore.importer"
- complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types"
- cleanup="true">
- <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
- <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
- <details key="UNION_PROPERTIES" value="PROCESS"/>
- <details key="DUPLICATE_FEATURES" value="DISCARD"/>
- <details key="SUBSETTING_PROPERTIES" value="PROCESS"/>
- <details key="COMMENTS" value="PROCESS"/>
- <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
- <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
- <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
- <details key="REDEFINING_PROPERTIES" value="PROCESS"/>
- <details key="ANNOTATION_DETAILS" value="PROCESS"/>
- <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
- <details key="REDEFINING_OPERATIONS" value="PROCESS"/>
- <details key="DERIVED_FEATURES" value="PROCESS"/>
- <details key="OPERATION_BODIES" value="IGNORE"/>
- <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
- <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
- <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
- <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
- <details key="NON_API_INVARIANTS" value="IGNORE"/>
- <details key="UNTYPED_PROPERTIES" value="REPORT"/>
- <details key="INVOCATION_DELEGATES" value="IGNORE"/>
- <details key="VALIDATION_DELEGATES" value="IGNORE"/>
- </genAnnotations>
- <foreignModel>sashwindowsdi.uml</foreignModel>
- <genPackages xsi:type="genmodel:GenPackage" prefix="Di" basePackage="org.eclipse.papyrus.infra.core.sashwindows"
- resource="XMI" disposableProviderFactory="true" ecorePackage="di.ecore#/">
- <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//int"/>
- <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//JavaObject"/>
- <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//boolean"/>
- <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//Float"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashModel">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashModel/windows"/>
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//SashModel/currentSelection"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashModel/restoreActivePage"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removePage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removePage/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupPage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/lookupPage/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/movePage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/srcParentFolder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/srcIndex"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/targetParentFolder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/targetIndex"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/insertFolder">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/folderToInsert"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/refFolder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/refFolderSide"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/movePage.1">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/srcParentFolder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/srcIndex"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/targetParentFolder"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeEmptyFolder">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removeEmptyFolder/folder"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeAllPages"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeOtherPages">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removeOtherPages/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstWindow"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstFolder"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removePageAndEmptyFolder">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removePageAndEmptyFolder/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/setCurrentSelectionSilently">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/setCurrentSelectionSilently/selection"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage.1">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.1/folder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.1/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage.2">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.2/folder"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.2/pageRef"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Window">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/position"/>
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/size"/>
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/panel"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="di.ecore#//PanelParent">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//PanelParent/children"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PanelParent/replaceChild">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PanelParent/replaceChild/oldChild"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PanelParent/replaceChild/newChild"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="di.ecore#//AbstractPanel">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
- ecoreFeature="ecore:EReference di.ecore#//AbstractPanel/parent"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Position">
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Position/x"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Position/y"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Size">
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Size/width"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Size/length"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//TabFolder">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//TabFolder/children"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="true" propertySortChoices="true"
- ecoreFeature="ecore:EReference di.ecore#//TabFolder/currentSelection"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/movePage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/movePage/oldIndex"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/movePage/newIndex"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/removePage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/removePage/pageIndex"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage.1">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.1/index"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.1/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage.2">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.2/pageRef"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//PageRef">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//PageRef/emfPageIdentifier"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/pageIdentifier"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/objectPageIdentifier"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/favoriteEditor"/>
- <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
- ecoreFeature="ecore:EReference di.ecore#//PageRef/parent"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageRef/isForIdentifier">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageRef/isForIdentifier/pageIdentifier"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashPanel">
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashPanel/sashPosition"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashPanel/direction"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashPanel/setChildren">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/leftChild"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/rightChild"/>
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/direction"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashPanel/delete">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/delete/childToDelete"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//AbstractPage">
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//AbstractPage/pageIdentifier"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//PageList">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//PageList/availablePage"/>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageList/addPage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageList/addPage/pageIdentifier"/>
- </genOperations>
- <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageList/removePage">
- <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageList/removePage/pageIdentifier"/>
- </genOperations>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashWindowsMngr">
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashWindowsMngr/pageList"/>
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashWindowsMngr/sashModel"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+ modelDirectory="/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen"
+ editDirectory="/org.eclipse.papyrus.infra.core.sashwindows.di.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.core.sashwindows.di.editor/src-gen"
+ modelPluginID="org.eclipse.papyrus.infra.core.sashwindows.di" modelName="Sashwindowsdi"
+ codeFormatting="true" commentFormatting="true" testsDirectory="/org.eclipse.papyrus.infra.core.sashwindows.di.tests/src-gen"
+ importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="5.0" copyrightFields="false"
+ usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types"
+ cleanup="true">
+ <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+ <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+ <details key="UNION_PROPERTIES" value="PROCESS"/>
+ <details key="DUPLICATE_FEATURES" value="DISCARD"/>
+ <details key="SUBSETTING_PROPERTIES" value="PROCESS"/>
+ <details key="COMMENTS" value="PROCESS"/>
+ <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+ <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+ <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+ <details key="REDEFINING_PROPERTIES" value="PROCESS"/>
+ <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+ <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+ <details key="REDEFINING_OPERATIONS" value="PROCESS"/>
+ <details key="DERIVED_FEATURES" value="PROCESS"/>
+ <details key="OPERATION_BODIES" value="IGNORE"/>
+ <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+ <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+ <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
+ <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
+ <details key="NON_API_INVARIANTS" value="IGNORE"/>
+ <details key="UNTYPED_PROPERTIES" value="REPORT"/>
+ <details key="INVOCATION_DELEGATES" value="IGNORE"/>
+ <details key="VALIDATION_DELEGATES" value="IGNORE"/>
+ </genAnnotations>
+ <foreignModel>sashwindowsdi.uml</foreignModel>
+ <genPackages xsi:type="genmodel:GenPackage" prefix="Di" basePackage="org.eclipse.papyrus.infra.core.sashwindows"
+ resource="XMI" disposableProviderFactory="true" ecorePackage="di.ecore#/">
+ <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//int"/>
+ <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//JavaObject"/>
+ <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//boolean"/>
+ <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="di.ecore#//Float"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashModel">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashModel/windows"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//SashModel/currentSelection"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashModel/restoreActivePage"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removePage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removePage/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupPage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/lookupPage/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/movePage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/srcParentFolder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/srcIndex"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/targetParentFolder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage/targetIndex"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/insertFolder">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/folderToInsert"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/refFolder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/insertFolder/refFolderSide"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/movePage.1">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/srcParentFolder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/srcIndex"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/movePage.1/targetParentFolder"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeEmptyFolder">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removeEmptyFolder/folder"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeAllPages"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removeOtherPages">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removeOtherPages/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstWindow"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/lookupFirstFolder"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/removePageAndEmptyFolder">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/removePageAndEmptyFolder/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/setCurrentSelectionSilently">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/setCurrentSelectionSilently/selection"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage.1">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.1/folder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.1/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashModel/addPage.2">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.2/folder"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashModel/addPage.2/pageRef"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Window">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/position"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/size"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//Window/panel"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="di.ecore#//PanelParent">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//PanelParent/children"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PanelParent/replaceChild">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PanelParent/replaceChild/oldChild"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PanelParent/replaceChild/newChild"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="di.ecore#//AbstractPanel">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+ ecoreFeature="ecore:EReference di.ecore#//AbstractPanel/parent"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Position">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Position/x"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Position/y"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//Size">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Size/width"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//Size/length"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//TabFolder">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//TabFolder/children"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="true" propertySortChoices="true"
+ ecoreFeature="ecore:EReference di.ecore#//TabFolder/currentSelection"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/movePage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/movePage/oldIndex"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/movePage/newIndex"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/removePage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/removePage/pageIndex"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage.1">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.1/index"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.1/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//TabFolder/addPage.2">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//TabFolder/addPage.2/pageRef"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//PageRef">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference di.ecore#//PageRef/emfPageIdentifier"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/pageIdentifier"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/objectPageIdentifier"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//PageRef/favoriteEditor"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+ ecoreFeature="ecore:EReference di.ecore#//PageRef/parent"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageRef/isForIdentifier">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageRef/isForIdentifier/pageIdentifier"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashPanel">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashPanel/sashPosition"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//SashPanel/direction"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashPanel/setChildren">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/leftChild"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/rightChild"/>
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/setChildren/direction"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//SashPanel/delete">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//SashPanel/delete/childToDelete"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//AbstractPage">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute di.ecore#//AbstractPage/pageIdentifier"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//PageList">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//PageList/availablePage"/>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageList/addPage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageList/addPage/pageIdentifier"/>
+ </genOperations>
+ <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="di.ecore#//PageList/removePage">
+ <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="di.ecore#//PageList/removePage/pageIdentifier"/>
+ </genOperations>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="di.ecore#//SashWindowsMngr">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashWindowsMngr/pageList"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference di.ecore#//SashWindowsMngr/sashModel"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.notation
index a2058c1d7fc..a2058c1d7fc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.notation
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.notation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.uml
index 5d8586393bd..5d8586393bd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/model/sashwindowsdi.uml
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.properties
new file mode 100644
index 00000000000..3182ee7584c
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.properties
@@ -0,0 +1,8 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papyrus Sashwindows DI Model
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.xml
index bf5e305d70c..d8efcf0f1eb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/plugin.xml
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/papyrus/0.7.0/sashdi"
- class="org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage"
- genModel="model/sashwindowsdi.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <!-- @generated sashwindowsdi -->
- <parser
- type="di"
- class="org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceFactoryImpl"/>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated sashwindowsdi -->
+ <package
+ uri="http://www.eclipse.org/papyrus/0.7.0/sashdi"
+ class="org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage"
+ genModel="model/sashwindowsdi.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated sashwindowsdi -->
+ <parser
+ type="di"
+ class="org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceFactoryImpl"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
new file mode 100644
index 00000000000..8e67e56cd32
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus.releng</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../../../releng/main</relativePath>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.core.sashwindows.di</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
index ae0256e8cc7..7076494cce6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
@@ -1,57 +1,57 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.core.sashwindows.di;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Page</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage()
- * @model
- * @generated
- */
-public interface AbstractPage extends EObject {
-
- /**
- * Returns the value of the '<em><b>Page Identifier</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Page Identifier</em>' attribute isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Page Identifier</em>' attribute.
- * @see #setPageIdentifier(Object)
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage_PageIdentifier()
- * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" required="true" ordered="false"
- * @generated
- */
- Object getPageIdentifier();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Page Identifier</em>' attribute.
- * @see #getPageIdentifier()
- * @generated
- */
- void setPageIdentifier(Object value);
-
-} // AbstractPage
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Page</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage()
+ * @model
+ * @generated
+ */
+public interface AbstractPage extends EObject {
+
+ /**
+ * Returns the value of the '<em><b>Page Identifier</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Page Identifier</em>' attribute isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Page Identifier</em>' attribute.
+ * @see #setPageIdentifier(Object)
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage_PageIdentifier()
+ * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject" required="true" ordered="false"
+ * @generated
+ */
+ Object getPageIdentifier();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Page Identifier</em>' attribute.
+ * @see #getPageIdentifier()
+ * @generated
+ */
+ void setPageIdentifier(Object value);
+
+} // AbstractPage
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
index 76256d6a567..ee55b20eba8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
@@ -1,58 +1,58 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.core.sashwindows.di;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Panel</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractPanel extends EObject {
-
- /**
- * Returns the value of the '<em><b>Parent</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em>Children</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Parent</em>' container reference.
- * @see #setParent(PanelParent)
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel_Parent()
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren
- * @model opposite="children" required="true" transient="false" ordered="false"
- * @generated
- */
- PanelParent getParent();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Parent</em>' container reference.
- * @see #getParent()
- * @generated
- */
- void setParent(PanelParent value);
-} // AbstractPanel
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Panel</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractPanel extends EObject {
+
+ /**
+ * Returns the value of the '<em><b>Parent</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em>Children</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Parent</em>' container reference.
+ * @see #setParent(PanelParent)
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel_Parent()
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren
+ * @model opposite="children" required="true" transient="false" ordered="false"
+ * @generated
+ */
+ PanelParent getParent();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Parent</em>' container reference.
+ * @see #getParent()
+ * @generated
+ */
+ void setParent(PanelParent value);
+} // AbstractPanel
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
index 14f53841dc0..db536b70467 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
@@ -1,142 +1,142 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.core.sashwindows.di;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage
- * @generated
- */
-public interface DiFactory extends EFactory {
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- DiFactory eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Sash Model</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Sash Model</em>'.
- * @generated
- */
- SashModel createSashModel();
-
- /**
- * Returns a new object of class '<em>Window</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Window</em>'.
- * @generated
- */
- Window createWindow();
-
- /**
- * Returns a new object of class '<em>Position</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Position</em>'.
- * @generated
- */
- Position createPosition();
-
- /**
- * Returns a new object of class '<em>Size</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Size</em>'.
- * @generated
- */
- Size createSize();
-
- /**
- * Returns a new object of class '<em>Tab Folder</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Tab Folder</em>'.
- * @generated
- */
- TabFolder createTabFolder();
-
- /**
- * Returns a new object of class '<em>Page Ref</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Page Ref</em>'.
- * @generated
- */
- PageRef createPageRef();
-
- /**
- * Returns a new object of class '<em>Sash Panel</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Sash Panel</em>'.
- * @generated
- */
- SashPanel createSashPanel();
-
- /**
- * Returns a new object of class '<em>Abstract Page</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Abstract Page</em>'.
- * @generated
- */
- AbstractPage createAbstractPage();
-
- /**
- * Returns a new object of class '<em>Page List</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Page List</em>'.
- * @generated
- */
- @Deprecated
- PageList createPageList();
-
- /**
- * Returns a new object of class '<em>Sash Windows Mngr</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Sash Windows Mngr</em>'.
- * @generated
- */
- SashWindowsMngr createSashWindowsMngr();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the package supported by this factory.
- * @generated
- */
- DiPackage getDiPackage();
-
-} // DiFactory
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage
+ * @generated
+ */
+public interface DiFactory extends EFactory {
+
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ DiFactory eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiFactoryImpl.init();
+
+ /**
+ * Returns a new object of class '<em>Sash Model</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Sash Model</em>'.
+ * @generated
+ */
+ SashModel createSashModel();
+
+ /**
+ * Returns a new object of class '<em>Window</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Window</em>'.
+ * @generated
+ */
+ Window createWindow();
+
+ /**
+ * Returns a new object of class '<em>Position</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Position</em>'.
+ * @generated
+ */
+ Position createPosition();
+
+ /**
+ * Returns a new object of class '<em>Size</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Size</em>'.
+ * @generated
+ */
+ Size createSize();
+
+ /**
+ * Returns a new object of class '<em>Tab Folder</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Tab Folder</em>'.
+ * @generated
+ */
+ TabFolder createTabFolder();
+
+ /**
+ * Returns a new object of class '<em>Page Ref</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Page Ref</em>'.
+ * @generated
+ */
+ PageRef createPageRef();
+
+ /**
+ * Returns a new object of class '<em>Sash Panel</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Sash Panel</em>'.
+ * @generated
+ */
+ SashPanel createSashPanel();
+
+ /**
+ * Returns a new object of class '<em>Abstract Page</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Abstract Page</em>'.
+ * @generated
+ */
+ AbstractPage createAbstractPage();
+
+ /**
+ * Returns a new object of class '<em>Page List</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Page List</em>'.
+ * @generated
+ */
+ @Deprecated
+ PageList createPageList();
+
+ /**
+ * Returns a new object of class '<em>Sash Windows Mngr</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Sash Windows Mngr</em>'.
+ * @generated
+ */
+ SashWindowsMngr createSashWindowsMngr();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the package supported by this factory.
+ * @generated
+ */
+ DiPackage getDiPackage();
+
+} // DiFactory
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
index 3bfd9bb55d3..dfd6a0b5ec6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
@@ -1,1571 +1,1571 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2015 LIFL, CEA LIST, Christian W. Damus, 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:
- * LIFL - Initial API and implementation
- * Christian W. Damus - bug 469188
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sashwindows.di;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory
- * @model kind="package"
- * @generated
- */
-public interface DiPackage extends EPackage {
-
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "di";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/sashdi";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "di";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- DiPackage eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl <em>Sash Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashModel()
- * @generated
- */
- int SASH_MODEL = 0;
-
- /**
- * The feature id for the '<em><b>Windows</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_MODEL__WINDOWS = 0;
-
- /**
- * The feature id for the '<em><b>Current Selection</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_MODEL__CURRENT_SELECTION = 1;
-
- /**
- * The feature id for the '<em><b>Restore Active Page</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_MODEL__RESTORE_ACTIVE_PAGE = 2;
-
- /**
- * The number of structural features of the '<em>Sash Model</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_MODEL_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl <em>Panel Parent</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPanelParent()
- * @generated
- */
- int PANEL_PARENT = 2;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PANEL_PARENT__CHILDREN = 0;
-
- /**
- * The number of structural features of the '<em>Panel Parent</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PANEL_PARENT_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl <em>Window</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getWindow()
- * @generated
- */
- int WINDOW = 1;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int WINDOW__CHILDREN = PANEL_PARENT__CHILDREN;
-
- /**
- * The feature id for the '<em><b>Position</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int WINDOW__POSITION = PANEL_PARENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Size</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int WINDOW__SIZE = PANEL_PARENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Panel</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int WINDOW__PANEL = PANEL_PARENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Window</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int WINDOW_FEATURE_COUNT = PANEL_PARENT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl <em>Abstract Panel</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()
- * @generated
- */
- int ABSTRACT_PANEL = 3;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ABSTRACT_PANEL__PARENT = 0;
-
- /**
- * The number of structural features of the '<em>Abstract Panel</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ABSTRACT_PANEL_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl <em>Position</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPosition()
- * @generated
- */
- int POSITION = 4;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int POSITION__X = 0;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int POSITION__Y = 1;
-
- /**
- * The number of structural features of the '<em>Position</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int POSITION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl <em>Size</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSize()
- * @generated
- */
- int SIZE = 5;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SIZE__WIDTH = 0;
-
- /**
- * The feature id for the '<em><b>Length</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SIZE__LENGTH = 1;
-
- /**
- * The number of structural features of the '<em>Size</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SIZE_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl <em>Tab Folder</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getTabFolder()
- * @generated
- */
- int TAB_FOLDER = 6;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TAB_FOLDER__PARENT = ABSTRACT_PANEL__PARENT;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TAB_FOLDER__CHILDREN = ABSTRACT_PANEL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Current Selection</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TAB_FOLDER__CURRENT_SELECTION = ABSTRACT_PANEL_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Tab Folder</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TAB_FOLDER_FEATURE_COUNT = ABSTRACT_PANEL_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl <em>Page Ref</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageRef()
- * @generated
- */
- int PAGE_REF = 7;
-
- /**
- * The feature id for the '<em><b>Emf Page Identifier</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF__EMF_PAGE_IDENTIFIER = 0;
-
- /**
- * The feature id for the '<em><b>Page Identifier</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF__PAGE_IDENTIFIER = 1;
-
- /**
- * The feature id for the '<em><b>Object Page Identifier</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF__OBJECT_PAGE_IDENTIFIER = 2;
-
- /**
- * The feature id for the '<em><b>Favorite Editor</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF__FAVORITE_EDITOR = 3;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF__PARENT = 4;
-
- /**
- * The number of structural features of the '<em>Page Ref</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_REF_FEATURE_COUNT = 5;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl <em>Sash Panel</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashPanel()
- * @generated
- */
- int SASH_PANEL = 8;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_PANEL__PARENT = ABSTRACT_PANEL__PARENT;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_PANEL__CHILDREN = ABSTRACT_PANEL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Sash Position</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_PANEL__SASH_POSITION = ABSTRACT_PANEL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Direction</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_PANEL__DIRECTION = ABSTRACT_PANEL_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Sash Panel</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_PANEL_FEATURE_COUNT = ABSTRACT_PANEL_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl <em>Abstract Page</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPage()
- * @generated
- */
- int ABSTRACT_PAGE = 9;
-
- /**
- * The feature id for the '<em><b>Page Identifier</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ABSTRACT_PAGE__PAGE_IDENTIFIER = 0;
-
- /**
- * The number of structural features of the '<em>Abstract Page</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ABSTRACT_PAGE_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl <em>Page List</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()
- * @generated
- */
- @Deprecated
- int PAGE_LIST = 10;
-
- /**
- * The feature id for the '<em><b>Available Page</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- @Deprecated
- int PAGE_LIST__AVAILABLE_PAGE = 0;
-
- /**
- * The number of structural features of the '<em>Page List</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGE_LIST_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl <em>Sash Windows Mngr</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()
- * @generated
- */
- int SASH_WINDOWS_MNGR = 11;
-
- /**
- * The feature id for the '<em><b>Page List</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_WINDOWS_MNGR__PAGE_LIST = 0;
-
- /**
- * The feature id for the '<em><b>Sash Model</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_WINDOWS_MNGR__SASH_MODEL = 1;
-
- /**
- * The number of structural features of the '<em>Sash Windows Mngr</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SASH_WINDOWS_MNGR_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '<em>int</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getint()
- * @generated
- */
- int INT = 12;
-
- /**
- * The meta object id for the '<em>Java Object</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see java.lang.Object
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getJavaObject()
- * @generated
- */
- int JAVA_OBJECT = 13;
-
- /**
- * The meta object id for the '<em>Float</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getFloat()
- * @generated
- */
- int FLOAT = 15;
-
- /**
- * The meta object id for the '<em>boolean</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getboolean()
- * @generated
- */
- int BOOLEAN = 14;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel <em>Sash Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Sash Model</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel
- * @generated
- */
- EClass getSashModel();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getWindows <em>Windows</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Windows</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getWindows()
- * @see #getSashModel()
- * @generated
- */
- EReference getSashModel_Windows();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection <em>Current Selection</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Current Selection</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection()
- * @see #getSashModel()
- * @generated
- */
- EReference getSashModel_CurrentSelection();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#isRestoreActivePage <em>Restore Active Page</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Restore Active Page</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#isRestoreActivePage()
- * @see #getSashModel()
- * @generated
- */
- EAttribute getSashModel_RestoreActivePage();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window <em>Window</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Window</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window
- * @generated
- */
- EClass getWindow();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition <em>Position</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Position</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition()
- * @see #getWindow()
- * @generated
- */
- EReference getWindow_Position();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Size</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize()
- * @see #getWindow()
- * @generated
- */
- EReference getWindow_Size();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Panel</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel()
- * @see #getWindow()
- * @generated
- */
- EReference getWindow_Panel();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent <em>Panel Parent</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Panel Parent</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent
- * @generated
- */
- EClass getPanelParent();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em>Children</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Children</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren()
- * @see #getPanelParent()
- * @generated
- */
- EReference getPanelParent_Children();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel <em>Abstract Panel</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Abstract Panel</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel
- * @generated
- */
- EClass getAbstractPanel();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em>Parent</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Parent</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent()
- * @see #getAbstractPanel()
- * @generated
- */
- EReference getAbstractPanel_Parent();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position <em>Position</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Position</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position
- * @generated
- */
- EClass getPosition();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>X</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX()
- * @see #getPosition()
- * @generated
- */
- EAttribute getPosition_X();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Y</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY()
- * @see #getPosition()
- * @generated
- */
- EAttribute getPosition_Y();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size <em>Size</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Size</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size
- * @generated
- */
- EClass getSize();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Width</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth()
- * @see #getSize()
- * @generated
- */
- EAttribute getSize_Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Length</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength()
- * @see #getSize()
- * @generated
- */
- EAttribute getSize_Length();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder <em>Tab Folder</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Tab Folder</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder
- * @generated
- */
- EClass getTabFolder();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren <em>Children</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Children</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren()
- * @see #getTabFolder()
- * @generated
- */
- EReference getTabFolder_Children();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getCurrentSelection <em>Current Selection</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Current Selection</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getCurrentSelection()
- * @see #getTabFolder()
- * @generated
- */
- EReference getTabFolder_CurrentSelection();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef <em>Page Ref</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Page Ref</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef
- * @generated
- */
- EClass getPageRef();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier <em>Emf Page Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Emf Page Identifier</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier()
- * @see #getPageRef()
- * @generated
- */
- EReference getPageRef_EmfPageIdentifier();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier <em>Page Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Page Identifier</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier()
- * @see #getPageRef()
- * @generated
- */
- EAttribute getPageRef_PageIdentifier();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier <em>Object Page Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Object Page Identifier</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier()
- * @see #getPageRef()
- * @generated
- */
- EAttribute getPageRef_ObjectPageIdentifier();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getFavoriteEditor <em>Favorite Editor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Favorite Editor</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getFavoriteEditor()
- * @see #getPageRef()
- * @generated
- */
- EAttribute getPageRef_FavoriteEditor();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent <em>Parent</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Parent</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent()
- * @see #getPageRef()
- * @generated
- */
- EReference getPageRef_Parent();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel <em>Sash Panel</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Sash Panel</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel
- * @generated
- */
- EClass getSashPanel();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition <em>Sash Position</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Sash Position</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition()
- * @see #getSashPanel()
- * @generated
- */
- EAttribute getSashPanel_SashPosition();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection <em>Direction</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Direction</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection()
- * @see #getSashPanel()
- * @generated
- */
- EAttribute getSashPanel_Direction();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage <em>Abstract Page</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Abstract Page</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage
- * @generated
- */
- EClass getAbstractPage();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier <em>Page Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Page Identifier</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier()
- * @see #getAbstractPage()
- * @generated
- */
- EAttribute getAbstractPage_PageIdentifier();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList <em>Page List</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Page List</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList
- * @generated
- */
- @Deprecated
- EClass getPageList();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage <em>Available Page</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Available Page</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage()
- * @see #getPageList()
- * @generated
- */
- @Deprecated
- EReference getPageList_AvailablePage();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr <em>Sash Windows Mngr</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Sash Windows Mngr</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr
- * @generated
- */
- EClass getSashWindowsMngr();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList <em>Page List</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Page List</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList()
- * @see #getSashWindowsMngr()
- * @generated
- */
- @Deprecated
- EReference getSashWindowsMngr_PageList();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel <em>Sash Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Sash Model</em>'.
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel()
- * @see #getSashWindowsMngr()
- * @generated
- */
- EReference getSashWindowsMngr_SashModel();
-
- /**
- * Returns the meta object for data type '<em>int</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>int</em>'.
- * @model instanceClass="int"
- * annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Integer'"
- * @generated
- */
- EDataType getint();
-
- /**
- * Returns the meta object for data type '{@link java.lang.Object <em>Java Object</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>Java Object</em>'.
- * @see java.lang.Object
- * @model instanceClass="java.lang.Object"
- * @generated
- */
- EDataType getJavaObject();
-
- /**
- * Returns the meta object for data type '<em>Float</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>Float</em>'.
- * @model instanceClass="float"
- * @generated
- */
- EDataType getFloat();
-
- /**
- * Returns the meta object for data type '<em>boolean</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>boolean</em>'.
- * @model instanceClass="boolean"
- * @generated
- */
- EDataType getboolean();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- DiFactory getDiFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals {
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl <em>Sash Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashModel()
- * @generated
- */
- EClass SASH_MODEL = eINSTANCE.getSashModel();
-
- /**
- * The meta object literal for the '<em><b>Windows</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference SASH_MODEL__WINDOWS = eINSTANCE.getSashModel_Windows();
-
- /**
- * The meta object literal for the '<em><b>Current Selection</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference SASH_MODEL__CURRENT_SELECTION = eINSTANCE.getSashModel_CurrentSelection();
-
- /**
- * The meta object literal for the '<em><b>Restore Active Page</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute SASH_MODEL__RESTORE_ACTIVE_PAGE = eINSTANCE.getSashModel_RestoreActivePage();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl <em>Window</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getWindow()
- * @generated
- */
- EClass WINDOW = eINSTANCE.getWindow();
-
- /**
- * The meta object literal for the '<em><b>Position</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference WINDOW__POSITION = eINSTANCE.getWindow_Position();
-
- /**
- * The meta object literal for the '<em><b>Size</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference WINDOW__SIZE = eINSTANCE.getWindow_Size();
-
- /**
- * The meta object literal for the '<em><b>Panel</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference WINDOW__PANEL = eINSTANCE.getWindow_Panel();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl <em>Panel Parent</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPanelParent()
- * @generated
- */
- EClass PANEL_PARENT = eINSTANCE.getPanelParent();
-
- /**
- * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference PANEL_PARENT__CHILDREN = eINSTANCE.getPanelParent_Children();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl <em>Abstract Panel</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()
- * @generated
- */
- EClass ABSTRACT_PANEL = eINSTANCE.getAbstractPanel();
-
- /**
- * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ABSTRACT_PANEL__PARENT = eINSTANCE.getAbstractPanel_Parent();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl <em>Position</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPosition()
- * @generated
- */
- EClass POSITION = eINSTANCE.getPosition();
-
- /**
- * The meta object literal for the '<em><b>X</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute POSITION__X = eINSTANCE.getPosition_X();
-
- /**
- * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute POSITION__Y = eINSTANCE.getPosition_Y();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl <em>Size</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSize()
- * @generated
- */
- EClass SIZE = eINSTANCE.getSize();
-
- /**
- * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute SIZE__WIDTH = eINSTANCE.getSize_Width();
-
- /**
- * The meta object literal for the '<em><b>Length</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute SIZE__LENGTH = eINSTANCE.getSize_Length();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl <em>Tab Folder</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getTabFolder()
- * @generated
- */
- EClass TAB_FOLDER = eINSTANCE.getTabFolder();
-
- /**
- * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TAB_FOLDER__CHILDREN = eINSTANCE.getTabFolder_Children();
-
- /**
- * The meta object literal for the '<em><b>Current Selection</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TAB_FOLDER__CURRENT_SELECTION = eINSTANCE.getTabFolder_CurrentSelection();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl <em>Page Ref</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageRef()
- * @generated
- */
- EClass PAGE_REF = eINSTANCE.getPageRef();
-
- /**
- * The meta object literal for the '<em><b>Emf Page Identifier</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference PAGE_REF__EMF_PAGE_IDENTIFIER = eINSTANCE.getPageRef_EmfPageIdentifier();
-
- /**
- * The meta object literal for the '<em><b>Page Identifier</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute PAGE_REF__PAGE_IDENTIFIER = eINSTANCE.getPageRef_PageIdentifier();
-
- /**
- * The meta object literal for the '<em><b>Object Page Identifier</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute PAGE_REF__OBJECT_PAGE_IDENTIFIER = eINSTANCE.getPageRef_ObjectPageIdentifier();
-
- /**
- * The meta object literal for the '<em><b>Favorite Editor</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute PAGE_REF__FAVORITE_EDITOR = eINSTANCE.getPageRef_FavoriteEditor();
-
- /**
- * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference PAGE_REF__PARENT = eINSTANCE.getPageRef_Parent();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl <em>Sash Panel</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashPanel()
- * @generated
- */
- EClass SASH_PANEL = eINSTANCE.getSashPanel();
-
- /**
- * The meta object literal for the '<em><b>Sash Position</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute SASH_PANEL__SASH_POSITION = eINSTANCE.getSashPanel_SashPosition();
-
- /**
- * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute SASH_PANEL__DIRECTION = eINSTANCE.getSashPanel_Direction();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl <em>Abstract Page</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPage()
- * @generated
- */
- EClass ABSTRACT_PAGE = eINSTANCE.getAbstractPage();
-
- /**
- * The meta object literal for the '<em><b>Page Identifier</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute ABSTRACT_PAGE__PAGE_IDENTIFIER = eINSTANCE.getAbstractPage_PageIdentifier();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl <em>Page List</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()
- * @generated
- */
- @Deprecated
- EClass PAGE_LIST = eINSTANCE.getPageList();
-
- /**
- * The meta object literal for the '<em><b>Available Page</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Deprecated
- EReference PAGE_LIST__AVAILABLE_PAGE = eINSTANCE.getPageList_AvailablePage();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl <em>Sash Windows Mngr</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()
- * @generated
- */
- EClass SASH_WINDOWS_MNGR = eINSTANCE.getSashWindowsMngr();
-
- /**
- * The meta object literal for the '<em><b>Page List</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Deprecated
- EReference SASH_WINDOWS_MNGR__PAGE_LIST = eINSTANCE.getSashWindowsMngr_PageList();
-
- /**
- * The meta object literal for the '<em><b>Sash Model</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference SASH_WINDOWS_MNGR__SASH_MODEL = eINSTANCE.getSashWindowsMngr_SashModel();
-
- /**
- * The meta object literal for the '<em>int</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getint()
- * @generated
- */
- EDataType INT = eINSTANCE.getint();
-
- /**
- * The meta object literal for the '<em>Java Object</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see java.lang.Object
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getJavaObject()
- * @generated
- */
- EDataType JAVA_OBJECT = eINSTANCE.getJavaObject();
-
- /**
- * The meta object literal for the '<em>Float</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getFloat()
- * @generated
- */
- EDataType FLOAT = eINSTANCE.getFloat();
-
- /**
- * The meta object literal for the '<em>boolean</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getboolean()
- * @generated
- */
- EDataType BOOLEAN = eINSTANCE.getboolean();
-
- }
-
-} // DiPackage
+/*****************************************************************************
+ * Copyright (c) 2011, 2015 LIFL, CEA LIST, Christian W. Damus, 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:
+ * LIFL - Initial API and implementation
+ * Christian W. Damus - bug 469188
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sashwindows.di;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DiPackage extends EPackage {
+
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNAME = "di";
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/sashdi";
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_PREFIX = "di";
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ DiPackage eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl <em>Sash Model</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashModel()
+ * @generated
+ */
+ int SASH_MODEL = 0;
+
+ /**
+ * The feature id for the '<em><b>Windows</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SASH_MODEL__WINDOWS = 0;
+
+ /**
+ * The feature id for the '<em><b>Current Selection</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SASH_MODEL__CURRENT_SELECTION = 1;
+
+ /**
+ * The feature id for the '<em><b>Restore Active Page</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SASH_MODEL__RESTORE_ACTIVE_PAGE = 2;
+
+ /**
+ * The number of structural features of the '<em>Sash Model</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SASH_MODEL_FEATURE_COUNT = 3;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl <em>Panel Parent</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPanelParent()
+ * @generated
+ */
+ int PANEL_PARENT = 2;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PANEL_PARENT__CHILDREN = 0;
+
+ /**
+ * The number of structural features of the '<em>Panel Parent</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PANEL_PARENT_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl <em>Window</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getWindow()
+ * @generated
+ */
+ int WINDOW = 1;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int WINDOW__CHILDREN = PANEL_PARENT__CHILDREN;
+
+ /**
+ * The feature id for the '<em><b>Position</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int WINDOW__POSITION = PANEL_PARENT_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Size</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int WINDOW__SIZE = PANEL_PARENT_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Panel</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int WINDOW__PANEL = PANEL_PARENT_FEATURE_COUNT + 2;
+
+ /**
+ * The number of structural features of the '<em>Window</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int WINDOW_FEATURE_COUNT = PANEL_PARENT_FEATURE_COUNT + 3;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl <em>Abstract Panel</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()
+ * @generated
+ */
+ int ABSTRACT_PANEL = 3;
+
+ /**
+ * The feature id for the '<em><b>Parent</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ABSTRACT_PANEL__PARENT = 0;
+
+ /**
+ * The number of structural features of the '<em>Abstract Panel</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ABSTRACT_PANEL_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl <em>Position</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPosition()
+ * @generated
+ */
+ int POSITION = 4;
+
+ /**
+ * The feature id for the '<em><b>X</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int POSITION__X = 0;
+
+ /**
+ * The feature id for the '<em><b>Y</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int POSITION__Y = 1;
+
+ /**
+ * The number of structural features of the '<em>Position</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int POSITION_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl <em>Size</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSize()
+ * @generated
+ */
+ int SIZE = 5;
+
+ /**
+ * The feature id for the '<em><b>Width</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SIZE__WIDTH = 0;
+
+ /**
+ * The feature id for the '<em><b>Length</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SIZE__LENGTH = 1;
+
+ /**
+ * The number of structural features of the '<em>Size</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SIZE_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl <em>Tab Folder</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl
+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getTabFolder()
+ * @generated
+ */
+ int TAB_FOLDER = 6;
+
+ /**
+ * The feature id for the '<em><b>Parent</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_FOLDER__PARENT = ABSTRACT_PANEL__PARENT;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_FOLDER__CHILDREN = ABSTRACT_PANEL_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Current Selection</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_FOLDER__CURRENT_SELECTION = ABSTRACT_PANEL_FEATURE_COUNT + 1;
+
+ /**
+ * The number