Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-11 21:38:52 +0000
committerChristian W. Damus2016-02-24 22:26:27 +0000
commit09fde7a4087685b065b7f1e40375686fb9f19f2a (patch)
tree36668c0515a08586179a74cefcf1dc6197311d70 /plugins/infra/ui
parent2f0dd86c51f8543f56a99cd4371965a01287fcaa (diff)
downloadorg.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.tar.gz
org.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.tar.xz
org.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Implement version management: PDE API Tooling and Oomph Version Management. Introduce two new plug-in projects to manage versioning using Oomph: * org.eclipse.papyrus.releng.main.release for the Main bundles and features * org.eclipse.papyrus.releng.dev.release for the Dev Tools Add new menu actions to the Dev Tools: * main menu bar: * synchronize POM and manifest versions * "Configure" context menu on bundle projects and MANIFEST.MF * optimize bundle dependencies and re-exports * update dependency version ranges to match current workspace and PDE target Remove obsolete menu actions from the Dev Tools: * main menu bar: * Set all Papyrus feature versions * Set all Papyrus plug-in versions * Set versions of all Papyrus dependencies in Papyrus plug-ins Fix versioning errors reported by PDE and Oomph. Ensure proper version ranges consistent with latest build target. Optimize the dependencies of all Papyrus Main bundles and Dev Tools. Remove version- and reexport-checking tests in the BundlesTests that are now not needed because, on the one hand, we now implement discrete bundle versioning (managed by PDE/Oomph) and on the other, we now use re-exports properly to ensure classpath consistency in clients of a bundle's API. Thorough overhaul of the "project editors" API, including: * rationalize the API interfaces * refactor the all-in-one PluginEditor class from the customization bundle to the project-editors bundle * update clients in the Customization and DSML Validation components * fix a bunch of operations that didn't work * add missing operations required by the new Dev Tools actions * complete some unimplemented APIs * add a comprehensive JUnit test suite covering all of the project-editors API Change-Id: I6a699d93909f61099226ceb994140f03ea99a70f
Diffstat (limited to 'plugins/infra/ui')
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project24
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF27
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project24
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF16
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project24
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF27
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java4
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java5
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java5
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java5
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java47
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java20
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java50
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java13
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java1
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java29
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project24
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF13
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project28
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters67
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF23
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java99
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java3
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java4
114 files changed, 512 insertions, 210 deletions
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project
index 2520b07362d..69e45711329 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project
@@ -20,9 +20,33 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
index fc586354cf3..2778749b3a0 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
@@ -7,22 +7,17 @@ Export-Package: org.eclipse.papyrus.infra.onefile.internal.ui;x-internal:=true,
org.eclipse.papyrus.infra.onefile.internal.ui.testers;x-internal:=true,
org.eclipse.papyrus.infra.onefile.ui.providers,
org.eclipse.papyrus.infra.onefile.ui.utils
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui,
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ltk.core.refactoring;bundle-version="3.6.0",
- org.eclipse.ltk.ui.refactoring;bundle-version="3.7.0",
- org.eclipse.core.filesystem;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project
index 1233f09c6e8..a09450dc6f9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project
@@ -20,9 +20,33 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index e4d2acb77b8..7652d13951c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -1,16 +1,8 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project
index 9943e4559d6..52e1464192e 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project
@@ -20,10 +20,34 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
index 9448f025be2..46d33f813eb 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -25,24 +25,14 @@ Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.emf.ecore,
- org.eclipse.emf.transaction,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.databinding;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.12.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.12.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.7.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.views;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-Version: 1.2.0.qualifier
Eclipse-BuddyPolicy: dependent
@@ -51,4 +41,3 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator
Bundle-Description: Plugin dedicated to manage generic menus and actions,
linked to EMF but not to UML nor GMF technologies.
Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true
-Import-Package: org.eclipse.papyrus.infra.emf.utils
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java
index 9145151e8a0..c80791a8047 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java
@@ -44,6 +44,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
* (the command is now shown in menu if not executable).
*
* </pre>
+ *
+ * @since 1.2
*/
public abstract class AbstractCommandHandler extends AbstractPapyrusHandler {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java
index d77ab4240be..50982feedd2 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java
@@ -36,6 +36,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
/**
* This provides facilities to get the TransactionEditingDomain and the PageManager from
* the current Papyrus editor or view context.
+ *
+ * @since 1.2
*/
public abstract class AbstractPapyrusHandler extends AbstractHandler {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
index 1fb84925184..04b104f3931 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
@@ -22,6 +22,9 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.ui.extension.diagrameditor.EditorDescriptorExtensionFactory;
import org.osgi.framework.Bundle;
+/**
+ * @since 1.2
+ */
public class ContentOutlineRegistry {
/** ID of the editor extension (schema filename) */
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
index 8ce4fd3985f..c4034592c45 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
@@ -18,6 +18,8 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
/**
* Extends the original interface to add the init method.
+ *
+ * @since 1.2
*/
public interface IPapyrusContentOutlinePage extends org.eclipse.ui.views.contentoutline.IContentOutlinePage {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
index 833f0ef89fb..9985bb1e393 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
@@ -66,6 +66,8 @@ import com.google.common.collect.Lists;
/**
* Page for Papyrus outline when active nested editor is a GMF editor
+ *
+ * @since 1.2
*/
public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusContentOutlinePage, IPageLifeCycleEventsListener, IEditorReloadListener {
@@ -107,7 +109,7 @@ public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusCo
}
private void internalInit(IMultiDiagramEditor multiEditor) {
- sashWindowsContainer = (ISashWindowsContainer) multiEditor.getAdapter(ISashWindowsContainer.class);
+ sashWindowsContainer = multiEditor.getAdapter(ISashWindowsContainer.class);
sashWindowsContainer.addPageLifeCycleListener(this);
}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
index 02e1f24f92c..2d944c254d0 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.messages.Messages;
* Abstract class for String value Container
*
* @author VL222926
+ * @since 1.2
*
*/
public abstract class AbstractStringValueConverter implements IStringValueConverter {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
index 657091fb03c..d8d23b85910 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IStatus;
* This class allows to store the value created for a pasted String AND a result status associated to this pasted String
*
* @param <T>
+ * @since 1.2
*/
public class ConvertedValueContainer<T> {
@@ -57,7 +58,7 @@ public class ConvertedValueContainer<T> {
/**
*
* @return
- * the status of the conversion
+ * the status of the conversion
*/
public final IStatus getStatus() {
return this.status;
@@ -66,7 +67,7 @@ public class ConvertedValueContainer<T> {
/**
*
* @return
- * the value
+ * the value
*/
public final T getConvertedValue() {
return this.value;
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
index 2847e7180fa..9873eabe2c5 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.ui.Activator;
* WARNING : incomplete implementations
*
* @author vl222926
+ * @since 1.2
*
*/
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
index 5ce086d2dd7..465c93c63f6 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
@@ -19,6 +19,7 @@ import org.eclipse.ui.services.IDisposable;
* Common interface for string converter
*
* @author VL222926
+ * @since 1.2
*
*/
public interface IStringValueConverter extends IDisposable {
@@ -30,7 +31,7 @@ public interface IStringValueConverter extends IDisposable {
* @param valueAsString
* the value represented by a string
* @return
- * a {@link ConvertedValueContainer}
+ * a {@link ConvertedValueContainer}
*/
public ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString);
}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
index 4324d0191fa..13ed47393c1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IStatus;
* This class allows to store the value created for a pasted String AND a result status associated to this pasted String
*
* @param <T>
+ * @since 1.2
*/
public class MultiConvertedValueContainer<T> extends ConvertedValueContainer<Collection<T>> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
index 979bc06460c..0ef71f811ec 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status;
* This status is used y the String Value solvers
*
* @author vl222926
+ * @since 1.2
*
*/
public class StringValueConverterStatus extends Status {
@@ -52,7 +53,7 @@ public class StringValueConverterStatus extends Status {
/**
*
* @return
- * the list of the unresolved string
+ * the list of the unresolved string
*/
public final Collection<String> getUnresolvedString() {
return unresolvedString;
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
index a31e0562b90..5691b5a9c30 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
@@ -21,6 +21,8 @@ import org.eclipse.swt.dnd.TransferData;
* A local transfer carrying a single object being dragged. Subclasses should maintain a
* single instance of their Transfer and provide a static method to obtain that
* instance.
+ *
+ * @since 1.2
*/
public abstract class PapyrusTransfer<T> extends ByteArrayTransfer {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
index 49557e36432..871c560bc33 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
@@ -14,6 +14,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
* This service depends on {@link DiSashModelMngrServiceFactory}.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class ContentProviderServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
index bbfb16f40a6..b6a33a1dca9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
@@ -125,7 +125,7 @@ import com.google.common.collect.ImmutableSet;
* @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>
* Refactoring.
*
- * TODO : remove GMF dependency !
+ * @since 1.2
*/
public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker, IEditingDomainProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
index 1f13fedb84b..16a4ba5b393 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto
* Service Factory to create the {@link DiSashModelManager} service.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class DiSashModelManagerServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
index ad0806cff77..b19e9c6f061 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto
* Service Factory to create the {@link DiSashModelMngr} service.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class DiSashModelMngrServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
index 4193c25cf3e..8b82dd17ba2 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
@@ -31,6 +31,7 @@ import org.eclipse.ui.IEditorSite;
* TODO remove extends IEditingDomainProvider. This interface should be
* independant of any technology (EMF, GMF, ...). If the EditingDomain
* is required, it can be retrieved by the registry.
+ * @since 1.2
*
*/
public interface IMultiDiagramEditor extends IEditorPart {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
index 50594efbec8..db373887090 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
@@ -18,6 +18,7 @@ import org.eclipse.ui.IEditorInput;
* An IEditorInput used to reference the page(s) to open
*
* @author Camille Letavernier
+ * @since 1.2
*
*/
public interface IPapyrusPageInput extends IEditorInput {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
index 92bff539cf7..eb06f6ec609 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
@@ -50,6 +50,8 @@ import org.eclipse.ui.ide.IDE;
/**
* An {@linkplain IAdaptable adapter protocol} for editors that know how to internally
* reload themselves without disturbing the workbench window's perspective layout.
+ *
+ * @since 1.2
*/
public interface IReloadableEditor {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
index c35a776b83a..f3ffaddaa2c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
@@ -15,6 +15,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto
* Service Factory to register {@link IPageIconsRegistry}.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class PageIconRegistryServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
index b7657e6ce1a..6113642a206 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
@@ -25,6 +25,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
* serviceFactory depends on {@link ISashWindowsContentProvider} service.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class PageMngrServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
index 84d317fc793..8a53236b096 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
@@ -19,6 +19,7 @@ import org.eclipse.ui.part.FileEditorInput;
* Basic implementation of {@link IPapyrusPageInput}
*
* @author Camille Letavernier
+ * @since 1.2
*/
public class PapyrusPageInput extends FileEditorInput implements IPapyrusPageInput {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
index 3eabad5cbf3..c78f105052e 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
@@ -26,6 +26,8 @@ import com.google.common.collect.Lists;
* An {@linkplain EditorReloadEvent#putContext(Object) editor reload context} that composes other reload contexts.
* This should be used whenever a {@linkplain IReloadContextProvider reload context provider} supplies multiple
* reload contexts, to ensure that they are properly initialized by the reload system.
+ *
+ * @since 1.2
*/
public class CompositeReloadContext implements IDisposableReloadContext, IAdaptable {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
index 718b376c2ba..386e1722ff2 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
@@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
* An {@linkplain EditorReloadEvent#putContext(Object) editor reload context} that delegates to another reload context.
* This should be used whenever a {@linkplain IReloadContextProvider reload context provider} is needed to get a reload
* context to delegate to.
+ *
+ * @since 1.2
*/
public class DelegatingReloadContext implements IDisposableReloadContext, IAdaptable {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
index e8eea1033cc..d5422e8c6b1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
@@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.ISelectionProvider;
/**
* A convenient selection re-load context for UIs that present EMF-based content.
+ *
+ * @since 1.2
*/
public class EMFSelectionContext extends SelectionContext<ISelectionProvider, URI> implements IAdaptable {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
index a6f99008f06..0d19a72c918 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
@@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.AbstractTreeViewer;
/**
* A convenient context object for {@link IEditorReloadListener}s to store in an {@link EditorReloadEvent} to capture and restore
* the expansion and selection state of nodes in an EMF-based tree viewer.
+ *
+ * @since 1.2
*/
public class EMFTreeViewerContext extends TreeViewerContext<URI> implements IAdaptable {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
index 5015f26011e..3d14182deb9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
@@ -16,6 +16,8 @@ package org.eclipse.papyrus.infra.ui.editor.reload;
/**
* Convenience superclass for selective implementation of editor reload call-backs.
+ *
+ * @since 1.2
*/
public class EditorReloadAdapter implements IEditorReloadListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
index c4d13f721b4..f608977a4c6 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
@@ -31,6 +31,8 @@ import com.google.common.collect.Maps;
/**
* The event object for notifications of each phase in the reloading of a {@linkplain IReloadableEditor reloadable editor}.
+ *
+ * @since 1.2
*/
public class EditorReloadEvent extends EventObject {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
index 8aff9ccf83b..169856e099d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.ui.editor.reload;
* Protocol implemented by {@link EditorReloadEvent} context objects that must be disposed when they are no longer needed.
*
* @see EditorReloadEvent#dispose()
+ * @since 1.2
*/
public interface IDisposableReloadContext {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
index 2114d555152..e8530c3b6f1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
@@ -19,6 +19,8 @@ import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;
/**
* A protocol for notification of the phases of re-loading of an {@link IReloadableEditor}.
+ *
+ * @since 1.2
*/
public interface IEditorReloadListener extends EventListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
index f3449f59be9..5060a182de7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
@@ -17,6 +17,8 @@ package org.eclipse.papyrus.infra.ui.editor.reload;
* An adapter protocol for objects that can provide {@code context}s to be included in the
* re-load state of dependent parts in an {@link EditorReloadEvent}, for the purpose of
* restoring the state of those objects after re-load has completed.
+ *
+ * @since 1.2
*/
public interface IReloadContextProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
index 15d58b5c4a1..a8ba56f2b0e 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Lists;
* the type of selection provider
* @param <T>
* the type of token used to restore the selection state
+ * @since 1.2
*/
public abstract class SelectionContext<V extends ISelectionProvider, T> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
index 6d70788326c..1e787d60645 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
@@ -23,6 +23,8 @@ import com.google.common.collect.Lists;
/**
* A convenient context object for {@link IEditorReloadListener}s to store in an {@link EditorReloadEvent} to capture and restore
* the expansion and selection state of nodes in a tree viewer.
+ *
+ * @since 1.2
*/
public abstract class TreeViewerContext<T> extends SelectionContext<AbstractTreeViewer, T> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java
index 9c02a4bf35d..06c1aa334b3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java
@@ -17,13 +17,12 @@ package org.eclipse.papyrus.infra.ui.editorsfactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistryExtended;
-import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
/**
*
* An abstract class to get the iconRegistery
+ *
+ * @since 1.2
*
*/
public abstract class AbstractGetEditorIconQuery {// we don't need to implements IJavaModelQuery here
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
index a107a8e53ff..406a9d496c8 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
@@ -11,6 +11,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
*
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public interface IEditorFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
index 16ea36ce42b..f419d6ba65c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
@@ -17,6 +17,7 @@ import org.eclipse.swt.graphics.Image;
*
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public interface IEditorIconFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
index 52faed51ce4..960b7cf0fee 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.ui.editorsfactory;
/**
*
* @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
+ * @since 1.2
*
*/
public interface IEditorIconFactoryExtended extends IEditorIconFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
index 4063f28288c..f26b2b42374 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
@@ -19,6 +19,7 @@ import org.eclipse.swt.graphics.Image;
* Registry used to get Icons associated to an editor.
*
* @author cedric dumoulin
+ * @since 1.2
*/
public interface IPageIconsRegistry {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
index a11b5f5e7ff..d3b5c41cb18 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.ui.editorsfactory;
* Extends IPageIconsRegistry in order to offer a second methods which will give back the URL of the requested Icon
*
* @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
+ * @since 1.2
*
*/
public interface IPageIconsRegistryExtended extends IPageIconsRegistry {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
index d60e8f71f96..9f718718876 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
@@ -14,6 +14,7 @@ import org.eclipse.swt.graphics.Image;
*
*
* @author cedric dumoulin
+ * @since 1.2
*/
public class PageIconsRegistry implements IPageIconsRegistryExtended {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
index 32774bb7a25..e3d2599a26d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.ui.Activator;
*
*
* @author cedric dumoulin
+ * @since 1.2
*/
public class PageModelFactoryRegistry implements IPageModelFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
index 035cfbfda70..7635aa56deb 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
@@ -14,6 +14,9 @@ package org.eclipse.papyrus.infra.ui.extension.commands;
import org.eclipse.emf.ecore.EObject;
+/**
+ * @since 1.2
+ */
public interface ICreationCondition {
/**
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
index 8b7f371b28e..838908b38c2 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
@@ -17,6 +17,8 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
/**
* The Interface IModelCreationCommand.
+ *
+ * @since 1.2
*/
public interface IModelCreationCommand {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
index 0c8b0a9d9fe..c80e607bc65 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
@@ -15,7 +15,10 @@ package org.eclipse.papyrus.infra.ui.extension.commands;
import org.eclipse.emf.ecore.EObject;
-//FIXME Refactoring Juno : I don't know how to migrate this code
+/**
+ * @since 1.2
+ */
+// FIXME Refactoring Juno : I don't know how to migrate this code
public class PerspectiveContextDependence implements ICreationCondition {
protected String commandID = null;
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
index 89ace2da204..387875def4a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
* @author Remi Schnekenburger
* @author Patrick Tessier
* @author cedric dumoulin
+ * @since 1.2
*/
public abstract class AbstractEditorFactory implements IPluggableEditorFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
index d7aa6d558eb..9b33a748473 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
@@ -21,6 +21,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
* to know about the nested diagram. It is fill by an extension.
*
* @author Cedric Dumoulin
+ * @since 1.2
*
*/
public class EditorDescriptor {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
index 8d57b2fe3ab..99df6818407 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.ui.Activator;
*
* @author Cedric Dumoulin
* @author Patrick Tessier
+ * @since 1.2
*/
public class EditorDescriptorExtensionFactory extends ExtensionUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
index 8a80509bda2..419fda5a4bd 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
@@ -13,6 +13,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
* by the {@link PluggableEditorFactoryReader}
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class EditorFactoryProxy implements IEditorFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
index 94038633af4..4451322b7fb 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
@@ -12,6 +12,7 @@ import org.eclipse.swt.graphics.Image;
* common ancestor for {@link EditorIconFactory} and {@link EditorFactoryProxy}
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class EditorIconFactory implements IEditorIconFactoryExtended {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
index f0e189ae4e1..6b4e35b2397 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
* Editor was not found.
*
* @author dumoulin
+ * @since 1.2
*
*/
@SuppressWarnings("serial")
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
index 87f1cde5d2b..ce20bfff652 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
* editor data.
*
* @author C�dric Dumoulin
+ * @since 1.2
*
*/
public interface IPluggableEditorFactory extends IEditorFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
index fd6a89ff037..12504d37327 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
* Root Exception of MultiDiagram exception
*
* @author dumoulin
+ * @since 1.2
*
*/
@SuppressWarnings("serial")
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
index 75dc1d7cc96..739e9b38711 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
@@ -29,6 +29,8 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.PageModelFactoryRegistry;
/**
* This reader is used to read PluggableEditorFactory from the Eclipse extension
* declarations. It can be used to populate an {@link PageModelFactoryRegistry}.
+ *
+ * @since 1.2
*/
public class PluggableEditorFactoryReader {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
index 51e34e85d83..13297f74b46 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
@@ -10,6 +10,7 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
* Event sent whith a Save or SaveAs.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class DoSaveEvent {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
index 64835143e55..b446aa55637 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
@@ -21,6 +21,7 @@ import org.eclipse.ui.part.FileEditorInput;
* event after a call to {@link ISaveAndDirtyService#doSaveAs()}.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public interface IEditorInputChangedListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
index 31f2afae670..78f34636a02 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
@@ -8,6 +8,7 @@ package org.eclipse.papyrus.infra.ui.lifecycleevents;
* lifecycle events. This interface is the "public" part of the {@link LifeCycleEventsProvider}.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public interface ILifeCycleEventsProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
index a93b164ea0d..6eeb3324c3c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
@@ -19,6 +19,7 @@ import org.eclipse.ui.ISaveablePart;
/**
* @author dumoulin
+ * @since 1.2
*
*/
public interface ISaveAndDirtyService extends ISaveablePart {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
index 03d6aaa6a02..9c2a393dc5a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
@@ -10,6 +10,7 @@ package org.eclipse.papyrus.infra.ui.lifecycleevents;
*
* @param <T>
* Type of event passed to methods.
+ * @since 1.2
*/
public interface ISaveEventListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
index 3fb4e594271..95c42ca2e08 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
@@ -19,6 +19,7 @@ import java.util.List;
*
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class LifeCycleEventsProvider implements ILifeCycleEventsProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
index b9126079262..04d5524fe49 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
* serviceFactory depends on {@link SaveAndDirtyService} service.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
index 7e858153695..586e0b9a9f7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
@@ -69,6 +69,7 @@ import org.eclipse.ui.part.FileEditorInput;
* hasn't changed.
*
* @author cedric dumoulin
+ * @since 1.2
*
*/
public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISaveablePart, IService, ISaveAndDirtyService {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
index 3af4448ed36..e7cf5b39910 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.part.EditorActionBarContributor;
*
* @author Cedric Dumoulin
* @author Patrick Tessier
+ * @since 1.2
*
*/
public class ActionBarContributorDescriptor {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
index da949ab92ae..502a8c291e7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
@@ -25,6 +25,7 @@ import org.eclipse.ui.part.EditorActionBarContributor;
*
* @author Cedric Dumoulin
* @auhtor Patrick Tessier
+ * @since 1.2
*/
public class ActionBarContributorExtensionFactory extends ExtensionUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
index 347e1e0d5c7..5dc8ca34b2f 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
@@ -34,6 +34,7 @@ import org.eclipse.ui.part.EditorActionBarContributor;
* ActionBarContributor declared in Eclipse extension mechanism.
*
* @author dumoulin
+ * @since 1.2
*
*/
public class ActionBarContributorRegistry implements IActionBarContributorFactory, IService {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
index 2e8459fe5cf..c9e4cbebfe4 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
@@ -31,6 +31,7 @@ import org.eclipse.ui.part.EditorActionBarContributor;
* editor in a MultiPageEditor environement.
*
* @author dumoulin
+ * @since 1.2
*
*/
public class CoreComposedActionBarContributor extends ComposedActionBarContributor implements IMultiPageEditorActionBarContributor {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
index e296d88deab..bf2e6864705 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
@@ -10,6 +10,7 @@ import org.eclipse.ui.part.EditorActionBarContributor;
* Interface used to get an ActionBarContributor from its ID.
*
* @author dumoulin
+ * @since 1.2
*
*/
public interface IActionBarContributorFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java
index 13426ddc474..a2ad07fb5ed 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java
@@ -45,6 +45,8 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
* Each group added has to be declared through the {@link #addPreferenceGroup(AbstractPreferenceGroup)}</code> method</li>
* </ul>
* </p>
+ *
+ * @since 1.2
*/
public abstract class AbstractPapyrusPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage, IPapyrusPreferencePage {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
index 922fd74b9c3..e033ba696ec 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
@@ -22,6 +22,9 @@ import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.papyrus.infra.ui.Activator;
import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;
+/**
+ * @since 1.2
+ */
public abstract class AbstractPapyrusPreferenceStore extends PapyrusScopedPreferenceStore {
/**
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java
index b90d098e54b..4079a5903b3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java
@@ -26,6 +26,8 @@ import org.eclipse.swt.widgets.Composite;
/**
* The Class AbstractPreferenceGroup.
+ *
+ * @since 1.2
*/
public abstract class AbstractPreferenceGroup extends Composite {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java
index 4a82d671fef..f941d7abea3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java
@@ -19,6 +19,8 @@ import org.eclipse.jface.preference.IPreferencePage;
/**
* Specialized protocol for preference pages participating in the {@link VisiblePageSingleton}
* mechanism.
+ *
+ * @since 1.2
*/
public interface IPapyrusPreferencePage extends IPreferencePage {
/**
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
index f3ec34c88c1..07cbf3a6f37 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
@@ -65,7 +65,7 @@ import org.osgi.service.prefs.BackingStoreException;
* </p>
*
* @see org.eclipse.core.runtime.preferences
- * @since 3.1
+ * @since 1.2
*/
public class PapyrusScopedPreferenceStore extends EventManager implements IPreferenceStore, IPersistentPreferenceStore {
@@ -165,6 +165,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#added(org.eclipse.core.runtime.preferences.IEclipsePreferences
* .NodeChangeEvent)
*/
+ @Override
public void added(NodeChangeEvent event) {
if (nodeQualifier.equals(event.getChild().name()) && isListenerAttached()) {
getStorePreferences().addPreferenceChangeListener(preferencesListener);
@@ -177,6 +178,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#removed(org.eclipse.core.runtime.preferences.
* IEclipsePreferences.NodeChangeEvent)
*/
+ @Override
public void removed(NodeChangeEvent event) {
// Do nothing as there are no events from removed node
}
@@ -196,6 +198,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.
* preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (silentRunning) {
@@ -272,6 +275,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void addPropertyChangeListener(IPropertyChangeListener listener) {
initializePreferencesListener();// Create the preferences listener if it
// does not exist
@@ -351,6 +355,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
*/
+ @Override
public boolean contains(String name) {
if (name == null) {
return false;
@@ -364,6 +369,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String,
* java.lang.Object, java.lang.Object)
*/
+ @Override
public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
// important: create intermediate array to protect against listeners
// being added/removed during the notification
@@ -376,10 +382,11 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
final IPropertyChangeListener listener = (IPropertyChangeListener) list[i];
SafeRunner.run(new SafeRunnable(JFaceResources.getString("PreferenceStore.changeError")) { //$NON-NLS-1$
- public void run() {
- listener.propertyChange(event);
- }
- });
+ @Override
+ public void run() {
+ listener.propertyChange(event);
+ }
+ });
}
}
@@ -388,6 +395,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
*/
+ @Override
public boolean getBoolean(String name) {
String value = internalGet(name);
return value == null ? BOOLEAN_DEFAULT_DEFAULT : Boolean.valueOf(value).booleanValue();
@@ -398,6 +406,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
*/
+ @Override
public boolean getDefaultBoolean(String name) {
return getDefaultPreferences().getBoolean(name, BOOLEAN_DEFAULT_DEFAULT);
}
@@ -407,6 +416,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
*/
+ @Override
public double getDefaultDouble(String name) {
return getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT);
}
@@ -416,6 +426,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
*/
+ @Override
public float getDefaultFloat(String name) {
return getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT);
}
@@ -425,6 +436,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
*/
+ @Override
public int getDefaultInt(String name) {
return getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT);
}
@@ -434,6 +446,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
*/
+ @Override
public long getDefaultLong(String name) {
return getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT);
}
@@ -443,6 +456,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
*/
+ @Override
public String getDefaultString(String name) {
return getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT);
}
@@ -452,6 +466,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
*/
+ @Override
public double getDouble(String name) {
String value = internalGet(name);
if (value == null) {
@@ -482,6 +497,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
*/
+ @Override
public float getFloat(String name) {
String value = internalGet(name);
if (value == null) {
@@ -499,6 +515,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
*/
+ @Override
public int getInt(String name) {
String value = internalGet(name);
if (value == null) {
@@ -516,6 +533,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
*/
+ @Override
public long getLong(String name) {
String value = internalGet(name);
if (value == null) {
@@ -533,6 +551,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
*/
+ @Override
public String getString(String name) {
String value = internalGet(name);
return value == null ? STRING_DEFAULT_DEFAULT : value;
@@ -543,6 +562,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
*/
+ @Override
public boolean isDefault(String name) {
if (name == null) {
return false;
@@ -555,6 +575,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
*/
+ @Override
public boolean needsSaving() {
return dirty;
}
@@ -565,6 +586,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String,
* java.lang.String)
*/
+ @Override
public void putValue(String name, String value) {
try {
// Do not notify listeners
@@ -582,6 +604,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
removeListenerObject(listener);
if (!isListenerAttached()) {
@@ -595,6 +618,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* double)
*/
+ @Override
public void setDefault(String name, double value) {
getDefaultPreferences().putDouble(name, value);
}
@@ -605,6 +629,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* float)
*/
+ @Override
public void setDefault(String name, float value) {
getDefaultPreferences().putFloat(name, value);
}
@@ -615,6 +640,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* int)
*/
+ @Override
public void setDefault(String name, int value) {
getDefaultPreferences().putInt(name, value);
}
@@ -625,6 +651,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* long)
*/
+ @Override
public void setDefault(String name, long value) {
getDefaultPreferences().putLong(name, value);
}
@@ -635,6 +662,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* java.lang.String)
*/
+ @Override
public void setDefault(String name, String defaultObject) {
getDefaultPreferences().put(name, defaultObject);
}
@@ -645,6 +673,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
* boolean)
*/
+ @Override
public void setDefault(String name, boolean value) {
getDefaultPreferences().putBoolean(name, value);
}
@@ -654,6 +683,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
*/
+ @Override
public void setToDefault(String name) {
String oldValue = getString(name);
@@ -680,6 +710,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* double)
*/
+ @Override
public void setValue(String name, double value) {
double oldValue = getDouble(name);
if (oldValue == value) {
@@ -705,6 +736,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* float)
*/
+ @Override
public void setValue(String name, float value) {
float oldValue = getFloat(name);
if (oldValue == value) {
@@ -730,6 +762,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* int)
*/
+ @Override
public void setValue(String name, int value) {
int oldValue = getInt(name);
if (oldValue == value) {
@@ -755,6 +788,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* long)
*/
+ @Override
public void setValue(String name, long value) {
long oldValue = getLong(name);
if (oldValue == value) {
@@ -780,6 +814,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* java.lang.String)
*/
+ @Override
public void setValue(String name, String value) {
// Do not turn on silent running here as Strings are propagated
if (getDefaultString(name).equals(value)) {
@@ -796,6 +831,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
* @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
* boolean)
*/
+ @Override
public void setValue(String name, boolean value) {
boolean oldValue = getBoolean(name);
if (oldValue == value) {
@@ -820,6 +856,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
*
* @see org.eclipse.jface.preference.IPersistentPreferenceStore#save()
*/
+ @Override
public void save() throws IOException {
try {
getStorePreferences().flush();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java
index 7fafd1364aa..f0c1325de2b 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java
@@ -19,6 +19,8 @@ import org.eclipse.jface.preference.IPreferencePage;
* This singleton has bee created to manage the button ok and apply of preference page.
* In the case of button ok pressed, the behavior of eclipse try of apply in the first preference page found.
* Here each page has a specific behavior. So to store the preference, the active page is called
+ *
+ * @since 1.2
*
*/
public class VisiblePageSingleton {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
index 3b4a3791000..423e1f4d585 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
@@ -17,6 +17,8 @@ import java.util.ArrayList;
/**
* The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys
+ *
+ * @since 1.2
*/
public abstract class AbstractApplyValueOnPreferenceKeyDialog extends AbstractPreferenceKeyDialog {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
index 14b07d5d618..178bcb1c2d8 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
@@ -31,6 +31,8 @@ import org.eclipse.swt.widgets.TableColumn;
/**
* The Class AbstractPreferenceKeyDialog display all preference key that are given in parameters
+ *
+ * @since 1.2
*/
public abstract class AbstractPreferenceKeyDialog extends org.eclipse.jface.dialogs.StatusDialog {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
index b667228dde5..e86f8a0ef68 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
@@ -25,6 +25,8 @@ import com.google.common.collect.Iterables;
/**
* A content provider that synthesizes content from multiple other providers.
+ *
+ * @since 1.2
*/
public class CompositePapyrusContentProvider implements IAdaptableContentProvider, IHierarchicContentProvider, IStaticContentProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
index 71616365e59..b22cce3fed2 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
@@ -36,16 +36,24 @@ class CompositeSemanticContentProviderFactory implements ISemanticContentProvide
private CompositeSemanticContentProviderFactory(CompositeSemanticContentProviderFactory composite, ISemanticContentProviderFactory other) {
super();
+ this.factories = concat(composite, other);
+ }
+
+ private final List<ISemanticContentProviderFactory> concat(CompositeSemanticContentProviderFactory composite, ISemanticContentProviderFactory other) {
+ List<ISemanticContentProviderFactory> result;
+
if (other instanceof CompositeSemanticContentProviderFactory) {
List<ISemanticContentProviderFactory> otherFactories = ((CompositeSemanticContentProviderFactory) other).factories;
- factories = new ArrayList<>(composite.factories.size() + otherFactories.size());
- factories.addAll(composite.factories);
- factories.addAll(otherFactories);
+ result = new ArrayList<>(composite.factories.size() + otherFactories.size());
+ result.addAll(composite.factories);
+ result.addAll(otherFactories);
} else {
- factories = new ArrayList<>(composite.factories.size() + 1);
- factories.addAll(composite.factories);
- factories.add(other);
+ result = new ArrayList<>(composite.factories.size() + 1);
+ result.addAll(composite.factories);
+ result.add(other);
}
+
+ return result;
}
@Override
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
index de1ddcce51f..cec94950fac 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
@@ -30,6 +30,8 @@ import com.google.common.collect.Lists;
/**
* A content-provider implementing the complete set of Papyrus-specific content-provider APIs that
* delegates those APIs to another provider according to its actual capabilities.
+ *
+ * @since 1.2
*/
public class DelegatingPapyrusContentProvider implements IAdaptableContentProvider, IHierarchicContentProvider, IStaticContentProvider {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
index 05eecf9f087..287279d4cec 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
*
* @see IModel
* @see #compose(ISemanticContentProviderFactory)
+ * @since 1.2
*/
@FunctionalInterface
public interface ISemanticContentProviderFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
index fb55dabd681..3cc80437cd1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
* Listens to the Lifecycle of an {@link IMultiDiagramEditor}
*
* @author Camille Letavernier
+ * @since 1.2
*
*/
public interface EditorLifecycleEventListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
index d018ab385d1..a7044bf99c4 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.infra.core.services.IService;
* It notifies its listeners when the state of the editor changes
*
* @author Camille Letavernier
+ * @since 1.2
*
*/
public interface EditorLifecycleManager extends IService {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
index c83e251e17c..8ad0b6cda55 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
@@ -57,6 +57,7 @@ import com.google.common.collect.Maps;
* A Service to check workspace modifications on current resources
*
* @author Camille Letavernier
+ * @since 1.2
*
*/
public class ResourceUpdateService implements IService, IPartListener {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
index 5b84eadb2cb..26b6b124d5d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=430976
*
* @author Camille Letavernier
+ * @since 1.2
*/
public class SaveLayoutBeforeClose implements IService {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
index c392791147e..a147b871441 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
@@ -43,6 +43,7 @@ import org.eclipse.ui.services.IServiceLocator;
* Abstract Class to create menu from an Eclipse Command category
*
* @author VL222926
+ * @since 1.2
*
*/
public abstract class AbstractCreateMenuFromCommandCategory extends ExtensionContributionFactory {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
index 27bc70bb5bc..7299f5baefa 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.infra.ui.Activator;
* Util class for display in Papyrus (label providers, etc...)
*
* @deprecated Use the LabelProviderService instead
+ * @since 1.2
*/
@Deprecated
public class DisplayUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
index ace809b60a5..5b6c44d3a3b 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
@@ -33,6 +33,7 @@ import org.eclipse.ui.commands.ICommandService;
* This class provides useful methods to manipulate Eclipse Command
*
* @author vl222926
+ * @since 1.2
*
*/
public class EclipseCommandUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
index 01802f176fa..4835ae0e764 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
@@ -23,6 +23,8 @@ import org.eclipse.ui.PlatformUI;
/**
*
* a helper for the Editor
+ *
+ * @since 1.2
*
*/
public class EditorHelper {
@@ -34,7 +36,7 @@ public class EditorHelper {
/**
*
* @return
- * the current editor or <code>null</code> if not found
+ * the current editor or <code>null</code> if not found
*/
public static final IEditorPart getCurrentEditor() {
final IWorkbench workbench = PlatformUI.getWorkbench();
@@ -53,7 +55,7 @@ public class EditorHelper {
/**
*
* @return
- * the current active part or <code>null</code> if not found
+ * the current active part or <code>null</code> if not found
*/
public static final IWorkbenchPart getActivePart() {
final IWorkbench workbench = PlatformUI.getWorkbench();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
index 6918f42b92d..e476a005dd1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
@@ -60,6 +60,7 @@ import org.eclipse.ui.PlatformUI;
*
* @author cedric dumoulin
* @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>
+ * @since 1.2
*/
// FIXME throws Exception (eg: NotFoundException) instead of null
public class EditorUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java
deleted file mode 100644
index 08d3f1d857b..00000000000
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 2016 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:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.ui.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.Callable;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
-
-/**
- * The {@link Callable} analogue of an {@link IRunnableWithProgress}.
- *
- * @deprecated Use the {@link IProgressCallable} API, instead.
- */
-@Deprecated
-public interface ICallableWithProgress<V> extends IProgressCallable<V> {
- /**
- * Invokes me in a runnable context with a progress monitor.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive
- * requests for cancellation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception,
- * it should wrap it inside an <code>InvocationTargetException</code>; runtime exceptions are automatically
- * wrapped in an <code>InvocationTargetException</code> by the calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel,
- * using <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing <code>InterruptedException</code>
- *
- * @see UIUtil#call(IRunnableContext, ICallableWithProgress)
- * @see IRunnableContext#run
- */
- @Override
- V call(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
index ee0d9fb314f..f2a2e97666c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Display;
* Services to access to Papyrus images
*
* @author tristan faure
+ * @since 1.2
*
*/
public class PapyrusImageUtils {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
index 5132a841f4c..e189d5f32a7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
@@ -23,6 +23,7 @@ import org.eclipse.ui.PlatformUI;
/**
* @author VL222926
+ * @since 1.2
*
*/
public class SelectionHelper {
@@ -38,7 +39,7 @@ public class SelectionHelper {
/**
*
* @return
- * the selection service or <code>null</code> if not found
+ * the selection service or <code>null</code> if not found
*
*/
public static final ISelectionService getSelectionService() {
@@ -48,7 +49,7 @@ public class SelectionHelper {
// ISelectionService s1 = (ISelectionService) wb.getService(ISelectionService.class);
IWorkbenchWindow ww = wb.getActiveWorkbenchWindow();
if (ww != null) {
- return (ISelectionService) ww.getService(ISelectionService.class);
+ return ww.getService(ISelectionService.class);
}
}
return null;
@@ -57,7 +58,7 @@ public class SelectionHelper {
/**
*
* @return
- * the current selection or an empty selection. can't be <code>null</code>
+ * the current selection or an empty selection. can't be <code>null</code>
*/
public static final ISelection getCurrentSelection() {
ISelectionService selectionService = getSelectionService();
@@ -75,7 +76,7 @@ public class SelectionHelper {
* @param viewId
* the id of the view for which we want the selection
* @return
- * the current selection for the view, the returned value can't be <code>null</code>
+ * the current selection for the view, the returned value can't be <code>null</code>
*/
public static final ISelection getCurrentSelection(String viewId) {
ISelectionService selectionService = getSelectionService();
@@ -91,7 +92,7 @@ public class SelectionHelper {
/**
*
* @return
- * a structured selection.
+ * a structured selection.
* the returned value can't be <code>null</code>
*/
public static final IStructuredSelection getCurrentStructuredSelection() {
@@ -107,7 +108,7 @@ public class SelectionHelper {
* @param viewId
* the id of the view for which we want the selection
* @return
- * the current selection for the view, the returned value can't be <code>null</code>
+ * the current selection for the view, the returned value can't be <code>null</code>
*/
public static final IStructuredSelection getCurrentStructuredSelection(String viewId) {
ISelection selection = getCurrentSelection(viewId);
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
index 917a41e8688..1ec3fd0134a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
@@ -38,6 +38,7 @@ import org.eclipse.ui.IEditorPart;
* @author cedric dumoulin
*
* @deprecated 0.10: Use org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers instead
+ * @since 1.2
*/
@Deprecated
public class ServiceUtilsForActionHandlers extends AbstractServiceUtils<Void> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
index aec185cc30e..63f6cd24d44 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
@@ -35,6 +35,7 @@ import org.eclipse.ui.IWorkbenchPartSite;
* @author Camille Letavernier
*
* @see ServiceUtilsForSelection
+ * @since 1.2
*/
public class ServiceUtilsForHandlers extends AbstractServiceUtils<ExecutionEvent> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
index 015a5e5076e..506ef6a36b7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
@@ -30,6 +30,7 @@ import org.eclipse.ui.IWorkbenchPartSite;
*
*
* @author Cedric Dumoulin
+ * @since 1.2
*
*/
public class ServiceUtilsForIEvaluationContext extends AbstractServiceUtils<IEvaluationContext> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
index f3a799d303a..87126ccc654 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
* Expects an IStructuredSelection containing at least one EObject (It then relies on ServiceUtilsForEObject to retrieve the ServicesRegistry)
*
* @author Camille Letavernier
+ * @since 1.2
*/
public class ServiceUtilsForSelection extends AbstractServiceUtils<ISelection> {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
index 624257964cc..a46413cbbf5 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
@@ -21,6 +21,7 @@ import org.eclipse.ui.IWorkbenchPage;
* A ServiceUtils implementation for manipulating the Papyrus services from an IWorkbenchPage
*
* @author Camille Letavernier
+ * @since 1.2
*
*/
public class ServiceUtilsForWorkbenchPage extends AbstractServiceUtils<IWorkbenchPage> {
@@ -40,7 +41,7 @@ public class ServiceUtilsForWorkbenchPage extends AbstractServiceUtils<IWorkbenc
}
if (adaptable != null) {
- ServicesRegistry registry = (ServicesRegistry) adaptable.getAdapter(ServicesRegistry.class);
+ ServicesRegistry registry = adaptable.getAdapter(ServicesRegistry.class);
if (registry != null) {
return registry;
}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
index 825a99386a3..1fdc3344e41 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
@@ -24,6 +24,8 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
/**
* Helper utilities for working with transactions on the UI thread.
+ *
+ * @since 1.2
*/
public class TransactionUIHelper {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
index 343bcdeba56..1c4c074654f 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
@@ -67,6 +67,8 @@ import com.google.common.collect.Iterators;
/**
* Miscellaneous general-purpose UI utilities.
+ *
+ * @since 1.2
*/
public class UIUtil {
@@ -195,33 +197,6 @@ public class UIUtil {
* propagated by the context if the runnable
* acknowledges cancellation by throwing this exception. This should not be thrown
* if {@code cancelable} is {@code false}.
- *
- * @deprecated Use the {@link #call(IRunnableContext, boolean, boolean, IProgressCallable)} or
- * {@link IExecutorService#submit(IProgressCallable)} API, instead.
- */
- @Deprecated
- public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, ICallableWithProgress<V> callable) throws InvocationTargetException, InterruptedException {
- return call(context, fork, cancelable, (IProgressCallable<V>) callable);
- }
-
- /**
- * Calls a {@code callable} in the given {@code context}.
- *
- * @param fork
- * {@code true} if the runnable should be run in a separate thread,
- * and {@code false} to run in the same thread
- * @param cancelable
- * {@code true} to enable the cancellation, and {@code false} to make the operation uncancellable
- * @param runnable
- * the runnable to run
- *
- * @exception InvocationTargetException
- * wraps any exception or error which occurs
- * while running the runnable
- * @exception InterruptedException
- * propagated by the context if the runnable
- * acknowledges cancellation by throwing this exception. This should not be thrown
- * if {@code cancelable} is {@code false}.
*/
public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, IProgressCallable<V> callable) throws InvocationTargetException, InterruptedException {
class RunnableWrapper implements IRunnableWithProgress {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
index 4ecdc94d48f..440fd597ff0 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
@@ -23,6 +23,8 @@ import org.eclipse.ui.PlatformUI;
/**
*
* a helper for the Eclipse workbench part
+ *
+ * @since 1.2
*
*/
public class WorkbenchPartHelper {
@@ -34,7 +36,7 @@ public class WorkbenchPartHelper {
/**
*
* @return
- * the current IWorkbenchPart or <code>null</code> if not found
+ * the current IWorkbenchPart or <code>null</code> if not found
*/
public static final IWorkbenchPart getCurrentActiveWorkbenchPart() {
final IWorkbench workbench = PlatformUI.getWorkbench();
@@ -53,7 +55,7 @@ public class WorkbenchPartHelper {
/**
*
* @return
- * the current IEditorPart or <code>null</code> if not found
+ * the current IEditorPart or <code>null</code> if not found
*/
public static final IEditorPart getCurrentActiveEditorPart() {
final IWorkbench workbench = PlatformUI.getWorkbench();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project
index 339688bbd54..45fd4cf5251 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project
@@ -20,9 +20,33 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
index 1aea866730d..36ccfbb2c83 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
@@ -10,13 +10,12 @@ Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,
org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,
org.eclipse.papyrus.infra.widgets.toolbox.notification.view,
org.eclipse.papyrus.infra.widgets.toolbox.utils
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.forms;bundle-version="3.5.100",
- org.eclipse.draw2d;bundle-version="3.8.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
index db46f76958c..b55a94b4464 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
@@ -127,6 +127,7 @@ public class NotificationBuilder implements INotificationBuilder {
* , a runnable triggered when default action of the notification is selected
* The first action added is the default One
* @return this
+ * @since 1.2
*/
@SuppressWarnings("unchecked")
public NotificationBuilder addAction(NotificationRunnable runnable) {
@@ -223,6 +224,7 @@ public class NotificationBuilder implements INotificationBuilder {
* @param type
* , the desired type
* @return this
+ * @since 1.2
*/
public NotificationBuilder setType(Type type) {
parameters.put(TYPE, type);
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project
index 6c2049aab43..d94e5b0dae1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project
@@ -20,9 +20,37 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.missing.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters
new file mode 100644
index 00000000000..e9d125135df
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.papyrus.infra.widgets" version="2">
+ <resource path="src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java" type="org.eclipse.papyrus.infra.widgets.editors.AbstractEditor">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.editors.AbstractEditor"/>
+ <message_argument value="factory"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java" type="org.eclipse.papyrus.infra.widgets.editors.MultipleValueEditor">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.editors.MultipleValueEditor"/>
+ <message_argument value="MANY"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java" type="org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog"/>
+ <message_argument value="MANY"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider"/>
+ <message_argument value="instance"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider"/>
+ <message_argument value="instance"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider"/>
+ <message_argument value="instance"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java" type="org.eclipse.papyrus.infra.widgets.providers.UnchangedObject">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.providers.UnchangedObject"/>
+ <message_argument value="instance"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java" type="org.eclipse.papyrus.infra.widgets.providers.UnsetObject">
+ <filter comment="No sane developer would have assigned these fields" id="388100214">
+ <message_arguments>
+ <message_argument value="org.eclipse.papyrus.infra.widgets.providers.UnsetObject"/>
+ <message_argument value="instance"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index fd449867eca..bb486e86d50 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -1,17 +1,14 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.core.databinding,
- org.eclipse.jface.databinding,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
com.ibm.icu;bundle-version="4.4.2",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.jface.text;bundle-version="3.10.0",
- org.eclipse.emf.edit;bundle-version="2.12.0"
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.infra.widgets,
org.eclipse.papyrus.infra.widgets.creation,
org.eclipse.papyrus.infra.widgets.databinding,
@@ -26,7 +23,7 @@ Export-Package: org.eclipse.papyrus.infra.widgets,
org.eclipse.papyrus.infra.widgets.wizard.pages
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
index 3ee11efad95..c7067be8e76 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.widgets</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
index 22a624ecf77..db1d6132146 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
@@ -57,25 +57,28 @@ public class SelectionMenu {
private Object input;
private Shell shell;
-
+
private TableViewer tableViewer;
private ISelectionChangedListener selectionChangedListener;
private List<ISelectionChangedListener> selectionChangedListeners;
-
+
private KeyListener keyListener;
-
+
private List<KeyListener> keyListeners;
-
+
private MouseTrackListener mouseTrackListener;
-
+
private List<MouseTrackListener> mouseTrackListeners;
public SelectionMenu(Shell parentShell) {
this(parentShell, parentShell.getDisplay().getCursorLocation());
}
-
+
+ /**
+ * @since 2.0
+ */
public SelectionMenu(Shell parentShell, Object source) {
if (source instanceof TableViewer && parentShell != null) {
TableViewer tableViewer = (TableViewer) source;
@@ -87,7 +90,7 @@ public class SelectionMenu {
y += selectionIndex * cellHeight;
// Get the cell's x position and append by the table's width
- //int width= tableViewer.getTable().getSize().x;
+ // int width= tableViewer.getTable().getSize().x;
int width = tableViewer.getTable().getShell().getBounds().width;
int x = tableViewer.getTable().getShell().getLocation().x + width;
@@ -95,16 +98,19 @@ public class SelectionMenu {
init(parentShell, location, -1, 0);
return;
}
-
+
init(parentShell, parentShell.getDisplay().getCursorLocation(), 1, 1);
}
-
+
+ /**
+ * @since 2.0
+ */
public SelectionMenu(Shell parentShell, Object source, Point cursorPosition) {
if (source instanceof Table && parentShell != null && cursorPosition != null) {
Table table = (Table) source;
-
+
TableItem item = table.getItem(cursorPosition);
-
+
if (item != null) {
int selectionIndex = 0;
for (Object tableItem : table.getItems()) {
@@ -113,13 +119,13 @@ public class SelectionMenu {
}
selectionIndex++;
}
-
+
int cellHeight = item.getBounds().height;
int y = table.getShell().getLocation().y;
y += selectionIndex * cellHeight;
// Get the cell's x position and append by the table's width
- //int width= tableViewer.getTable().getSize().x;
+ // int width= tableViewer.getTable().getSize().x;
int width = table.getShell().getBounds().width;
int x = table.getShell().getLocation().x + width;
@@ -128,14 +134,17 @@ public class SelectionMenu {
return;
}
}
-
+
init(parentShell, parentShell.getDisplay().getCursorLocation(), 1, 1);
}
public SelectionMenu(Shell parentShell, Point location) {
init(parentShell, location, 1, 1);
}
-
+
+ /**
+ * @since 2.0
+ */
protected void init(Shell parentShell, Point location, int xOffset, int yOffset) {
// Move the shell so that it doesn't open under the mouse
// The hovered element can still be selected
@@ -172,7 +181,7 @@ public class SelectionMenu {
}
}
};
-
+
mouseTrackListeners = new LinkedList<MouseTrackListener>();
mouseTrackListener = new MouseTrackListener() {
@Override
@@ -203,10 +212,12 @@ public class SelectionMenu {
shell = new Shell(parentShell, SWT.NONE);
shell.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));
shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
- /*GridLayout gridLayout = new GridLayout(1, false);
- gridLayout.marginWidth = 5;
- gridLayout.marginHeight = 5;
- shell.setLayout(gridLayout);*/
+ /*
+ * GridLayout gridLayout = new GridLayout(1, false);
+ * gridLayout.marginWidth = 5;
+ * gridLayout.marginHeight = 5;
+ * shell.setLayout(gridLayout);
+ */
shell.setLayout(new GridLayout(1, false));
// TableViewer for menu items
@@ -216,7 +227,7 @@ public class SelectionMenu {
tableViewer.setLabelProvider(labelProvider);
ColumnViewerToolTipSupport.enableFor(tableViewer);
tableViewer.setInput(input);
-
+
// Listeners
tableViewer.addSelectionChangedListener(selectionChangedListener);
tableViewer.getTable().addKeyListener(keyListener);
@@ -226,10 +237,13 @@ public class SelectionMenu {
shell.setLocation(location);
shell.pack();
shell.open();
-
-
+
+
}
-
+
+ /**
+ * @since 2.0
+ */
public void refresh() {
tableViewer.refresh();
shell.pack();
@@ -239,11 +253,11 @@ public class SelectionMenu {
if (tableViewer != null) {
tableViewer.removeSelectionChangedListener(selectionChangedListener);
}
-
+
if (tableViewer.getTable() != null) {
tableViewer.getTable().removeKeyListener(keyListener);
}
-
+
if (shell != null) {
shell.dispose();
}
@@ -252,7 +266,7 @@ public class SelectionMenu {
public void setContentProvider(IStructuredContentProvider provider) {
this.contentProvider = provider;
}
-
+
public void setInput(Object input) {
this.input = input;
}
@@ -261,30 +275,51 @@ public class SelectionMenu {
this.labelProvider = labelProvider;
}
+ /**
+ * @since 1.2
+ */
public void addSelectionChangedListener(ISelectionChangedListener listener) {
this.selectionChangedListeners.add(listener);
}
-
+
+ /**
+ * @since 2.0
+ */
public void addKeyListener(KeyListener listener) {
this.keyListeners.add(listener);
}
-
+
+ /**
+ * @since 2.0
+ */
public void addMouseTrackListener(MouseTrackListener listener) {
this.mouseTrackListeners.add(listener);
}
-
+
+ /**
+ * @since 2.0
+ */
public Shell getShell() {
return shell;
}
+ /**
+ * @since 2.0
+ */
public void setShell(Shell shell) {
this.shell = shell;
}
-
+
+ /**
+ * @since 2.0
+ */
public Shell getParentShell() {
return parentShell;
}
-
+
+ /**
+ * @since 2.0
+ */
public TableViewer getTableViewer() {
return tableViewer;
}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
index 91bd6ae32ce..a56a0a0d418 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
@@ -97,6 +97,9 @@ public class CompositeContentProvider implements ICompositeContentProvider {
contentProviders.add(treeContentProvider);
}
+ /**
+ * @since 2.0
+ */
public List<ITreeContentProvider> getContentProviders() {
return contentProviders;
}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
index cadecebe16f..6272fd11b9f 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
@@ -47,7 +47,7 @@ public interface INameResolutionHelper {
* The element to get the shortest qualified name.
* @return
* the shortest qualified to use for the element
- * @deprecated since 1.2.0
+ * @deprecated since 2.0
*/
@Deprecated
public List<String> getShortestQualifiedNames(final Object element);
@@ -60,6 +60,8 @@ public interface INameResolutionHelper {
* @param manageDuplicate
* Boolean to determinate if the duplicated shortest qualified names must be remove from the returned list.
* @return the shortest qualified to use for the element
+ *
+ * @since 2.0
*/
public List<String> getShortestQualifiedNames(final Object element, final boolean manageDuplicate);

Back to the top