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

Author: bobtarling
Date: 2010-03-22 05:25:24-0700
New Revision: 18130

Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleMessageListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionMessagesListModel.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 message to be added to an association-role

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=18130&r1=18129&r2=18130
==============================================================================
--- 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 05:25:24-0700
@@ -3334,7 +3334,7 @@
     <list name="collaborationInstanceSet" type="ModelElement" />
     <separator />
     <list name="connection" type="AssociationEnd" label="label.connections" />
-    <list name="message" type="Message" />
+    <list name="message" type="org.omg.uml.behavioralelements.collaborations.Message" />
     <list name="conformingLink" type="Link" />
   </panel>
   <panel name="AssociationEndRole">
@@ -3430,7 +3430,7 @@
     <combo name="namespace" type="Namespace" />
     <singlerow name="context" type="Collaboration" />
     <separator />
-    <list name="message" type="Message" />
+    <list name="message" type="org.omg.uml.behavioralelements.collaborations.Message" />
     
     <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=18130&r1=18129&r2=18130
==============================================================================
--- 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 05:25:24-0700
@@ -3266,7 +3266,8 @@
     <attribute name="conformingInstance" type="Instance" />
     <attribute name="message" type="ClassifierRole" />
   </panel>
-  <panel name="AssociationRole">
+  <!-- AssociationRole doesn't exist in UML2 - this is commented out until we discover if there is a replacement -->
+  <!-- panel name="AssociationRole">
     <text name="name" type="Name" />
     <combo name="namespace" type="Namespace" />
     <combo name="base" type="Association" />
@@ -3288,9 +3289,9 @@
     <list name="collaborationInstanceSet" type="ModelElement" />
     <separator />
     <list name="connection" type="AssociationEnd" label="label.connections" />
-    <list name="message" type="Message" />
+    <list name="message" type="org.eclipse.uml2.uml.Message" />
     <list name="conformingLink" type="Link" />
-  </panel>
+  </panel -->
   <panel name="AssociationEndRole">
     <text name="name" type="Name" />
     <combo name="type" type="Classifier" />
@@ -3384,7 +3385,7 @@
     <combo name="namespace" type="Namespace" />
     <singlerow name="context" type="Collaboration" />
     <separator />
-    <list name="message" type="Message" />
+    <list name="message" type="org.eclipse.uml2.uml.Message" />
     
     <debug />
     <attribute name="visibility" type="VisibilityKind" />

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=18130&r1=18129&r2=18130
==============================================================================
--- 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 05:25:24-0700
@@ -68,6 +68,7 @@
         addGetterSetter("raisedSignal", new RaisedExceptionGetterSetter());
         addGetterSetter("raisedException", new RaisedExceptionGetterSetter());
         addGetterSetter("method", new MethodGetterSetter());
+        addGetterSetter("message", new MessageGetterSetter());
     }
     
     /**
@@ -729,6 +730,42 @@
         }
     }
     
+    
+    private class MessageGetterSetter 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().getMessages(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().getMessage();
+        }
+    }
+    
     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=18130&r1=18129&r2=18130
==============================================================================
--- 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 05:25:24-0700
@@ -146,8 +146,6 @@
             model = new UMLAssociationLinkListModel(modelElement);
         } else if ("literal".equals(propName)) {
             model = new UMLEnumerationLiteralsListModel(modelElement);
-        } else if ("message".equals(propName)) {
-            model = new UMLInteractionMessagesListModel(modelElement);
         } else if ("outgoing".equals(propName)) {
             model = new UMLStateVertexOutgoingListModel(modelElement);
         } else if ("partition".equals(propName)) {

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

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

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

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