. This content provider is associated to, via the viewer ID.
+ *
+ * @return the common navigator
+ */
+ protected CommonNavigator getCommonNavigator() {
+ IViewPart part = NavigatorUtils.findViewPart(getViewerID());
+ if(part instanceof CommonNavigator) {
+ return ((CommonNavigator)part);
+ }
+ return null;
+ }
+
+ protected ModelNavigator getModelNavigator() {
+ CommonNavigator nav = getCommonNavigator();
+ return nav instanceof ModelNavigator ? (ModelNavigator)nav : null;
+ }
+
+ protected String getViewerID() {
+ return contentExtensionSite.getExtensionStateModel().getViewerId();
+ }
+
+}
diff --git a/deprecated/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/sorters/UMLViewerSorter.java b/deprecated/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/sorters/UMLViewerSorter.java
new file mode 100644
index 00000000000..b7d971796a1
--- /dev/null
+++ b/deprecated/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/sorters/UMLViewerSorter.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Obeo.
+ * 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:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.navigator.sorters;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+
+/**
+ * This class sort elements in Model Navigator.
+ *
+ * @author Jerome Benois
+ **/
+public class UMLViewerSorter extends ViewerSorter {
+
+ @Override
+ public int compare(Viewer viewer, Object e1, Object e2) {
+ // Add diagram at first position
+ if(e1 instanceof Diagram || e2 instanceof Diagram) {
+ if(e1 instanceof Diagram && e2 instanceof Diagram) {
+ return super.compare(viewer, e1, e2);
+ } else {
+ return 1;
+ }
+ }
+ return super.compare(viewer, e1, e2);
+ }
+
+}
diff --git a/plugins/others/org.eclipse.papyrus.navigator/.classpath b/plugins/others/org.eclipse.papyrus.navigator/.classpath
deleted file mode 100644
index 64c5e31b7a2..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/.project b/plugins/others/org.eclipse.papyrus.navigator/.project
deleted file mode 100644
index 80f0f97e73b..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- org.eclipse.papyrus.navigator
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/.settings/org.eclipse.jdt.core.prefs b/plugins/others/org.eclipse.papyrus.navigator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 66cb186456f..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Feb 04 16:43:43 GMT+01:00 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/others/org.eclipse.papyrus.navigator/META-INF/MANIFEST.MF b/plugins/others/org.eclipse.papyrus.navigator/META-INF/MANIFEST.MF
deleted file mode 100644
index 546bd9bf6b3..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui.navigator;bundle-version="3.3.101",
- org.eclipse.emf.ecore.editor;bundle-version="2.4.0",
- org.eclipse.uml2.uml.editor;bundle-version="2.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
- org.eclipse.emf.converter;bundle-version="2.5.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gef;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0"
-Export-Package: org.eclipse.papyrus.navigator,
- org.eclipse.papyrus.navigator.actions,
- org.eclipse.papyrus.navigator.dialog,
- org.eclipse.papyrus.navigator.dnd,
- org.eclipse.papyrus.navigator.factory,
- org.eclipse.papyrus.navigator.filters;uses:="org.eclipse.jface.viewers",
- org.eclipse.papyrus.navigator.internal;x-internal:=true,
- org.eclipse.papyrus.navigator.internal.utils;x-internal:=true,
- org.eclipse.papyrus.navigator.providers,
- org.eclipse.papyrus.navigator.sorters
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.navigator.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.navigator;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/about.html b/plugins/others/org.eclipse.papyrus.navigator/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-June 5, 2007
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/build.properties b/plugins/others/org.eclipse.papyrus.navigator/build.properties
deleted file mode 100644
index 8308a1ef92d..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Mon Sep 12 09:29:59 CEST 2011
-bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties,schema/
-output..=bin/
-src.includes=about.html,schema/,META-INF/,.,plugin.xml,icons/,plugin.properties
-source..=src/
-bin..=bin/
diff --git a/plugins/others/org.eclipse.papyrus.navigator/icons/ModelExplorer.gif b/plugins/others/org.eclipse.papyrus.navigator/icons/ModelExplorer.gif
deleted file mode 100644
index acb63823aa3..00000000000
Binary files a/plugins/others/org.eclipse.papyrus.navigator/icons/ModelExplorer.gif and /dev/null differ
diff --git a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/duplicate.png b/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/duplicate.png
deleted file mode 100644
index 195dc6d6c36..00000000000
Binary files a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/duplicate.png and /dev/null differ
diff --git a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/rename.gif b/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/rename.gif
deleted file mode 100644
index e6f786eca9a..00000000000
Binary files a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/rename.gif and /dev/null differ
diff --git a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/search.gif b/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/search.gif
deleted file mode 100644
index a75166978d7..00000000000
Binary files a/plugins/others/org.eclipse.papyrus.navigator/icons/etool16/search.gif and /dev/null differ
diff --git a/plugins/others/org.eclipse.papyrus.navigator/plugin.properties b/plugins/others/org.eclipse.papyrus.navigator/plugin.properties
deleted file mode 100644
index ff4e6c71189..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-########################################################################################
-#
-# Copyright (c) 2009 Obeo.
-# 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:
-# Obeo - initial API and implementation
-########################################################################################
-pluginName=Papyrus Navigator (Incubation)
-providerName=Eclipse Modeling Project
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/plugin.xml b/plugins/others/org.eclipse.papyrus.navigator/plugin.xml
deleted file mode 100644
index 60715ef991d..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/plugin.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/schema/org.eclipse.papyrus.navigator.actionHandler.exsd b/plugins/others/org.eclipse.papyrus.navigator/schema/org.eclipse.papyrus.navigator.actionHandler.exsd
deleted file mode 100644
index f01f090dfac..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/schema/org.eclipse.papyrus.navigator.actionHandler.exsd
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
-
-
- This extension point allows adding action in the contextual menu of the model explorer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- registered action identifier
-
-
-
-
-
-
- implement the action handler factory to add your custom actions
-
-
-
-
-
-
-
-
-
- fill the action id after you want to insert yours
-
-
-
-
-
-
- Add a separator before your action(s) if needed
-
-
-
-
-
-
-
-
-
-
-
- [Enter the first release in which this extension point appears.]
-
-
-
-
-
-
-
-
- org.eclipse.papyrus.navigator.factory.DefaultEMFActionsFactory adds default EMF actions in model explorer.
-See registered extension org.eclipse.papyrus.navigator.actionHandler
-
-
-
-
-
-
-
-
- The class must implement interface org.eclipse.papyrus.navigator.factory.IActionHandlerFactory
-
-
-
-
-
-
-
-
- none
-
-
-
-
-
-
-
-
- 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
-
-
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/schema/providerAdapterFactory.exsd b/plugins/others/org.eclipse.papyrus.navigator/schema/providerAdapterFactory.exsd
deleted file mode 100644
index f16405105b2..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/schema/providerAdapterFactory.exsd
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
- This extension provides factories to the navigator which will be used to display informations like labels and images of the EObjects displayed in this navigator.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- An adapter factory
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UMLComposedAdapterFactory adds a composed factory for UML which used UMLResourceItemProviderAdapterFactory and UMLItemProviderAdapterFactory (from the uml2 plugin) to retrieved labels or images from the UML elements.
-
-
-
-
-
-
-
-
diff --git a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/ModelNavigator.java b/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/ModelNavigator.java
deleted file mode 100644
index 8dfb4130cc7..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/ModelNavigator.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Obeo.
-
- * 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:
- * Obeo - initial API and implementation
- * Francisco Javier Cano Muñoz (Prodevelop) - bugs solving, features implementation
- *******************************************************************************/
-package org.eclipse.papyrus.navigator;
-
-import static org.eclipse.papyrus.navigator.internal.Activator.log;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListener;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.navigator.actions.GroupChildrenAction;
-import org.eclipse.papyrus.navigator.actions.RemoveTypePrefixAction;
-import org.eclipse.papyrus.navigator.actions.SearchElementAction;
-import org.eclipse.papyrus.navigator.internal.Activator;
-import org.eclipse.papyrus.navigator.internal.utils.NavigatorUtils;
-import org.eclipse.papyrus.navigator.internal.utils.StereotypeApplicationUtils;
-import org.eclipse.papyrus.navigator.providers.IContentProvider;
-import org.eclipse.papyrus.navigator.providers.ToEditorSaveable;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.Saveable;
-import org.eclipse.ui.navigator.CommonNavigator;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.INavigatorContentExtension;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * This class define a view used to navigate in UML model and resource
- *
- * @author Jerome Benois
- * @author Francisco Javier Cano Muñoz
- */
-public class ModelNavigator extends CommonNavigator implements IEditingDomainProvider {
-
- /** ID Of the Navigator. */
- public static final String ID_MODELNAVIGATOR = "org.eclipse.papyrus.navigator.modelExplorer";
-
- // //
- // fjcano #291192 :: type prefix in model explorer
- // //
- public static final String PROPERTY_REMOVEPREFIX = "org.eclipse.papyrus.navigator.view.removeTypePrefix";
-
- public static final int IS_REMOVEPREFIXTYPE_ENABLED_PROPERTY = 16774;
-
- // //
- // fjcano #290422 :: grouping children by type
- // //
- public static final String PROPERTY_GROUPCHILDS = "org.eclipse.papyrus.navigator.view.groupchilds";
-
- public static final int IS_GROUPINGCHILDS_ENABLED_PROPERTY = 987;
-
- // //
- // fjcano #288599# :: enable linking by default in the model explorer
- // //
- private final String LINKING_ENABLED = "CommonNavigator.LINKING_ENABLED"; //$NON-NLS-1$
-
- private boolean isRemovePrefixTypeEnabled = false;
-
- private IWorkbenchPage page = null;
-
- private boolean isGroupingChildsEnabled = false;
-
- // optimize selection handling
- private boolean handlingSelectionChanged = false;
-
- /** {@link TransactionalEditingDomain} used to perform actions and commands. */
- private TransactionalEditingDomain editingDomain = null;
-
- /** Active {@link IEditorPart}. */
- private IEditorPart editorPart = null;
-
- /**
- * The {@link IPropertySheetPage} this model exploer will use.
- */
- private IPropertySheetPage propertySheetPage = null;
-
- /**
- * {@link ResourceSetListener} to listen and react to changes in the resource set.
- */
- private final ResourceSetListener resourceSetListener = new ResourceSetListenerImpl() {
-
- @Override
- public void resourceSetChanged(ResourceSetChangeEvent event) {
- super.resourceSetChanged(event);
- handleResourceSetChanged(event);
- }
- };
-
- // //
- // fjcano #290424 :: allow saving from the Model Explorer
- // //
- private final ToEditorSaveable toEditorSaveable = new ToEditorSaveable(null, this);
-
- private final Saveable[] toEditorSaveableArray = new Saveable[]{ toEditorSaveable };
-
- /**
- * Make the synchronization between the editor and the model explorer active by default.
- */
- @Override
- public void init(IViewSite aSite, IMemento aMemento) throws PartInitException {
- super.init(aSite, aMemento);
- // fjcano #288599# :: linking enabled by default
- if(memento != null) {
- Integer linkingEnabledInteger = memento.getInteger(LINKING_ENABLED);
- setLinkingEnabled(((linkingEnabledInteger != null) ? linkingEnabledInteger.intValue() == 1 : true));
- } else {
- // fjcano :: linking is enabled by default.
- setLinkingEnabled(true);
- }
- }
-
- private ToEditorSaveable getToEditorSaveable() {
- // fjcano #290424 :: allow saving from the Model Explorer
- return toEditorSaveable;
- }
-
- /**
- * Due to the NavigatorSaveablesService not updating correctly the Saveables available via the
- * ContentProviders, a new and direct way of getting the Saveables is implemented here.
- *
- * @author Francisco Javier Cano Muñoz
- */
- @Override
- public Saveable[] getSaveables() {
- // fjcano #290424 :: allow saving from the Model Explorer
- // return a Saveable that targets the doSave action to the Active
- // Editor.
- return toEditorSaveableArray;
- }
-
- /**
- * Due to the NavigatorSaveablesService not updating correctly the Saveables available via the
- * ContentProviders, a new and direct way of getting the Saveables is implemented here.
- *
- * @author Francisco Javier Cano Muñoz
- */
- @Override
- public Saveable[] getActiveSaveables() {
- // fjcano #290424 :: allow saving from the Model Explorer
- // return a Saveable that targets the doSave action to the Active
- // Editor.
- return toEditorSaveableArray;
- }
-
- /**
- * Method to perform all necessary updates.
- */
- private void doUpdate() {
- // fjcano #290424 :: allow saving from the Model Explorer
- if(getToEditorSaveable() != null) {
- getToEditorSaveable().setEditor(editorPart);
- }
- }
-
- /**
- * Sets the grouping of children by type. Fires a property change that makes the model explorer
- * to refresh.
- *
- * @param toGroupChilds
- */
- public final void setGroupChildsEnabled(boolean toGroupChilds) {
- // fjcano :: #290422
- isGroupingChildsEnabled = toGroupChilds;
- firePropertyChange(IS_GROUPINGCHILDS_ENABLED_PROPERTY);
- ISelection sel = this.getCommonViewer().getSelection();
- if(sel instanceof ITreeSelection && ((ITreeSelection)sel).getFirstElement() != null) {
- IStructuredSelection s = new StructuredSelection(((ITreeSelection)sel).getFirstElement());
- this.getCommonViewer().setSelection(s, true);
- }
- this.refreshViewer();
- }
-
- /**
- * Retrieves the value of the grouping children flag.
- *
- * @return
- */
- public boolean isGroupingChildsEnabled() {
- // fjcano :: #290422
- return this.isGroupingChildsEnabled;
- }
-
- /**
- * Retrieves the grouping of children action.
- *
- * @return
- */
- private IAction getGroupChildrenAction() {
- // fjcano :: #290422
- IAction groupChildsAction = new GroupChildrenAction(this);
- ImageDescriptor folderIcon = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
- groupChildsAction.setImageDescriptor(folderIcon);
- groupChildsAction.setHoverImageDescriptor(folderIcon);
- return groupChildsAction;
- }
-
- /**
- * Set the isRemovePrefixTypeEnabled to the given value and fire a property change event.
- *
- * @param isRemovePrefixTypeEnabled
- */
- public void setRemovePrefixTypeEnabled(boolean isRemovePrefixTypeEnabled) {
- // fjcano #291192
- this.isRemovePrefixTypeEnabled = isRemovePrefixTypeEnabled;
- firePropertyChange(IS_REMOVEPREFIXTYPE_ENABLED_PROPERTY);
- refreshViewer();
- }
-
- /**
- * Gets whether the removal of prefix types is enabled or not.
- *
- * @return
- */
- public boolean isRemovePrefixTypeEnabled() {
- // fjcano #291192
- return isRemovePrefixTypeEnabled;
- }
-
- private IAction getRemoveTypesPrefixAction() {
- // fjcano #291192
- IAction removeTypesPrefixAction = new RemoveTypePrefixAction(this);
- ImageDescriptor clearIcon = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE);
- removeTypesPrefixAction.setImageDescriptor(clearIcon);
- removeTypesPrefixAction.setHoverImageDescriptor(clearIcon);
- return removeTypesPrefixAction;
- }
-
- private IAction getSearchAction() {
- // fjcano #290425 :: add search element action to model navigator
- IAction searchAction = new SearchElementAction(this);
- ImageDescriptor magnifyingGlassIcon = Activator.getImageDescriptor("icons/etool16/search.gif");
- searchAction.setImageDescriptor(magnifyingGlassIcon);
- searchAction.setHoverImageDescriptor(magnifyingGlassIcon);
- return searchAction;
- }
-
- /**
- * Add the "Group children" action.
- */
- @Override
- public void createPartControl(Composite aParent) {
- super.createPartControl(aParent);
- // fjcano #290422 :: add "Group children" action
- getViewSite().getActionBars().getToolBarManager().add(getGroupChildrenAction());
- // fjcano #291192
- getViewSite().getActionBars().getToolBarManager().add(getRemoveTypesPrefixAction());
- // fjcano #290425 :: add search action to model navigator
- getViewSite().getActionBars().getToolBarManager().add(getSearchAction());
- }
-
- private void handleResourceSetChanged(ResourceSetChangeEvent event) {
- // Notify all content providers
- List notifications = event.getNotifications();
- int i = 0;
- boolean finish = false;
- while(!finish && i < notifications.size()) {
- Object n = notifications.get(i);
- if(n instanceof Notification) {
- Notification notification = (Notification)n;
- Iterator it = getNavigatorContentService().findRootContentExtensions(notification.getNotifier()).iterator();
- while(it.hasNext()) {
- Object obj = it.next();
- finish = true;
- if(obj instanceof INavigatorContentExtension) {
- INavigatorContentExtension nce = (INavigatorContentExtension)obj;
- if(nce.getContentProvider() instanceof IContentProvider) {
- IContentProvider provider = (IContentProvider)nce.getContentProvider();
- provider.resourceSetChanged(event);
- }
- }
- }
- }
- i++;
- }
- }
-
- /**
- * A new {@link IWorkbenchPart} has been activated, refresh.
- *
- * @param partRef
- */
- private void handlePartActivated(IWorkbenchPartReference partRef) {
- IWorkbenchPart part = partRef.getPart(false);
- if(part instanceof IEditorPart) {
- activate();
- }
- }
-
- /**
- * An {@link IWorkbenchPart} has been deactivated, refresh.
- *
- * @param partRef
- */
- private void handlePartDeactivated(IWorkbenchPartReference partRef) {
- IWorkbenchPart part = partRef.getPart(false);
- if(editorPart != null && editorPart.equals(part)) {
- deactivate();
- }
- }
-
- /**
- * Activate the Model Explorer.
- */
- private void activate() {
- this.editorPart = EditorUtils.getMultiDiagramEditor();
- this.editingDomain = EditorUtils.getTransactionalEditingDomain();
- if(editingDomain != null) {
- editingDomain.addResourceSetListener(resourceSetListener);
- }
- refreshViewer();
- // fjcano #290424 :: allow saving from the Model Explorer
- doUpdate();
- }
-
- /**
- * Deactivate the Model Explorer.
- */
- private void deactivate() {
- editorPart = null;
- if(editingDomain != null) {
- editingDomain.removeResourceSetListener(resourceSetListener);
- }
- // if (propertySheet != null) {
- // propertySheet.dispose();
- // }
- refreshViewer();
- // fjcano #290424 :: allow saving from the Model Explorer
- doUpdate();
- }
-
- /**
- * Adapts to {@link IPropertySheetPage}. Other adaptations are handled by superclasses.
- */
- @SuppressWarnings("unchecked")
- @Override
- public Object getAdapter(Class adapter) {
- if(IPropertySheetPage.class.equals(adapter)) {
- return getPropertySheetPage();
- }
- return super.getAdapter(adapter);
- }
-
- /**
- * Forces the viewer to be refreshed.
- */
- private void refreshViewer() {
- CommonViewer viewer = getCommonViewer();
- if(viewer != null && viewer.getTree().isDisposed() == false) {
- viewer.refresh();
- }
- }
-
- /**
- * Adds an {@link IPartListener2} and an {@link ISelectionListener}.
- */
- @Override
- public void init(IViewSite site) throws PartInitException {
- super.init(site);
- page = site.getPage();
- // IPartListener to listen to IWorkbenchParts' life cycle.
- page.addPartListener(new IPartListener2() {
-
- public void partActivated(IWorkbenchPartReference partRef) {
- handlePartActivated(partRef);
- }
-
- public void partBroughtToTop(IWorkbenchPartReference partRef) {
- }
-
- public void partClosed(IWorkbenchPartReference partRef) {
- handlePartDeactivated(partRef);
- }
-
- public void partDeactivated(IWorkbenchPartReference partRef) {
- }
-
- public void partHidden(IWorkbenchPartReference partRef) {
- }
-
- public void partInputChanged(IWorkbenchPartReference partRef) {
- handlePartActivated(partRef);
- }
-
- public void partOpened(IWorkbenchPartReference partRef) {
- handlePartActivated(partRef);
- }
-
- public void partVisible(IWorkbenchPartReference partRef) {
- handlePartActivated(partRef);
- }
-
- });
- // an ISelectionListener to react to workbench selection changes.
- page.addSelectionListener(new ISelectionListener() {
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- handleSelectionChangedFromDiagramEditor(part, selection);
- }
- });
- activate();
- }
-
- /**
- * Retrieves the {@link IPropertySheetPage} that his Model Explorer uses.
- *
- * @return
- */
- private IPropertySheetPage getPropertySheetPage() {
- final IMultiDiagramEditor multiDiagramEditor = EditorUtils.getMultiDiagramEditor();
- if(multiDiagramEditor != null) {
- if(propertySheetPage == null) {
- // An 'EEF' properties view
- if(multiDiagramEditor instanceof ITabbedPropertySheetPageContributor) {
- ITabbedPropertySheetPageContributor contributor = (ITabbedPropertySheetPageContributor)multiDiagramEditor;
- this.propertySheetPage = new TabbedPropertySheetPage(contributor);
- }
- }
- return propertySheetPage;
- }
- return null;
- }
-
- /**
- * Adds an {@link ISelectionChangedListener} to this Model Explorer's viewer to react to
- * selection changes in the Model Explorer.
- */
- @Override
- protected CommonViewer createCommonViewer(Composite parent) {
- CommonViewer commonViewer = super.createCommonViewer(parent);
- commonViewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- handleSelectionChangedFromCommonViewer(event);
- }
- });
- return commonViewer;
- }
-
- /**
- * Handle a selection change in the editor.
- *
- * @param part
- * @param selection
- */
- private void handleSelectionChangedFromDiagramEditor(IWorkbenchPart part, ISelection selection) {
- // Handle selection from diagram editor
- if(isLinkingEnabled() && !handlingSelectionChanged) {
- this.handlingSelectionChanged = true;
- if(part instanceof IEditorPart) {
- ISelection unwrappedSelection = NavigatorUtils.unwrapSelection(selection);
- if(!unwrappedSelection.isEmpty() && unwrappedSelection instanceof StructuredSelection) {
- // forward the selection to the stereotyped element if needed
- EObject firstElement = (EObject)((StructuredSelection)unwrappedSelection).getFirstElement();
- if(firstElement != null && firstElement.eContainer() == null) {
- unwrappedSelection = StereotypeApplicationUtils.unwrapStereotypedSelection(unwrappedSelection);
- }
- getCommonViewer().setSelection(unwrappedSelection, true);
- }
- }
- this.handlingSelectionChanged = false;
- }
- }
-
- /**
- * Handle a selection change in the Model Explorer's viewer.
- *
- * @param event
- */
- private void handleSelectionChangedFromCommonViewer(SelectionChangedEvent event) {
- // Handle selection from common viewer
- if(isLinkingEnabled() && !handlingSelectionChanged) {
- this.handlingSelectionChanged = true;
- DiagramEditor editor = EditorUtils.lookupActiveDiagramEditor();
- if(editor != null) {
- // set editor selection and select the EditParts
- IDiagramGraphicalViewer diagramGraphicalViewer = editor.getDiagramGraphicalViewer();
- List editPartsToSelect = NavigatorUtils.getEditPartsFromSelection(event.getSelection(), diagramGraphicalViewer);
- if(editPartsToSelect.isEmpty()) {
- // forward the selection to the stereotype application
- editPartsToSelect = NavigatorUtils.getEditPartsFromSelection(StereotypeApplicationUtils.getStereotypedSelectionFromCommonViewer(event.getSelection()), diagramGraphicalViewer);
- }
- StructuredSelection selectedEditParts = new StructuredSelection(editPartsToSelect);
- diagramGraphicalViewer.setSelection(selectedEditParts);
- if(!selectedEditParts.isEmpty()) {
- EditPart editPart = (EditPart)selectedEditParts.getFirstElement();
- diagramGraphicalViewer.reveal(editPart);
- }
- }
- this.handlingSelectionChanged = false;
- }
- }
-
- /**
- * Handle a double click on an element in the Model Explorer
- */
- @Override
- protected void handleDoubleClick(DoubleClickEvent anEvent) {
- if(log.isDebugEnabled()) {
- log.debug("Model Navigator got a double click");
- }
- IAction openHandler = getViewSite().getActionBars().getGlobalActionHandler(ICommonActionConstants.OPEN);
- if(openHandler != null) {
- openHandler.run();
- } else {
- IStructuredSelection selection = (IStructuredSelection)anEvent.getSelection();
- Object element = selection.getFirstElement();
- if(element instanceof Diagram) {
- // fjcano #287943 :: handle a double click on a papyrus Diagram
- handleDoubleClickOnDiagram((Diagram)element);
- } else if(element instanceof org.eclipse.gmf.runtime.notation.Diagram) {
- // fjcano #287943 :: handle a double click on a gmf Diagram
- handleDoubleClickOnDiagram((org.eclipse.gmf.runtime.notation.Diagram)element);
- } else if(element instanceof EObject) {
- // Open SWT EEF Properties UI
- NavigatorUtils.openPropertySheetsView();
- } else {
- super.handleDoubleClick(anEvent);
- }
- }
- }
-
- /**
- * Handle double click on a GMF Diagram.
- *
- * @param diagram
- */
- private void handleDoubleClickOnDiagram(Diagram diagram) {
- // fjcano #287943 :: handle double click on a gmf diagram
- if(log.isDebugEnabled()) {
- log.debug("#ModelNavigator-> handleDoubleClickOnDiagram : " + diagram);
- }
- if(!EditorUtils.getIPageMngr().isOpen(diagram)) {
- // open the diagram if not already open
- EditorUtils.getIPageMngr().openPage(diagram);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @return the EditingDomain used by the properties view
- */
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
-
-}
diff --git a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractCommonActionProvider.java b/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractCommonActionProvider.java
deleted file mode 100644
index 9f9023df310..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractCommonActionProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana, Obeo . 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:
- * Francisco Javier Cano Muñoz (Prodevelop) – Initial API implementation.
- * Obeo
- *
- ******************************************************************************/
-package org.eclipse.papyrus.navigator.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.navigator.internal.utils.NavigatorUtils;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.CommonNavigator;
-
-/**
- * Specialization of to be used as Papyrus action provider.
- *
- * @author fjcano
- * @author Jerome Benois
- */
-public abstract class AbstractCommonActionProvider extends CommonActionProvider {
-
- /**
- * Gets the ID of the this is associated to.
- *
- * @return the viewer id
- */
- // @unused
- protected String getViewerID() {
- return getActionSite().getViewSite().getId();
- }
-
- /**
- * Gets the this is associated with, via
- * the viewerID.
- *
- * @return the common navigator
- */
- protected CommonNavigator getCommonNavigator() {
- IViewPart part = NavigatorUtils.findViewPart(getViewerID());
- if(part instanceof CommonNavigator) {
- return ((CommonNavigator)part);
- }
- return null;
- }
-
- /**
- * Gets the current context's selection.
- *
- * @return the selection
- */
- // @unused
- protected ISelection getSelection() {
- ActionContext context = getContext();
- return (context != null) ? context.getSelection() : null;
- }
-
- /**
- * Gets the first element of the current context's selection.
- *
- * @return the first selected element
- */
- protected Object getFirstSelectedElement() {
- ISelection selection = getSelection();
- if(selection instanceof StructuredSelection) {
- return ((StructuredSelection)selection).getFirstElement();
- }
- return null;
- }
-
-}
diff --git a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractSubmenuActionProvider.java b/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractSubmenuActionProvider.java
deleted file mode 100644
index 60e357744dc..00000000000
--- a/plugins/others/org.eclipse.papyrus.navigator/src/org/eclipse/papyrus/navigator/actions/AbstractSubmenuActionProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana, Obeo. 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:
- * Francisco Javier Cano Muñoz (Prodevelop) – Initial API implementation.
- * Obeo
- *
- ******************************************************************************/
-package org.eclipse.papyrus.navigator.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.MenuManager;
-
-/**
- * Specialization of to be used in menu and submenu contributions.
- *
- * @author fjcano
- * @author Jerome Benois
- */
-public abstract class AbstractSubmenuActionProvider extends AbstractCommonActionProvider {
-
- /**
- * Organizes the given of .
- *
- * @param createActions
- * of to organize
- * @param token
- * that the will use to trim each 's text.
- *
- * @return a