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

28 files changed, 44 insertions, 84 deletions

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.emf.efacet/build.properties b/incoming/TableEFacet/org.eclipse.papyrus.infra.emf.efacet/build.properties
index 814b8d6bb15..94c218aef31 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.emf.efacet/build.properties
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.emf.efacet/build.properties
@@ -7,5 +7,5 @@ bin.includes = META-INF/,\
                plugin.xml,\

                about.html,\

                plugin.pdoc,\

-               OSGI-INF/l10n/bundle.properties

+               OSGI-INF/

 src.includes = about.html

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/META-INF/MANIFEST.MF
index df0a7d7876f..ac14bf75100 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets,
  org.eclipse.emf.facet.widgets.nattable.instance,
  org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.metamodel.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.table.efacet.metamodel.edit;bundle-version="0.10.0",
  org.eclipse.gmf.runtime.emf.commands.core,
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
  net.sourceforge.nattable.core;bundle-version="2.1.0",
@@ -28,7 +28,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.facet.widgets.celleditors.editor;bundle-version="0.2.0",
  org.eclipse.emf.facet.widgets.celleditors.ecore;bundle-version="0.2.0",
  org.eclipse.emf.facet.efacet.core,
- org.eclipse.emf.facet.util.core
+ org.eclipse.emf.facet.util.core,
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.9.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.infra.table.efacet.common.editor,
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
index 7c824e2bdd5..24c5fcf3728 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
@@ -16,17 +16,13 @@ package org.eclipse.papyrus.infra.table.efacet.common.editor;
 

 import java.lang.reflect.Field;

 import java.util.ArrayList;

-import java.util.EventObject;

 import java.util.List;

 

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

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.Notifier;

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

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

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

 import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidget;

@@ -41,9 +37,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

 import org.eclipse.papyrus.infra.table.efacet.common.Activator;

 import org.eclipse.papyrus.infra.table.efacet.common.input.PapyrusTableEditorInput;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

