Bug 521247 - [SysML 1.4] Remove name column in Requirement Table
- remove name column in Requirement Table and Requirement Tree Table
- create a new icon for Table Tree Requirement
Change-Id: I5c7d3ec8df4cca42423f325ed1560c5853c783c2
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
index 04d7746..e02f972 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
@@ -250,7 +250,7 @@
</owningRules>
<configuration href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration#/"/>
</representationKinds>
- <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="org.eclipse.papyrus.sysml14.table.requirementTree" id="org.eclipse.papyrus.sysml14.table.requirementTree" name="SysML 1.4 Requirement Tree Table" icon="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" implementationID="PapyrusSysML14RequirementTreeTable">
+ <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="org.eclipse.papyrus.sysml14.table.requirementTree" id="org.eclipse.papyrus.sysml14.table.requirementTree" name="SysML 1.4 Requirement Tree Table" icon="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png" implementationID="PapyrusSysML14RequirementTreeTable">
<modelRules xmi:id="_eXTo8SywEeaHK-6t3D9x9w">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
</modelRules>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png b/table/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png
new file mode 100644
index 0000000..17bf5c7
--- /dev/null
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png
Binary files differ
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/plugin.xml b/table/org.eclipse.papyrus.sysml14.nattable.requirement/plugin.xml
index 16d5cb2..84813b4 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/plugin.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/plugin.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <!-- <extension
- point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
- <contribution
- file="resources/configuration/requirementTable.configuration"
- original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
- </contribution>
- </extension>-->
-
<extension
point="org.eclipse.papyrus.infra.nattable.configuration">
<configuration
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
index 1e26023..da6e9c6 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysML14RequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysML14RequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
<styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
<stringListValue>ROW_HEADER</stringListValue>
- </styles>
+ </styles>
<creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml14.nattable.config.canCreateRequirementTable"/>
<rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">
<ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
@@ -29,9 +29,6 @@
</columnHeaderAxisConfiguration>
<columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
<axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
- <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
- </axis>
<axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</columnAxisProviders>
<rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
index e0799b3..c02de9d 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table allows to display owned requirements of the context of the table as tree" name="RequirementTreeTable" type="PapyrusSysML14RequirementTreeTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table allows to display owned requirements of the context of the table as tree" name="RequirementTreeTable" type="PapyrusSysML14RequirementTreeTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
<styles xsi:type="nattablestyle:TableDisplayStyle" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
<styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
<stringListValue>ROW_HEADER</stringListValue>
- </styles>
+ </styles>
<styles xsi:type="nattablestyle:BooleanValueStyle" name="expandAll" booleanValue="true"/>
<styles xsi:type="nattablestyle:IntListValueStyle" name="hiddenCategoriesByDepth">
<intListValue>0</intListValue>
@@ -65,9 +65,6 @@
</columnHeaderAxisConfiguration>
<columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
<axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
- <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
- </axis>
<axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</columnAxisProviders>
<rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
