svn commit: r17716 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: meta ui

Author: bobtarling
Date: 2010-01-02 03:57:04-0800
New Revision: 17716

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java

Log:
Complete ComponentInstance panel

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=17716&r1=17715&r2=17716
==============================================================================
--- 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-01-02 03:57:04-0800
@@ -1738,8 +1738,8 @@
     <text name="name" type="Name" />
     <combo name="namespace" type="Namespace" />
     <separator />
-    <singlerow name="sentStimulus" type="Instance" />
-    <singlerow name="receivedStimulus" type="Instance" />
+    <singlerow name="sender" type="Instance" />
+    <singlerow name="receiver" type="Instance" />
     <separator />
     <list name="classifier" type="Classifier" />
     
@@ -2275,8 +2275,8 @@
     <text name="name" type="Name" />
     <combo name="namespace" type="Namespace" />
     <separator />
-    <singlerow name="stimulus" type="Instance" />
-    <singlerow name="stimulus" type="Instance" />
+    <singlerow name="sender" type="Instance" />
+    <singlerow name="receiver" type="Instance" />
     <list name="resident" type="Instance" />
     <list name="clientDependency" type="Dependency" />
     <list name="supplierDependency" type="ModelElement" />
@@ -2313,8 +2313,8 @@
     <text name="name" type="Name" />
     <combo name="namespace" type="Namespace" />
     <separator />
-    <singlerow name="sentStimulus" type="Instance" />
-    <singlerow name="receivedStimulus" type="Instance" />
+    <singlerow name="sender" type="Instance" />
+    <singlerow name="receiver" type="Instance" />
     <list name="resident" type="ComponentInstance" />
     <separator />
     <list name="classifier" type="Classifier" />

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java?view=diff&pathrev=17716&r1=17715&r2=17716
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java	2010-01-02 03:57:04-0800
@@ -85,25 +85,35 @@
                 model = new UMLCollaborationInteractionListModel(modelElement, propName);
             }
         } else if ("sender".equals(propName)) {
-            model = new UMLMessageSenderListModel(modelElement, propName);
+            if (Model.getFacade().isAMessage(modelElement)) {
+                model = new UMLMessageSenderListModel(modelElement, propName);
+            } else {
+                /*
+                 * The XML generated is "stimulus", because the A_receiver_stimulus
+                 * association has "stimulus" and "receiver" as association ends.
+                 * The A_stimulus_sender has "sender" and "stimulus", so it is generated
+                 * once. So we have created them by hand with a more explicit name and
+                 * removed "stimulus".
+                 */ 
+                model = new UMLInstanceSenderStimulusListModel(modelElement, propName);
+            }
         } else if ("receiver".equals(propName)) {
-            model = new UMLMessageReceiverListModel(modelElement, propName);
+            if (Model.getFacade().isAMessage(modelElement)) {
+                model = new UMLMessageReceiverListModel(modelElement, propName);
+            } else {
+                /*
+                 * The XML generated is "stimulus", because the A_receiver_stimulus
+                 * association has "stimulus" and "receiver" as association ends.
+                 * The A_stimulus_sender has "sender" and "stimulus", so it is generated
+                 * once. So we have created them by hand with a more explicit name and
+                 * removed "stimulus".
+                 */ 
+                model = new UMLInstanceReceiverStimulusListModel(modelElement, propName);
+            }
         } else if ("action".equals(propName)) {
             model = new UMLMessageActionListModel(modelElement, propName);
         } else if ("context".equals(propName)) {
             model = new UMLInteractionContextListModel(modelElement, propName);
-        }
-        /*
-         * The XML generated is "stimulus", because the A_receiver_stimulus
-         * association has "stimulus" and "receiver" as association ends.
-         * The A_stimulus_sender has "sender" and "stimulus", so it is generated
-         * once. So we have created them by hand with a more explicit name and
-         * removed "stimulus".
-         */ 
-        else if ("sentStimulus".equals(propName)) {
-            model = new UMLInstanceSenderStimulusListModel(modelElement, propName);
-        } else if ("receivedStimulus".equals(propName)) {
-            model = new UMLInstanceReceiverStimulusListModel(modelElement, propName);
         } else if ("stateMachine".equals(propName)) {
             model = new UMLTransitionStatemachineListModel(modelElement, propName);
         } else if ("state".equals(propName)) {

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2434183

To unsubscribe from this discussion, e-mail: [[email protected]].