[479153] Replace MetamodelDescriptorProvider by Metamodel..Provider2

Bug: 479153
Change-Id: Ie9e0213f1048f55eea1981975860123333e7381f

12 files changed, 31 insertions, 118 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDiagramMetamodelsProvider.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDiagramMetamodelsProvider.java
index 81ea9b94ac..d8cc90e366 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDiagramMetamodelsProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDiagramMetamodelsProvider.java
@@ -12,10 +12,9 @@
 package org.eclipse.sirius.diagram.sequence.business.internal.metamodel;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
@@ -28,7 +27,7 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
  *
  */
-public class SequenceDiagramMetamodelsProvider implements MetamodelDescriptorProvider2 {
+public class SequenceDiagramMetamodelsProvider implements MetamodelDescriptorProvider {
 
     @Override
     public Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vp) {
@@ -41,9 +40,4 @@ public class SequenceDiagramMetamodelsProvider implements MetamodelDescriptorPro
         return result;
     }
     
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor>emptyList();
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramMetamodelsProvider.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramMetamodelsProvider.java
index 79321ed66a..7dc969e2ef 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramMetamodelsProvider.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramMetamodelsProvider.java
@@ -12,10 +12,9 @@
 package org.eclipse.sirius.diagram.business.internal.dialect;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
@@ -28,7 +27,7 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
  *
  */
-public class DiagramMetamodelsProvider implements MetamodelDescriptorProvider2 {
+public class DiagramMetamodelsProvider implements MetamodelDescriptorProvider {
 
     @Override
     public Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vps) {
@@ -42,9 +41,4 @@ public class DiagramMetamodelsProvider implements MetamodelDescriptorProvider2 {
         return result;
     }
 
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor>emptyList();
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 615f0dd68c..e1ae99b835 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -120,7 +120,7 @@
 				<code>org.eclipse.sirius.business.api.helper.task.TaskHelper.buildTaskFromModelOperation(EObject, ModelOperation)</code> has been added, which does not require to specify a 
 				<code>DRepresentation</code> in the context. It allows the creation of a task which executes a behavior specified by 
 				<code>ModelOperations</code> outside of the context of a specific representation, provided the 
-				<code>ModelOperations</code> work in that context. 
+				<code>ModelOperations</code> work in that context.
 			</li>
 			<li><span class="label label-success">Added</span> 
 				<code>org.eclipse.sirius.viewpoint.description.TypedVariable</code> has been created.
@@ -157,6 +157,10 @@
 				<code>org.eclipse.sirius.viewpoint.description.tool.SubVariable</code> has been moved to 
 				<code>org.eclipse.sirius.viewpoint.description.SubVariable</code>.
 			</li>
+			<li><span class="label label-danger">Removed</span> The class 
+				<code>org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2</code> has been deleted and is now 
+				<code>MetamodelDescriptorProvider</code>.
+			</li>
 		</ul>
 		<h4 id="Changesinorg.eclipse.sirius.common">Changes in 
 			<code>org.eclipse.sirius.common</code>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 34172051e0..59a9a90290 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -25,7 +25,7 @@ h3. Developer-Visible Changes
 
 h4. Changes in @org.eclipse.sirius@
 
-* <span class="label label-success">Added</span> A new variant of @org.eclipse.sirius.business.api.helper.task.TaskHelper.buildTaskFromModelOperation(EObject, ModelOperation)@ has been added, which does not require to specify a @DRepresentation@ in the context. It allows the creation of a task which executes a behavior specified by @ModelOperations@ outside of the context of a specific representation, provided the @ModelOperations@ work in that context. 
+* <span class="label label-success">Added</span> A new variant of @org.eclipse.sirius.business.api.helper.task.TaskHelper.buildTaskFromModelOperation(EObject, ModelOperation)@ has been added, which does not require to specify a @DRepresentation@ in the context. It allows the creation of a task which executes a behavior specified by @ModelOperations@ outside of the context of a specific representation, provided the @ModelOperations@ work in that context.
 * <span class="label label-success">Added</span> @org.eclipse.sirius.viewpoint.description.TypedVariable@ has been created.
 * <span class="label label-success">Added</span> @org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription@ has been created as tag interface for variables that require user interaction to be valued.
 * <span class="label label-success">Added</span> @org.eclipse.sirius.tools.api.command.ui.UICallBack.askForTypedVariable(List<TypedVariable>, List<String>)@ has been created.
@@ -36,6 +36,7 @@ h4. Changes in @org.eclipse.sirius@
 * <span class="label label-info">Modified</span> @org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable@ now implements @org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription@.
 * <span class="label label-info">Modified</span> @org.eclipse.sirius.viewpoint.description.tool.AbstractVariable@ has been moved to @org.eclipse.sirius.viewpoint.description.AbstractVariable@.
 * <span class="label label-info">Modified</span> @org.eclipse.sirius.viewpoint.description.tool.SubVariable@ has been moved to @org.eclipse.sirius.viewpoint.description.SubVariable@.
+* <span class="label label-danger">Removed</span> The class @org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2@ has been deleted and is now @MetamodelDescriptorProvider@.
 
 h4. Changes in @org.eclipse.sirius.common@
 
diff --git a/plugins/org.eclipse.sirius.doc/doc/developer/extensions-provide_tabbar_extensions.html b/plugins/org.eclipse.sirius.doc/doc/developer/extensions-provide_tabbar_extensions.html
index 8c672e5bca..a01aea8c5d 100644
--- a/plugins/org.eclipse.sirius.doc/doc/developer/extensions-provide_tabbar_extensions.html
+++ b/plugins/org.eclipse.sirius.doc/doc/developer/extensions-provide_tabbar_extensions.html
@@ -108,7 +108,7 @@
 				<em>activeEditorId</em> and the Sirius Diagram Editor id.
 			</li>
 			<li>it asks a property tester if the active editor should trigger the contribution visibility (see next section for the sample property tester explanation)</li>
-			<li>it iterates over the selection with a &#8220;OR&#8221; operator between elements and a false result for empty selection:
+			<li>it iterates over the selection with a &#171;OR&#187; operator between elements and a false result for empty selection:
 				<ul>
 					<li>it uses the Sirius predefined property tester to check that a selected element is a diagram element.</li>
 					<li>it asks a property tester if the current element should trigger the contribution visibility (see next section for the sample property tester explanation)</li>
diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableMetamodelsProvider.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableMetamodelsProvider.java
index 2299648808..ea645b884a 100644
--- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableMetamodelsProvider.java
+++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableMetamodelsProvider.java
@@ -12,10 +12,9 @@
 package org.eclipse.sirius.table.business.internal.dialect;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
@@ -28,7 +27,7 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
  *
  */
-public class TableMetamodelsProvider implements MetamodelDescriptorProvider2 {
+public class TableMetamodelsProvider implements MetamodelDescriptorProvider {
 
     @Override
     public Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vp) {
@@ -38,9 +37,4 @@ public class TableMetamodelsProvider implements MetamodelDescriptorProvider2 {
         return result;
     }
     
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor>emptyList();
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeMetamodelsProvider.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeMetamodelsProvider.java
index d72fe1e723..978f3c1c9b 100644
--- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeMetamodelsProvider.java
+++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeMetamodelsProvider.java
@@ -12,10 +12,9 @@
 package org.eclipse.sirius.tree.business.internal.dialect;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
@@ -28,7 +27,7 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
  *
  */
-public class TreeMetamodelsProvider implements MetamodelDescriptorProvider2 {
+public class TreeMetamodelsProvider implements MetamodelDescriptorProvider {
 
     @Override
     public Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vp) {
@@ -38,8 +37,4 @@ public class TreeMetamodelsProvider implements MetamodelDescriptorProvider2 {
         return result;
     }
 
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor> emptyList();
-    }
 }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider.java
index 220ec0959e..31af7f7d22 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 THALES GLOBAL SERVICES.
+ * Copyright (c) 2015 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
@@ -17,25 +17,22 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint;
 
 /**
  * Provider able to return a list of MetamodelDescriptor from viewpoints.
- * 
- * This interfaces is deprecated, MetamodelDescriptorProvider2 should be used
- * instead as it provides the ability to handle several Viewpoints at once.
+ * Implementers can declare MetamodelDescriptors even if no Viewpoint is
+ * enabled.
  * 
  * @author cbrun
  * 
  */
-@Deprecated
 public interface MetamodelDescriptorProvider {
     /**
-     * return the list of metamodel descritor provided by the viewpoint.
-     * 
-     * This method is deprecated and will not be called if the class implements
-     * {@link MetamodelDescriptorProvider2}.
+     * Return the list of metamodel descritor provided by the selected
+     * viewpoints.
      * 
-     * @param vp
-     *            any representation description.
+     * @param vps
+     *            A list of selected Viewpoints. This list might be empty and
+     *            yet the adopter might want to provide metamodel descriptors
+     *            anyway.
      * @return the list of metamodel descritor provided by the viewpoint.
      */
-    @Deprecated
-    Collection<MetamodelDescriptor> provides(Viewpoint vp);
+    Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vps);
 }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider2.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider2.java
deleted file mode 100644
index b8ab794921..0000000000
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorProvider2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 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.sirius.business.api.extender;
-
-import java.util.Collection;
-
-import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
-import org.eclipse.sirius.viewpoint.description.Viewpoint;
-
-/**
- * Provider able to return a list of MetamodelDescriptor from viewpoints. This
- * is an evolution of the {@link MetamodelDescriptorProvider} API so that
- * implementers can declare MetamodelDescriptors even if no Viewpoint is
- * enabled.
- * 
- * @author cbrun
- * 
- */
-public interface MetamodelDescriptorProvider2 extends MetamodelDescriptorProvider {
-    /**
-     * Return the list of metamodel descritor provided by the selected
-     * viewpoints.
-     * 
-     * @param vps
-     *            A list of selected Viewpoints. This list might be empty and
-     *            yet the adopter might want to provide metamodel descriptors
-     *            anyway.
-     * @return the list of metamodel descritor provided by the viewpoint.
-     */
-    Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vps);
-}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/ViewpointMetamodelsProvider.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/ViewpointMetamodelsProvider.java
index 99729d845a..d55e83db0f 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/ViewpointMetamodelsProvider.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/ViewpointMetamodelsProvider.java
@@ -12,10 +12,9 @@
 package org.eclipse.sirius.business.internal.dialect;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
@@ -28,7 +27,7 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
  *
  */
-public class ViewpointMetamodelsProvider implements MetamodelDescriptorProvider2 {
+public class ViewpointMetamodelsProvider implements MetamodelDescriptorProvider {
 
     @Override
     public Collection<MetamodelDescriptor> provides(Collection<Viewpoint> vp) {
@@ -43,9 +42,4 @@ public class ViewpointMetamodelsProvider implements MetamodelDescriptorProvider2
         return result;
     }
     
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor>emptyList();
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/EcoreIntrinsicMetamodelDescriptorProvider.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/EcoreIntrinsicMetamodelDescriptorProvider.java
index ccb4ccfe7f..e5fb024940 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/EcoreIntrinsicMetamodelDescriptorProvider.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/EcoreIntrinsicMetamodelDescriptorProvider.java
@@ -12,10 +12,9 @@ package org.eclipse.sirius.business.internal.extender;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
+import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
 import org.eclipse.sirius.business.api.query.ViewpointQuery;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.EcoreMetamodelDescriptor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
@@ -29,7 +28,7 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint;
  * @author cbrun
  * 
  */
-public class EcoreIntrinsicMetamodelDescriptorProvider implements MetamodelDescriptorProvider2 {
+public class EcoreIntrinsicMetamodelDescriptorProvider implements MetamodelDescriptorProvider {
     /**
      * 
      * {@inheritDoc}
@@ -64,9 +63,4 @@ public class EcoreIntrinsicMetamodelDescriptorProvider implements MetamodelDescr
         }
     }
     
-    @Override
-    public Collection<MetamodelDescriptor> provides(Viewpoint vp) {
-        return Collections.<MetamodelDescriptor>emptyList();
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/MetamodelDescriptorManagerImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/MetamodelDescriptorManagerImpl.java
index 2b2e99b6ad..ccc9e0a533 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/MetamodelDescriptorManagerImpl.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/extender/MetamodelDescriptorManagerImpl.java
@@ -16,7 +16,6 @@ import java.util.List;
 
 import org.eclipse.sirius.business.api.extender.MetamodelDescriptorManager;
 import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider;
-import org.eclipse.sirius.business.api.extender.MetamodelDescriptorProvider2;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.MetamodelDescriptor;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
@@ -62,26 +61,12 @@ public class MetamodelDescriptorManagerImpl implements MetamodelDescriptorManage
      */
     public Collection<MetamodelDescriptor> provides(final Collection<Viewpoint> enabledViewpoints) {
         final Collection<MetamodelDescriptor> result = Sets.newLinkedHashSet();
-        for (MetamodelDescriptorProvider2 provider : Iterables.filter(providers, MetamodelDescriptorProvider2.class)) {
+        for (MetamodelDescriptorProvider provider : Iterables.filter(providers, MetamodelDescriptorProvider.class)) {
             final Collection<MetamodelDescriptor> provided = provider.provides(enabledViewpoints);
             if (provided != null) {
                 result.addAll(provided);
             }
         }
-        for (Viewpoint vp : enabledViewpoints) {
-            for (MetamodelDescriptorProvider provider : providers) {
-                /*
-                 * Implementers of MetamodelDescriptorProvider2 have been called
-                 * before.
-                 */
-                if (!(provider instanceof MetamodelDescriptorProvider2)) {
-                    final Collection<MetamodelDescriptor> provided = provider.provides(vp);
-                    if (provided != null) {
-                        result.addAll(provided);
-                    }
-                }
-            }
-        }
         return result;
     }
 }