418647: Location of package imported models should be shown

https://bugs.eclipse.org/bugs/show_bug.cgi?id=418647

  - Remove constraint on Imported Package to display location field with
all Package

Change-Id: If24b3578dc1be72b20a7248edfb14b633142ab79
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>

5 files changed, 34 insertions, 138 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 7a4734d9042..ccbc376ed66 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
@@ -15,9 +15,6 @@
   <constraintTypes
       label="Is UML Datatype Instance"
       constraintClass="org.eclipse.papyrus.uml.properties.constraints.IsUMLDatatypeInstance"/>
-  <constraintTypes
-      label="Is Imported Package"
-      constraintClass="org.eclipse.papyrus.uml.properties.constraints.IsImportedPackage"/>
   <modelElementFactories
       name="UML Specific Factory"
       factoryClass="org.eclipse.papyrus.uml.properties.modelelement.UMLEditorFactory"/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
index 324cd9cec48..47cab776327 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
@@ -1387,12 +1387,6 @@
     <sections name="MultipleSignalEvent" sectionFile="ui/SingleSignalEvent.xwt">
       <widget href="ui/SingleSignalEvent.xwt#/"/>
     </sections>
-     <sections name="SingleImportedPackage" sectionFile="ui/SingleImportedPackage.xwt">
-      <constraints xsi:type="constraints:SimpleConstraint" name="IsImportedPackage">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.4"/>
-      </constraints>
-      <widget href="ui/SingleImportedPackage.xwt#/"/>
-    </sections>
   </tabs>
   <tabs label="Comments" id="comments" category="org.eclipse.papyrus" image="" priority="20">
     <sections name="SingleElementAppliedComments" sectionFile="ui/SingleElementAppliedComments.xwt">
@@ -1436,7 +1430,7 @@
       <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Element"/>
     </constraints>
   </views>
-  <views name="SinglePackage" sections="//@tabs.0/@sections.0  //@tabs.0/@sections.462" automaticContext="true">
+  <views name="SinglePackage" sections="//@tabs.0/@sections.0" automaticContext="true">
     <constraints xsi:type="constraints:SimpleConstraint" name="isSinglePackage">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Package"/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleImportedPackage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleImportedPackage.xwt
deleted file mode 100644
index b2a90fb1804..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleImportedPackage.xwt
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<ppe:StringEditor input="{Binding}" property="ImportedPackage:Package:location"
-		readOnly="true"></ppe:StringEditor>
-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt
index 7284b4b36e2..9d51f6278f9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt
@@ -1,27 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="UML:Package:packageMerge"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="UML:Package:packageMerge"></ppe:MultiReference>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="ImportedPackage:Package:location"
+			readOnly="true"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsImportedPackage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsImportedPackage.java
deleted file mode 100644
index d15b9200716..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsImportedPackage.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.properties.constraints;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
-import org.eclipse.papyrus.infra.core.resource.IEMFModel;
-import org.eclipse.papyrus.infra.core.resource.IModel;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * Constraint for Imported Package in the Model.
- * 
- * @author Gabriel Pascual
- *
- */
-public class IsImportedPackage extends AbstractConstraint {
-
-	/**
-	 * Constructor.
-	 *
-	 */
-	public IsImportedPackage() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
-	 *
-	 * @param constraint
-	 * @return
-	 */
-	@Override
-	protected boolean equivalent(Constraint constraint) {
-		boolean isEquivalent = false;
-		if (this == constraint) {
-			isEquivalent = true;
-		} else if (constraint instanceof IsImportedPackage) {
-			isEquivalent = true;
-		}
-		return isEquivalent;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)
-	 *
-	 * @param selection
-	 * @return
-	 */
-	@Override
-	protected boolean match(Object selection) {
-		boolean isImportedPackage = false;
-
-		EObject selectedElement = EMFHelper.getEObject(selection);
-		EObject rootContainer = null;
-		try {
-			ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(selectedElement);
-			IModel model = modelSet.getModelFor(selectedElement);
-			if (model instanceof IEMFModel) {
-				Resource resource = ((IEMFModel) model).getResource();
-				rootContainer = resource.getContents().get(0);
-			}
-		} catch (ServiceException e) {
-
-		}
-		if (rootContainer instanceof Namespace) {
-			if (selectedElement instanceof Package) {
-				isImportedPackage = ((Namespace) rootContainer).getPackageImport((Package) selectedElement) != null;
-			}
-		}
-		return isImportedPackage;
-	}
-}