[434594] Enable Model (Library/Metamodel/Profile) Registrations to be

    added via code to be viewed in the GUI dialogs

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=43459
Change-Id: I785c5dff11dab6c97b93117e007d48e194d5a0ab
Signed-off-by: David Akehurst <dave@akehurst.net>

5 files changed, 24 insertions, 18 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionLabelProvider.java
index 1ebbf869c98..3dde88fecf0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionLabelProvider.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.uml.extensionpoints.standard;

 

 import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.uml.extensionpoints.IRegisteredItem;

 

 /**
  *
@@ -29,7 +30,7 @@ public class ExtensionLabelProvider extends LabelProvider {
 	public String getText(Object obj) {

 

 		if (obj instanceof RegisteredElementExtensionPoint) {

-			return ((RegisteredElementExtensionPoint) obj).name;

+			return ((IRegisteredItem)obj).getName();

 		} else {

 			return "unknown object";

 		}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/FilteredRegisteredElementsSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/FilteredRegisteredElementsSelectionDialog.java
index 00505cb497e..f64da626dc6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/FilteredRegisteredElementsSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/FilteredRegisteredElementsSelectionDialog.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.ArrayContentProvider;

 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.papyrus.uml.extensionpoints.Activator;

+import org.eclipse.papyrus.uml.extensionpoints.IRegisteredItem;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

@@ -171,7 +172,7 @@ public class FilteredRegisteredElementsSelectionDialog extends FilteredItemsSele
 	 */

 	@Override

 	protected ItemsFilter createFilter() {

-		return new RegisteredElementExtensionPointFilter() {

+		return new RegisteredItemFilter() {

 		};

 	}

 

@@ -179,10 +180,10 @@ public class FilteredRegisteredElementsSelectionDialog extends FilteredItemsSele
 	 * {@inheritDoc}

 	 */

 	@Override

-	protected Comparator<RegisteredElementExtensionPoint> getItemsComparator() {

-		Comparator<RegisteredElementExtensionPoint> comp = new Comparator<RegisteredElementExtensionPoint>() {

+	protected Comparator<IRegisteredItem> getItemsComparator() {

+		Comparator<IRegisteredItem> comp = new Comparator<IRegisteredItem>() {

 

-			public int compare(RegisteredElementExtensionPoint o1, RegisteredElementExtensionPoint o2) {

+			public int compare(IRegisteredItem o1, IRegisteredItem o2) {

 				return o1.getName().compareTo(o2.getName());

 			}

 		};

@@ -213,14 +214,14 @@ public class FilteredRegisteredElementsSelectionDialog extends FilteredItemsSele
 	/**

 	 * Filter for extension points

 	 */

-	private class RegisteredElementExtensionPointFilter extends ItemsFilter {

+	private class RegisteredItemFilter extends ItemsFilter {

 

 		/**

 		 * {@inheritDoc}

 		 */

 		@Override

 		public boolean isConsistentItem(Object item) {

-			if (item instanceof RegisteredElementExtensionPoint) {

+			if (item instanceof IRegisteredItem) {

 				return true;

 			}

 			return false;

@@ -231,7 +232,7 @@ public class FilteredRegisteredElementsSelectionDialog extends FilteredItemsSele
 		 */

 		@Override

 		public boolean matchItem(Object item) {

-			if (!(item instanceof RegisteredElementExtensionPoint)) {

+			if (!(item instanceof IRegisteredItem)) {

 				return false;

 			}

 			return matches(registeredElementsLabelProvider.getText(item));

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
index fdbab8ae574..9e17599f3ae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
@@ -14,12 +14,13 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.papyrus.uml.extensionpoints.Activator;
+import org.eclipse.papyrus.uml.extensionpoints.IRegisteredItem;
 import org.eclipse.swt.graphics.Image;
 
 /**
  * Abstract Class that introduces the basic functionalities for Papyrus UML2 extension points
  */
-public abstract class RegisteredElementExtensionPoint {
+public abstract class RegisteredElementExtensionPoint implements IRegisteredItem {
 
 	/** Name of the registered element */
 	public String name;
@@ -188,4 +189,4 @@ public abstract class RegisteredElementExtensionPoint {
 	public void setProvider(String provider) {
 		this.provider = provider;
 	}
-}
+}
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsDetailsLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsDetailsLabelProvider.java
index 520017f3aaa..b74771230e6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsDetailsLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsDetailsLabelProvider.java
@@ -1,5 +1,7 @@
 package org.eclipse.papyrus.uml.extensionpoints.standard;

 

+import org.eclipse.papyrus.uml.extensionpoints.IRegisteredItem;

+

 /**

  * Label provider for Registered elements, for details section in dialogs

  */

@@ -10,15 +12,15 @@ public class RegisteredElementsDetailsLabelProvider extends RegisteredElementsLa
 	 */

 	@Override

 	public String getText(Object element) {

-		if (!(element instanceof RegisteredElementExtensionPoint)) {

+		if (!(element instanceof IRegisteredItem)) {

 			return super.getText(element);

 		}

 

-		RegisteredElementExtensionPoint point = (RegisteredElementExtensionPoint) element;

+		IRegisteredItem item = (IRegisteredItem) element;

 		String text = "";

-		text += point.getDescription();

+		text += item.getDescription();

 		text += " - ";

-		text += point.getProvider();

+		text += item.getProvider();

 		return text;

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsLabelProvider.java
index d34e9cd4627..5b8932bec6a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementsLabelProvider.java
@@ -1,6 +1,7 @@
 package org.eclipse.papyrus.uml.extensionpoints.standard;

 

 import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.uml.extensionpoints.IRegisteredItem;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -20,10 +21,10 @@ public class RegisteredElementsLabelProvider extends LabelProvider {
 	 */

 	@Override

 	public Image getImage(Object element) {

-		if (!(element instanceof RegisteredElementExtensionPoint)) {

+		if (!(element instanceof IRegisteredItem)) {

 			return super.getImage(element);

 		}

-		RegisteredElementExtensionPoint abstractExtensionPoint = (RegisteredElementExtensionPoint) element;

+		IRegisteredItem abstractExtensionPoint = (IRegisteredItem) element;

 		return abstractExtensionPoint.getImage();

 	}

 

@@ -32,10 +33,10 @@ public class RegisteredElementsLabelProvider extends LabelProvider {
 	 */

 	@Override

 	public String getText(Object element) {

-		if (!(element instanceof RegisteredElementExtensionPoint)) {

+		if (!(element instanceof IRegisteredItem)) {

 			return super.getText(element);

 		}

-		RegisteredElementExtensionPoint abstractExtensionPoint = (RegisteredElementExtensionPoint) element;

+		IRegisteredItem abstractExtensionPoint = (IRegisteredItem) element;

 		return abstractExtensionPoint.getName();

 	}

 }