svn commit: r17717 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: model ui

Author: bobtarling
Date: 2010-01-02 05:55:08-0800
New Revision: 17717

Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java
Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java

Log:
Replace swing model with getter/setter pattern

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=17717&r1=17716&r2=17717
==============================================================================
--- 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-01-02 05:55:08-0800
@@ -55,7 +55,8 @@
         addGetterSetter("changeability", new ChangeabilityGetterSetter());
         addGetterSetter("concurrency", new ConcurrencyGetterSetter());
         addGetterSetter("feature", new FeatureGetterSetter());
-        addGetterSetter("stimulus", new StimuliGetterSetter());
+        addGetterSetter("receiver", new ReceiverGetterSetter());
+        addGetterSetter("sender", new SenderGetterSetter());
         addGetterSetter("body", new MethodExpressionGetterSetter());
     }
     
@@ -612,7 +613,32 @@
         }
     }
     
-    private class StimuliGetterSetter extends ListGetterSetter {
+    private class SenderGetterSetter extends ListGetterSetter {
+        
+        public Collection getOptions(Object modelElement, String type) {
+            return Model.getFacade().getSentStimuli(modelElement);
+        }
+      
+        public Object get(Object modelElement, String type) {
+            // not needed
+            return null;
+        }
+      
+        public void set(Object element, Object x) {
+            // not needed
+        }
+
+        protected boolean isValidElement(Object element, String type) {
+          
+            return getOptions(element, type).contains(element);
+        }
+        
+        public Object getMetaType() {
+            return Model.getMetaTypes().getAttribute();
+        }
+    }
+    
+    private class ReceiverGetterSetter extends ListGetterSetter {
         
         public Collection getOptions(Object modelElement, String type) {
             return Model.getFacade().getReceivedStimuli(modelElement);

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=17717&r1=17716&r2=17717
==============================================================================
--- 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 05:55:08-0800
@@ -87,28 +87,10 @@
         } else if ("sender".equals(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)) {
             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);

Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java?view=markup&pathrev=17716

Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java?view=markup&pathrev=17716

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

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