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

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

5 files changed, 38 insertions, 35 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesBlock.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesBlock.java
index eea58554438..c78b73669e2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesBlock.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesBlock.java
@@ -24,7 +24,8 @@ import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
 import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.Registry;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
 import org.eclipse.papyrus.uml.modelrepair.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -169,13 +170,13 @@ public class BrowseProfilesBlock {
 		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());
 		dialog.setTitle("Browse Registered Profiles");
 		dialog.setDescription("Select one of the registered profiles below.");
-		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(RegisteredProfile.getRegisteredProfiles())));
+		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(Registry.getRegisteredProfiles().toArray(new IRegisteredProfile[0]))));
 		dialog.setLabelProvider(new LabelProvider() {
 
 			@Override
 			public Image getImage(Object element) {
-				if(element instanceof RegisteredProfile) {
-					RegisteredProfile profile = (RegisteredProfile)element;
+				if(element instanceof IRegisteredProfile) {
+					IRegisteredProfile profile = (IRegisteredProfile)element;
 					return profile.getImage();
 				}
 				return super.getImage(element);
@@ -183,9 +184,9 @@ public class BrowseProfilesBlock {
 
 			@Override
 			public String getText(Object element) {
-				if(element instanceof RegisteredProfile) {
-					RegisteredProfile profile = (RegisteredProfile)element;
-					return profile.name;
+				if(element instanceof IRegisteredProfile) {
+					IRegisteredProfile profile = (IRegisteredProfile)element;
+					return profile.getName();
 				}
 
 				return super.getText(element);
@@ -199,8 +200,8 @@ public class BrowseProfilesBlock {
 			}
 
 			Object selectedElement = result[0];
-			if(selectedElement instanceof RegisteredProfile) {
-				bus.post((RegisteredProfile)selectedElement);
+			if(selectedElement instanceof IRegisteredProfile) {
+				bus.post((IRegisteredProfile)selectedElement);
 			}
 		}
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesDialog.java
index aae7186fac4..1348f1c0c24 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/BrowseProfilesDialog.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.window.IShellProvider;
 import org.eclipse.jface.window.SameShellProvider;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -102,8 +102,8 @@ public class BrowseProfilesDialog extends TrayDialog {
 			}
 
 			@Subscribe
-			public void registeredProfileSelected(RegisteredProfile profile) {
-				setSelectedProfileURI(profile.uri);
+			public void registeredProfileSelected(IRegisteredProfile profile) {
+				setSelectedProfileURI(profile.getUri());
 			}
 		});
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java
index 525d0638559..06a89ef04c1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java
@@ -68,7 +68,8 @@ import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
 import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;

-import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;

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

+import org.eclipse.papyrus.uml.extensionpoints.library.IRegisteredLibrary;

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

 import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

 import org.eclipse.swt.SWT;

@@ -513,13 +514,13 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());

 		dialog.setTitle("Browse Registered Libraries");

 		dialog.setDescription("Select one of the registered libraries below.");

-		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(RegisteredLibrary.getRegisteredLibraries())));

+		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(Registry.getRegisteredLibraries().toArray(new IRegisteredLibrary[0]))));

 		dialog.setLabelProvider(new LabelProvider() {

 

 			@Override

 			public Image getImage(Object element) {

-				if(element instanceof RegisteredLibrary) {

-					RegisteredLibrary library = (RegisteredLibrary)element;

+				if(element instanceof IRegisteredLibrary) {

+					IRegisteredLibrary library = (IRegisteredLibrary)element;

 					return library.getImage();

 				}

 				return super.getImage(element);

@@ -527,9 +528,9 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 

 			@Override

 			public String getText(Object element) {

-				if(element instanceof RegisteredLibrary) {

-					RegisteredLibrary library = (RegisteredLibrary)element;

-					return library.name;

+				if(element instanceof IRegisteredLibrary) {

+					IRegisteredLibrary library = (IRegisteredLibrary)element;

+					return library.getName();

 				}

 

 				return super.getText(element);

@@ -543,10 +544,10 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 			}

 

 			Object selectedElement = result[0];

-			if(selectedElement instanceof RegisteredLibrary) {

-				RegisteredLibrary library = (RegisteredLibrary)selectedElement;

+			if(selectedElement instanceof IRegisteredLibrary) {

+				IRegisteredLibrary library = (IRegisteredLibrary)selectedElement;

 

-				replaceSelectionWith(library.uri);

+				replaceSelectionWith(library.getUri());

 			}

 		}

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
index 4d714ed856c..e09a84dd763 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
@@ -62,7 +62,7 @@ import org.eclipse.papyrus.infra.emf.resource.Replacement;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.papyrus.infra.services.markerlistener.dialogs.DiagnosticDialog;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

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

 import org.eclipse.papyrus.uml.tools.util.ProfileHelper;

 import org.eclipse.swt.SWT;

@@ -155,8 +155,8 @@ public class SwitchProfileDialog extends SelectionDialog {
 			}

 

 			@Subscribe

-			public void registeredProfileSelected(RegisteredProfile profile) {

-				replaceSelectionWith(profile.uri);

+			public void registeredProfileSelected(IRegisteredProfile profile) {

+				replaceSelectionWith(profile.getUri());

 			}

 		});

 		

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java
index 01211e2afa8..4ed7f48717a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java
@@ -68,7 +68,8 @@ import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
 import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;

-import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;

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

+import org.eclipse.papyrus.uml.extensionpoints.library.IRegisteredLibrary;

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

 import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

 import org.eclipse.swt.SWT;

@@ -513,13 +514,13 @@ public class SwitchResourceDialog extends SelectionDialog {
 		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());

 		dialog.setTitle("Browse Registered Libraries");

 		dialog.setDescription("Select one of the registered libraries below.");

-		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(RegisteredLibrary.getRegisteredLibraries())));

+		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(Registry.getRegisteredLibraries().toArray(new IRegisteredLibrary[0]))));

 		dialog.setLabelProvider(new LabelProvider() {

 

 			@Override

 			public Image getImage(Object element) {

-				if(element instanceof RegisteredLibrary) {

-					RegisteredLibrary library = (RegisteredLibrary)element;

+				if(element instanceof IRegisteredLibrary) {

+					IRegisteredLibrary library = (IRegisteredLibrary)element;

 					return library.getImage();

 				}

 				return super.getImage(element);

@@ -527,9 +528,9 @@ public class SwitchResourceDialog extends SelectionDialog {
 

 			@Override

 			public String getText(Object element) {

-				if(element instanceof RegisteredLibrary) {

-					RegisteredLibrary library = (RegisteredLibrary)element;

-					return library.name;

+				if(element instanceof IRegisteredLibrary) {

+					IRegisteredLibrary library = (IRegisteredLibrary)element;

+					return library.getName();

 				}

 

 				return super.getText(element);

@@ -543,10 +544,10 @@ public class SwitchResourceDialog extends SelectionDialog {
 			}

 

 			Object selectedElement = result[0];

-			if(selectedElement instanceof RegisteredLibrary) {

-				RegisteredLibrary library = (RegisteredLibrary)selectedElement;

+			if(selectedElement instanceof IRegisteredLibrary) {

+				IRegisteredLibrary library = (IRegisteredLibrary)selectedElement;

 

-				replaceSelectionWith(library.uri);

+				replaceSelectionWith(library.getUri());

 			}

 		}

 	}