Added 2 other resolvers for the sections (graphic and Edit part resolver)

Updated interface for model handlers (? extends EObject instead of EObject)

3 files changed, 15 insertions, 15 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java
index c0af0533414..d9c9f3138a7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java
@@ -80,7 +80,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<EObject> objectToEdit) {

+	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<? extends EObject> objectToEdit) {

 		if(descriptor instanceof IBoundedValuesPropertyEditorDescriptor) {

 			((IBoundedValuesPropertyEditorDescriptor)descriptor).setAvailableValues(getAvailableValues(null));

 		} else {

@@ -112,7 +112,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public boolean isChangeable(List<EObject> objectsToEdit) {

+	public boolean isChangeable(List<? extends EObject> objectsToEdit) {

 		// always true for this implementation

 		return true;

 	}

@@ -155,7 +155,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void handleNotifyChange(Notification notification, List<EObject> objects, EMFPropertyEditorController adapter) {

+	public void handleNotifyChange(Notification notification, List<? extends EObject> objects, EMFPropertyEditorController adapter) {

 		// nothing specific here

 		// should perhaps filter a bit more here, but seems to be sufficient here.

 		Object notificationFeature = notification.getFeature();

@@ -178,7 +178,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void addListenersToModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void addListenersToModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().add(controller);

 

@@ -196,7 +196,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void removeListenersFromModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void removeListenersFromModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().remove(controller);

 

diff --git a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java
index ebf112eb94e..b7c8338c8be 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java
@@ -110,7 +110,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<EObject> objectToEdit) {

+	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<? extends EObject> objectToEdit) {

 		if(descriptor instanceof IBoundedValuesPropertyEditorDescriptor) {

 			((IBoundedValuesPropertyEditorDescriptor)descriptor).setAvailableValues(getAvailableValues(null));

 		} else {

@@ -143,7 +143,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public boolean isChangeable(List<EObject> objectsToEdit) {

+	public boolean isChangeable(List<? extends EObject> objectsToEdit) {

 		// always true for this implementation

 		return true;

 	}

@@ -186,7 +186,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void handleNotifyChange(Notification notification, List<EObject> objects, EMFPropertyEditorController adapter) {

+	public void handleNotifyChange(Notification notification, List<? extends EObject> objects, EMFPropertyEditorController adapter) {

 		Object notificationFeature = notification.getFeature();

 		if(!(UMLPackage.eINSTANCE.getProperty_OwningAssociation().equals(notificationFeature))) {

 			return;

@@ -204,7 +204,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void addListenersToModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void addListenersToModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().add(controller);

 		}

@@ -213,7 +213,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void removeListenersFromModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void removeListenersFromModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().remove(controller);

 		}

diff --git a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java
index b38ec4bf6a0..9f0bc2add82 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.runtime.uml/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java
@@ -86,7 +86,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<EObject> objectToEdit) {

+	public void completeEditorDescriptor(IPropertyEditorDescriptor descriptor, List<? extends EObject> objectToEdit) {

 		if(descriptor instanceof IBoundedValuesPropertyEditorDescriptor) {

 			((IBoundedValuesPropertyEditorDescriptor)descriptor).setAvailableValues(getAvailableValues(null));

 		} else {

@@ -107,7 +107,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public boolean isChangeable(List<EObject> objectsToEdit) {

+	public boolean isChangeable(List<? extends EObject> objectsToEdit) {

 		// always true for this implementation

 		return true;

 	}

@@ -151,7 +151,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 	 * {@inheritDoc}

 	 */

 	@SuppressWarnings("unchecked")

-	public void handleNotifyChange(Notification notification, List<EObject> objects, EMFPropertyEditorController adapter) {

+	public void handleNotifyChange(Notification notification, List<? extends EObject> objects, EMFPropertyEditorController adapter) {

 		// if one element is added to the feature, should also add this as a listener

 		// if one element is removed from the feature, should also remove this as a listener

 		// in other case, except removing adapters, should refresh

@@ -244,7 +244,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void addListenersToModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void addListenersToModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().add(controller);

 		}

@@ -253,7 +253,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 	/**

 	 * {@inheritDoc}

 	 */

-	public void removeListenersFromModel(List<EObject> objectsToEdit, EMFPropertyEditorController controller) {

+	public void removeListenersFromModel(List<? extends EObject> objectsToEdit, EMFPropertyEditorController controller) {

 		for(EObject object : objectsToEdit) {

 			object.eAdapters().remove(controller);

 		}