Merge branch 'master' of ssh://ptessier@git.eclipse.org:29418/papyrus/org.eclipse.papyrus

2 files changed, 11 insertions, 1 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
index 6092a5ba1cf..67782f2bd36 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
@@ -39,6 +39,9 @@
   <modelElementFactories

       name="Applied Comments Model Element Factory"

       factoryClass="org.eclipse.papyrus.uml.properties.modelelement.CommentModelElementFactory"/>

+  <modelElementFactories

+      name="Profile definitions"

+      factoryClass="org.eclipse.papyrus.uml.properties.modelelement.ProfileDefinitionModelElementFactory"/>

   <propertyEditorTypes

       label="ExpressionEditor"

       widgetClass="ExpressionEditor"

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java
index f9892c788bf..0a36400fdf8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * Copyright (c) 2010, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 435103

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.modelelement;

 

@@ -15,6 +17,7 @@ import java.util.HashMap;
 import java.util.Iterator;

 import java.util.Map;

 

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

 import org.eclipse.papyrus.infra.widgets.Activator;

@@ -142,6 +145,10 @@ public class DataSourceFactory {
 			Activator.log.warn("No ModelElementFactory is attached to DataContextElement " + getQualifiedName(context)); //$NON-NLS-1$

 			return null;

 		}

+		if(factoryDescriptor.eIsProxy()) {

+			Activator.log.warn("Unresolved reference to the ModelElementFactory: " + EcoreUtil.getURI(factoryDescriptor)); //$NON-NLS-1$

+			return null;

+		}

 

 		String factoryName = factoryDescriptor.getFactoryClass();

 		ModelElementFactory factory = ClassLoaderHelper.newInstance(factoryName, ModelElementFactory.class);