Bug 510451 - Two changes: 1) Make architecture viewpoints exchangeable

between private .sash model and the public .di model, 2) Remove
PapyrusSyncTable and refactor its usage for PapyrusTable instead

Change-Id: Id5e3cfe313572e7a984dc320e868ca6ced2301c4
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

7 files changed, 32 insertions, 179 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
index d44de34951d..c1e7c892d54 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -1,23 +1,27 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider

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

- org.eclipse.papyrus.infra.nattable.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

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

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusSyncTable.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusSyncTable.gif
deleted file mode 100644
index 6ae6ab02668..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusSyncTable.gif
+++ /dev/null
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
index 37a6bb06d8e..8749fb7022f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
@@ -12,22 +12,15 @@
 
 pluginName = Nattable Representation Edit Support
 providerName = Eclipse Modeling Project
-
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
 _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
 _UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
 _UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
 _UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_PapyrusSyncTable_type = Papyrus Sync Table
 _UI_PapyrusTable_type = Papyrus Table
 _UI_Unknown_type = Object
-
 _UI_Unknown_datatype= Value
-
 _UI_PapyrusTable_configuration_feature = Configuration
 _UI_Unknown_feature = Unspecified
-
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusSyncTableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusSyncTableItemProvider.java
deleted file mode 100644
index 95da8d823e7..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusSyncTableItemProvider.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  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:
- *  Maged Elaasar - Initial API and implementation
- *  
- * 
- */
-package org.eclipse.papyrus.infra.nattable.representation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.papyrus.infra.architecture.representation.provider.PapyrusRepresentationKindItemProvider;
-import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusSyncTableItemProvider
-		extends PapyrusRepresentationKindItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusSyncTableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PapyrusSyncTable.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusSyncTable"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public String getText(Object object) {
-		return getTextFor((PapyrusSyncTable) object);
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return RepresentationEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java
index 049ec0ae6d7..5fc26c66a7e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.architecture.representation.provider.PapyrusRepresentationKindItemProvider;
 import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
@@ -78,7 +77,7 @@ public class PapyrusTableItemProvider extends PapyrusRepresentationKindItemProvi
 				 true,
 				 false,
 				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
 				 null,
 				 null));
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java
index 5172eb2f3d0..24589f22d30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java
@@ -17,10 +17,12 @@ import org.eclipse.emf.common.EMFPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
 
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
 
 import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
 
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
 import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
@@ -57,7 +59,9 @@ public final class RepresentationEditPlugin extends EMFPlugin {
 		  (new ResourceLocator [] {
 		     ArchitectureEditPlugin.INSTANCE,
 		     ConstraintsEditPlugin.INSTANCE,
+		     EcoreEditPlugin.INSTANCE,
 		     TypesConfigurationsEditPlugin.INSTANCE,
+		     NattableEditPlugin.INSTANCE,
 		     org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin.INSTANCE,
 		   });
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
index fbdf25afc00..de288ee5731 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -100,29 +100,6 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusSyncTableItemProvider papyrusSyncTableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusSyncTableAdapter() {
-		if (papyrusSyncTableItemProvider == null) {
-			papyrusSyncTableItemProvider = new PapyrusSyncTableItemProvider(this);
-		}
-
-		return papyrusSyncTableItemProvider;
-	}
-
-	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -244,7 +221,6 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * @generated
 	 */
 	public void dispose() {
-		if (papyrusSyncTableItemProvider != null) papyrusSyncTableItemProvider.dispose();
 		if (papyrusTableItemProvider != null) papyrusTableItemProvider.dispose();
 	}
 
@@ -298,11 +274,6 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 				newChildDescriptors.add
 					(createChildParameter
 						(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS,
-						 RepresentationFactory.eINSTANCE.createPapyrusSyncTable()));
-
-				newChildDescriptors.add
-					(createChildParameter
-						(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS,
 						 RepresentationFactory.eINSTANCE.createPapyrusTable()));
 
 				return null;