380517: [Papyrus] We should use explicit plug-in dependencies whenever possible

https://bugs.eclipse.org/bugs/show_bug.cgi?id=380517

+ removed some unused dependencies and imports

6 files changed, 13 insertions, 18 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
index 754c85068c9..316be0f7803 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.0",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0"

+ org.eclipse.emf.transaction;bundle-version="1.4.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"

 Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloading.hand

  ler

 Bundle-Vendor: %providerName

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
index adf68637dd1..ce565432d3a 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -1,17 +1,18 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0";visibility:=reexport,

- org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0";visibility:=reexport,

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0";visibility:=reexport,

+ org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",

+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",

  org.eclipse.emf.facet.infra.facet;bundle-version="0.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="0.9.0"

+ org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0"

 Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 47398f48f54..c817e9116aa 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.ui.navigator;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="0.9.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",

  org.eclipse.emf.converter;bundle-version="2.5.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",

@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="10.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0"

 Export-Package: org.eclipse.papyrus.views.modelexplorer,

  org.eclipse.papyrus.views.modelexplorer.actionprovider,

  org.eclipse.papyrus.views.modelexplorer.actions,

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java
index 89389e54cce..27051cc8e85 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java
@@ -15,15 +15,11 @@
 

 package org.eclipse.papyrus.views.modelexplorer;

 

-import static org.eclipse.papyrus.views.modelexplorer.Activator.log;

-

 import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EValidator;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.markers.MarkerConstants;

 import org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.MultiViewPageBookView;

 import org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.ViewPartPage;

 import org.eclipse.ui.IViewPart;

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
index 2ce94584f98..1b013dbe407 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.window.ToolTip;

 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener;

@@ -64,7 +64,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeItem;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.ISaveablePart;

@@ -84,6 +83,7 @@ import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;

+

 import com.google.common.base.Function;

 import com.google.common.collect.Iterables;

 import com.google.common.collect.Lists;

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
index 33d7642d573..ae68091527f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.views.modelexplorer.handler;

 

 import java.util.Hashtable;

-import java.util.Iterator;

 import java.util.List;

 

 import org.eclipse.core.commands.ExecutionEvent;

@@ -23,11 +22,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.IExecutableExtension;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.handlers.HandlerUtil;

 

 /**

  * This handler allows to Open Diagrams and Tables