@@ -52,12 +46,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

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

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.EditorPart;

 

 

 /**

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/listener/FillingListener.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/listener/FillingListener.java
index 2f58b73315e..0cdd0cc6bb2 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/listener/FillingListener.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/listener/FillingListener.java
@@ -27,20 +27,12 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.emf.facet.efacet.core.IFacetManager;

 import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

 import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactoriesRegistry;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

 import org.eclipse.emf.facet.widgets.table.ui.command.ITableCommandFactory;

-import org.eclipse.emf.facet.widgets.table.ui.command.ITableCommandFactoryFactory;

 import org.eclipse.emf.facet.widgets.table.ui.internal.exported.TableWidgetUtils;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/META-INF/MANIFEST.MF
index 39ac11b8f10..e75e0889b00 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.papyrus.infra.table.efacet.metamodel.edit;singleton:=true

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.provider.PapyrustableEditPlugin$Implementation

 Bundle-Vendor: %providerName

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/META-INF/MANIFEST.MF
index 41dbb6282df..68097332a9f 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Export-Package: org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable,
  org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.facet.widgets.celleditors;visibility:=reexport,

- org.eclipse.emf.facet.custom.metamodel;visibility:=reexport,

- org.eclipse.emf.facet.efacet.metamodel;visibility:=reexport,

- org.eclipse.emf.facet.widgets.table.metamodel;visibility:=reexport

+ org.eclipse.emf.facet.widgets.celleditors,

+ org.eclipse.emf.facet.custom.metamodel,

+ org.eclipse.emf.facet.efacet.metamodel,

+ org.eclipse.emf.facet.widgets.table.metamodel

 Bundle-ActivationPolicy: lazy

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/build.properties b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/build.properties
index 645a1ebce90..d9c97d25184 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/build.properties
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/build.properties
@@ -15,5 +15,6 @@ bin.includes = .,\
                plugin.xml,\

                plugin.properties

 jars.compile.order = .

-source.. = src-gen/

+source.. = src-gen/,\

+           src/

 output.. = bin/

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java
index c6273c70da0..07f12fd5b0e 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java
@@ -13,13 +13,9 @@
 package org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable;

 

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

-

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

-

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

 

 /**

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java
index 1cd2bab066e..91ccee26ef9 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.impl.EModelElementImpl;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustableFactoryImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustableFactoryImpl.java
index cb3ae5ea018..7235c551f2d 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustableFactoryImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustableFactoryImpl.java
@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.*;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustableFactory;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java
index 6899fcb9262..886754dec48 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java
@@ -18,13 +18,9 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage;

-

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;

-

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustableFactory;

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableAdapterFactory.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableAdapterFactory.java
index 94d13863d18..3e5c02e1501 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableAdapterFactory.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableAdapterFactory.java
@@ -14,13 +14,11 @@ package org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.util;
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.*;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableSwitch.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableSwitch.java
index 558f5388aa4..418716043ff 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableSwitch.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/util/PapyrustableSwitch.java
@@ -15,10 +15,9 @@ package org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.util;
 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.util.Switch;

-

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.*;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/TableContentsUtils.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/TableContentsUtils.java
index 7098cd7bfb7..402cc889818 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/TableContentsUtils.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/TableContentsUtils.java
@@ -17,7 +17,6 @@ import java.util.List;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

 

 

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.modelexplorer/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.modelexplorer/META-INF/MANIFEST.MF
index a815ce5b89a..f3cd1197787 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.modelexplorer/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.modelexplorer/META-INF/MANIFEST.MF
@@ -11,6 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.views.modelexplorer,
  org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0",
  org.eclipse.emf.transaction,
- org.eclipse.gmf.runtime.emf.type.core
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
index a7be94f2bf1..8e066d1872f 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Export-Package: org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.presentation

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

+ org.eclipse.core.resources,

  org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
index 9edfdf3e947..7cf90fa8666 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode;

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
index ff1c9a4528b..8d581bb46fb 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
@@ -16,25 +16,16 @@ import java.util.Collection;
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

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

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.EModelElementImpl;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

-

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;

-

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode;

-

 import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration;

 import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage;

 

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationFactoryImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationFactoryImpl.java
index 94a6665ae6e..647999d7582 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationFactoryImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationFactoryImpl.java
@@ -15,12 +15,11 @@ package org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamod
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.*;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationFactory;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
index 41689412782..bb7d279533c 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
@@ -16,16 +16,10 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage;

-

 import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableconfigurationPackage;

-

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage;

-

 import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration;

 import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationFactory;

 import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage;

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java
index 10e4f9e8dbf..19a866f37eb 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java
@@ -14,13 +14,11 @@ package org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamod
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.*;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java
index b3c435d8b94..0bcf1cabb29 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java
@@ -15,10 +15,9 @@ package org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamod
 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.util.Switch;

-

-import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.*;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration;

+import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.properties/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.properties/META-INF/MANIFEST.MF
index 7838ac1b597..f220082f20c 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.properties/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.properties/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",

  org.eclipse.emf.edit;bundle-version="2.8.0",

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

- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0"

+ org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0",

+ org.eclipse.emf.facet.widgets.table.metamodel;bundle-version="0.2.1"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet/META-INF/MANIFEST.MF
index ba44d11ca01..128b54049a5 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core,

  com.google.guava,

  org.eclipse.papyrus.views.modelexplorer,

- org.eclipse.papyrus.infra.table.efacet.metamodel

+ org.eclipse.papyrus.infra.table.efacet.metamodel,

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

+ org.eclipse.emf.facet.widgets.table.metamodel;bundle-version="0.2.1"

 Bundle-Version: 0.9.0.qualifier

 Bundle-Vendor: Eclipse Modeling Project

 

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/META-INF/MANIFEST.MF b/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/META-INF/MANIFEST.MF
index ee4cf39b1dd..458582b0ec3 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/META-INF/MANIFEST.MF
+++ b/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/META-INF/MANIFEST.MF
@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.facet.widgets.table.ui;bundle-version="0.2.0",
  org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel,
  org.eclipse.papyrus.infra.emf.efacet;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0",
+ org.eclipse.emf.edit;bundle-version="2.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.uml.efacet/src/org/eclipse/papyrus/uml/efacet/queries/IsUMLElementQuery.java b/incoming/TableEFacet/org.eclipse.papyrus.uml.efacet/src/org/eclipse/papyrus/uml/efacet/queries/IsUMLElementQuery.java
index d122893ef93..982ab4f52fe 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.uml.efacet/src/org/eclipse/papyrus/uml/efacet/queries/IsUMLElementQuery.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.uml.efacet/src/org/eclipse/papyrus/uml/efacet/queries/IsUMLElementQuery.java
@@ -6,7 +6,6 @@ import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.emf.facet.query.java.core.IJavaQuery2;

 import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

 import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

 

 /**

  * 

diff --git a/incoming/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
index 097156bb589..ac013665a9e 100644
--- a/incoming/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Export-Package: org.eclipse.papyrus.documentation.plugin.documentation,
  org.eclipse.papyrus.documentation.plugin.documentation.impl,
  org.eclipse.papyrus.documentation.plugin.documentation.util
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore,
  org.eclipse.ui;bundle-version="3.7.0"
 Bundle-ActivationPolicy: lazy
diff --git a/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties b/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
index 3fbd2f3c6c5..1b08f841b5e 100644
--- a/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
+++ b/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
@@ -4,6 +4,4 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                plugin.properties

-src.includes = about.html,\

-               plugin.properties,\

-               META-INF/

+src.includes = about.html