svn commit: r18133 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: meta model ui
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2010-03-22 07:12:40-0700
New Revision: 18133
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Log:
Allow arguments to be added to actions in UML1.4 (remove from UML2)
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml?view=diff&pathrev=18133&r1=18132&r2=18133
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml 2010-03-22 07:12:40-0700
@@ -1590,7 +1590,7 @@
<textarea name="recurrence" type="IterationExpression" />
<separator />
<list name="instantiation" type="Classifier" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1629,7 +1629,7 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1668,7 +1668,7 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1894,8 +1894,8 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <combo name="operation" type="Operation" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
+ <combo name="operation" type="Operation" />
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1935,8 +1935,7 @@
<textarea name="recurrence" type="IterationExpression" />
<separator />
<list name="signal" type="Signal" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
@@ -2104,7 +2103,7 @@
<list name="qualifiedValue" type="AttributeLink" />
</panel>
<panel name="ReturnAction">
- <text name="name" type="Name" />
+ <text name="name" type="Name" />
<checkgroup name="modifiers">
<checkbox name="isSpecification" type="Boolean" />
<checkbox name="isAsynchronous" type="Boolean" />
@@ -2112,8 +2111,7 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
@@ -2151,7 +2149,7 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
+ <list name="actualArgument" type="org.omg.uml.behavioralelements.commonbehavior.Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml?view=diff&pathrev=18133&r1=18132&r2=18133
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml 2010-03-22 07:12:40-0700
@@ -1531,7 +1531,6 @@
<attribute name="target" type="ObjectSetExpression" />
<attribute name="script" type="ActionExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
<attribute name="actionSequence" type="ActionSequence" />
<list name="stimulus" type="Action" />
<attribute name="state" type="Action" />
@@ -1548,7 +1547,6 @@
<textarea name="recurrence" type="IterationExpression" />
<separator />
<list name="instantiation" type="Classifier" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1587,7 +1585,6 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1626,7 +1623,6 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
@@ -1852,9 +1848,7 @@
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
<separator />
- <combo name="operation" type="Operation" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
+ <combo name="operation" type="Operation" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
@@ -1893,8 +1887,6 @@
<textarea name="recurrence" type="IterationExpression" />
<separator />
<list name="signal" type="Signal" />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
@@ -1955,7 +1947,6 @@
<attribute name="recurrence" type="IterationExpression" />
<attribute name="target" type="ObjectSetExpression" />
<attribute name="script" type="ActionExpression" />
- <attribute name="actualArgument" type="Argument" />
<attribute name="actionSequence" type="ActionSequence" />
<attribute name="stimulus" type="Action" />
<attribute name="state" type="Action" />
@@ -2065,9 +2056,6 @@
</checkgroup>
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
- <separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
@@ -2104,9 +2092,6 @@
</checkgroup>
<textarea name="script" type="ActionExpression" />
<textarea name="recurrence" type="IterationExpression" />
- <separator />
- <list name="actualArgument" type="Argument" label="label.arguments" />
-
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="namespace" type="Namespace" />
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java?view=diff&pathrev=18133&r1=18132&r2=18133
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java 2010-03-22 07:12:40-0700
@@ -69,6 +69,7 @@
addGetterSetter("raisedException", new RaisedExceptionGetterSetter());
addGetterSetter("method", new MethodGetterSetter());
addGetterSetter("message", new MessageGetterSetter());
+ addGetterSetter("actualArgument", new ArgumentGetterSetter());
}
/**
@@ -766,6 +767,42 @@
}
}
+
+ private class ArgumentGetterSetter extends ListGetterSetter {
+
+ /**
+ * Get all the method for the operation
+ * @param modelElement
+ * @param type
+ * @return
+ * @see org.argouml.core.propertypanels.model.GetterSetterManager.OptionGetterSetter#getOptions(java.lang.Object, java.lang.String)
+ */
+ public Collection getOptions(
+ final Object modelElement,
+ final String type) {
+ return Model.getFacade().getArguments(modelElement);
+ }
+
+ public Object get(Object modelElement, String type) {
+ // not needed
+ return null;
+ }
+
+ public void set(Object element, Object x) {
+ // not needed
+ }
+
+ protected boolean isValidElement(
+ final Object element,
+ final String type) {
+ return getOptions(element, type).contains(element);
+ }
+
+ public Object getMetaType() {
+ return Model.getMetaTypes().getArgument();
+ }
+ }
+
private class ParameterGetterSetter extends ListGetterSetter {
public Collection getOptions(Object modelElement, String type) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java?view=diff&pathrev=18133&r1=18132&r2=18133
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java 2010-03-22 07:12:40-0700
@@ -64,8 +64,6 @@
if ("action".equals(propName)) {
model = new UMLActionSequenceActionListModel(modelElement);
list = new OldScrollList(new UMLActionSequenceActionList((UMLModelElementListModel) model));
- } else if ("actualArgument".equals(propName)) {
- model = new UMLActionArgumentListModel(modelElement, propName);
} else if ("annotatedElement".equals(propName)) {
model = new UMLCommentAnnotatedElementListModel(modelElement);
} else if ("association".equals(propName)) {
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java?view=markup&pathrev=18132
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2463227
To unsubscribe from this discussion, e-mail: [[email protected]].