Bug 482927: [Properties] Customization context models should have UI labels

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

Add an optional 'label' attribute to the Context class and a
derived 'userLabel' that is the 'label' if present, otherwise the
'name'.

Use the new derived user label wherever appropriate in the UI:
in progress monitors, informational dialogs, and especially the
preference pages.  In the "Property view" preference page, sort
contexts by user label.

Update existing context models to provide user-friendly labels.

1 files changed, 34 insertions, 34 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/symbols.ctx b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/symbols.ctx
index cc47fd266a5..0eadb0c40ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/symbols.ctx
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/symbols.ctx
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="Symbols">

-  <tabs label="Symbol" id="symbol" category="org.eclipse.papyrus" image="" priority="100">

-    <afterTab href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@tabs.1"/>

-    <sections name="Single TypeSymbolDefinition" sectionFile="ui/SingleTypeSymbolDefinition.xwt">

-      <widget href="ui/SingleTypeSymbolDefinition.xwt#/"/>

-    </sections>

-    <sections name="Multiple TypeSymbolDefinition" sectionFile="ui/MultipleTypeSymbolDefinition.xwt">

-      <widget href="ui/MultipleTypeSymbolDefinition.xwt#/"/>

-    </sections>

-  </tabs>

-  <views name="Single TypeSymbolDefinition" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1/@elements.0">

-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTypeSymbolDefinition">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="PapyrusInternal::Symbols::TypeSymbolDefinition"/>

-    </constraints>

-  </views>

-  <views elementMultiplicity="-1" name="Multiple TypeSymbolDefinition" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1/@elements.0">

-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTypeSymbolDefinition">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="PapyrusInternal::Symbols::TypeSymbolDefinition"/>

-    </constraints>

-  </views>

-  <dataContexts name="PapyrusInternal" label="Papyrus Internal Profile">

-    <elements name="Path"/>

-    <elements xsi:type="contexts:DataContextPackage" name="Symbols">

-      <elements name="TypeSymbolDefinition">

-        <properties name="symbolPath"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.14"/>

-      </elements>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_i5HQ8JLFEeWfWq9wJhwxKw" name="Symbols" label="UML Diagram Symbols">
+  <tabs xmi:id="_i5HQ8ZLFEeWfWq9wJhwxKw" label="Symbol" id="symbol" category="org.eclipse.papyrus" image="" priority="100">
+    <afterTab href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@tabs.1"/>
+    <sections xmi:id="_i5HQ8pLFEeWfWq9wJhwxKw" name="Single TypeSymbolDefinition" sectionFile="ui/SingleTypeSymbolDefinition.xwt">
+      <widget href="ui/SingleTypeSymbolDefinition.xwt#/"/>
+    </sections>
+    <sections xmi:id="_i5HQ85LFEeWfWq9wJhwxKw" name="Multiple TypeSymbolDefinition" sectionFile="ui/MultipleTypeSymbolDefinition.xwt">
+      <widget href="ui/MultipleTypeSymbolDefinition.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_i5HQ9JLFEeWfWq9wJhwxKw" name="Single TypeSymbolDefinition" sections="_i5HQ8pLFEeWfWq9wJhwxKw" automaticContext="true" datacontexts="_i5H4BpLFEeWfWq9wJhwxKw">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i5HQ9ZLFEeWfWq9wJhwxKw" name="isSingleTypeSymbolDefinition">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_i5HQ9pLFEeWfWq9wJhwxKw" name="stereotypeName" value="PapyrusInternal::Symbols::TypeSymbolDefinition"/>
+    </constraints>
+  </views>
+  <views xmi:id="_i5H4AJLFEeWfWq9wJhwxKw" elementMultiplicity="-1" name="Multiple TypeSymbolDefinition" sections="_i5HQ85LFEeWfWq9wJhwxKw" automaticContext="true" datacontexts="_i5H4BpLFEeWfWq9wJhwxKw">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i5H4AZLFEeWfWq9wJhwxKw" name="isMultipleTypeSymbolDefinition">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_i5H4ApLFEeWfWq9wJhwxKw" name="stereotypeName" value="PapyrusInternal::Symbols::TypeSymbolDefinition"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_i5H4A5LFEeWfWq9wJhwxKw" name="PapyrusInternal" label="Papyrus Internal Profile">
+    <elements xmi:id="_i5H4BJLFEeWfWq9wJhwxKw" name="Path"/>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_i5H4BZLFEeWfWq9wJhwxKw" name="Symbols">
+      <elements xmi:id="_i5H4BpLFEeWfWq9wJhwxKw" name="TypeSymbolDefinition">
+        <properties xmi:id="_i5H4B5LFEeWfWq9wJhwxKw" name="symbolPath"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.14"/>
+      </elements>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>
+  </dataContexts>
+</contexts:Context>