summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratischenko2014-06-03 04:48:56 (EDT)
committerRemi Schnekenburger2014-06-04 11:30:45 (EDT)
commitbcec9ec7b0eb0dfaaae72eca233bbd155aabae28 (patch)
tree961eb04d2e8e41faa8e577bc195fa84a2a7dd984
parent8178134b11e2789cbd75e5d3ed4b0e93fd157231 (diff)
downloadorg.eclipse.papyrus-bcec9ec7b0eb0dfaaae72eca233bbd155aabae28.zip
org.eclipse.papyrus-bcec9ec7b0eb0dfaaae72eca233bbd155aabae28.tar.gz
org.eclipse.papyrus-bcec9ec7b0eb0dfaaae72eca233bbd155aabae28.tar.bz2
[420565] - AcceptEventAction stack element in palette autocrlf=falserefs/changes/94/27794/6
Signed-off-by: atischenko <ticher777@gmail.com> Change-Id: Ie8f820f8318517f900678ad88a4a8375329a8a26
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml22
2 files changed, 5 insertions, 19 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
index 005785e..5e1db25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
@@ -3727,7 +3727,7 @@
<entries xsi:type="gmfgen:ToolEntry" title="Opaque Action" description="Create an Opaque Action node" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif" genNodes="/0/@diagram/@childNodes.6"/>
<entries xsi:type="gmfgen:ToolEntry" title="Value Specification Action" description="Create a Value Specification Action node" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" genNodes="/0/@diagram/@childNodes.54"/>
</groups>
- <groups title="AcceptEventActions" description="AcceptEventActions" largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" stack="true" collapse="true">
+ <groups title="AcceptEventActions" description="AcceptEventActions" largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" stack="false" collapse="false">
<entries xsi:type="gmfgen:ToolEntry" title="Accept Event Action" description="Create an Accept Event Action node" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif" genNodes="/0/@diagram/@childNodes.52"/>
</groups>
</palette>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index 8ba1506..5689e59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -3831,6 +3831,10 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
</expand>
</entry>
<predefinedEntry
+ id="createAcceptEventAction1CreationTool"
+ path="/createNodes3Group">
+ </predefinedEntry>
+ <predefinedEntry
id="createActivity1CreationTool"
path="/createNodes3Group">
</predefinedEntry>
@@ -4177,24 +4181,6 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
id="createValueSpecificationAction2CreationTool"
path="/createNodes3Group/createOtherActionsGroup">
</predefinedEntry>
-
- <entry
- description="AcceptEventActions"
- id="createAcceptEventActions14Group"
- kind="stack"
- label="AcceptEventActions"
- large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="/createNodes3Group"
- small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
- <expand
- force="true">
- </expand>
- </entry>
-
- <predefinedEntry
- id="createAcceptEventAction1CreationTool"
- path="/createNodes3Group/createAcceptEventActions14Group">
- </predefinedEntry>
<predefinedEntry
id="createConstraint6CreationTool"
path="/createNodes3Group/createConstraintsGroup">