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

Author: bobtarling
Date: 2010-03-21 09:15:43-0700
New Revision: 18117

Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedExceptionsListModel.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 a raised signal to be created in an operation for UML1.4

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=18117&r1=18116&r2=18117
==============================================================================
--- 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-21 09:15:43-0700
@@ -600,7 +600,7 @@
     <attribute name="owner" type="Classifier" />
     <list name="parameter" type="Parameter" />
     <separator />
-    <list name="raisedSignal" type="BehavioralFeature" label="label.raisedsignals" />
+    <list name="raisedSignal" type="org.omg.uml.behavioralelements.commonbehavior.Signal" label="label.raisedsignals" />
   </panel>
   <panel name="Operation">
     <text name="name" type="Name" />
@@ -618,7 +618,7 @@
     </checkgroup>
     <optionbox name="concurrency" type="CallConcurrencyKind" />
     <separator />
-    <list name="raisedSignal" type="BehavioralFeature" label="label.raisedsignals" />
+    <list name="raisedSignal" type="org.omg.uml.behavioralelements.commonbehavior.Signal" label="label.raisedsignals" />
     <list name="method" type="Operation" />
     <textarea name="specification" type="String" />
     

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=18117&r1=18116&r2=18117
==============================================================================
--- 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-21 09:15:43-0700
@@ -600,7 +600,7 @@
     <attribute name="owner" type="Classifier" />
     <list name="parameter" type="Parameter" />
     <separator />
-    <list name="raisedSignal" type="BehavioralFeature" label="label.raisedsignals" />
+    <list name="raisedSignal" type="org.eclipse.uml2.uml.Signal" label="label.raisedsignals" />
   </panel>
   <panel name="Operation">
     <text name="name" type="Name" />
@@ -618,7 +618,7 @@
     </checkgroup>
     <optionbox name="concurrency" type="CallConcurrencyKind" />
     <separator />
-    <list name="raisedSignal" type="BehavioralFeature" label="label.raisedsignals" />
+    <list name="raisedSignal" type="org.eclipse.uml2.uml.Signal" label="label.raisedsignals" />
     <list name="method" type="Operation" />
     <textarea name="specification" type="String" />
     

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=18117&r1=18116&r2=18117
==============================================================================
--- 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-21 09:15:43-0700
@@ -65,6 +65,8 @@
         addGetterSetter("sender", new SenderGetterSetter());
         addGetterSetter("body", new MethodExpressionGetterSetter());
         addGetterSetter("ownedElement", new OwnedElementGetterSetter());
+        addGetterSetter("raisedSignal", new RaisedExceptionGetterSetter());
+        addGetterSetter("raisedException", new RaisedExceptionGetterSetter());
     }
     
     /**
@@ -655,6 +657,41 @@
         }
     }
     
+
+    private class RaisedExceptionGetterSetter extends ListGetterSetter {
+        
+        /**
+         * Get all the owned elements for the namespace
+         * @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().getRaisedExceptions(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().getSignal();
+        }
+    }
     
     private class ParameterGetterSetter extends ListGetterSetter {
         

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=18117&r1=18116&r2=18117
==============================================================================
--- 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-21 09:15:43-0700
@@ -158,8 +158,6 @@
             model = new UMLMessagePredecessorListModel(modelElement);
         } else if ("qualifier".equals(propName)) {
             model = new UMLAssociationEndQualifiersListModel(modelElement);
-        } else if ("raisedSignal".equals(propName)) {
-            model = new UMLOperationRaisedExceptionsListModel(modelElement);
         } else if ("reception".equals(propName)) {
             model = new UMLSignalReceptionListModel(modelElement);
         } else if ("resident".equals(propName)) {

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

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

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