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

Author: bobtarling
Date: 2010-03-17 05:37:05-0700
New Revision: 18111

Added:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedExceptionsListModel.java
      - copied, changed from r18101, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedSignalsListModel.java
Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedSignalsListModel.java
Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java

Log:
Get raised exceptions working on UML2 prop panels.
getRaisedSignals deprecated in favour of the getRaisedExceptions (moving to UML2 terminology)

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=18111&r1=18110&r2=18111
==============================================================================
--- 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-17 05:37:05-0700
@@ -172,7 +172,7 @@
         } else if ("qualifier".equals(propName)) {
             model = new UMLAssociationEndQualifiersListModel(modelElement);
         } else if ("raisedSignal".equals(propName)) {
-            model = new UMLOperationRaisedSignalsListModel(modelElement);
+            model = new UMLOperationRaisedExceptionsListModel(modelElement);
         } else if ("reception".equals(propName)) {
             model = new UMLSignalReceptionListModel(modelElement);
         } else if ("resident".equals(propName)) {

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedExceptionsListModel.java (from r18101, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedSignalsListModel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedExceptionsListModel.java?view=diff&pathrev=18111&r1=18101&r2=18111
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedSignalsListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOperationRaisedExceptionsListModel.java	2010-03-17 05:37:05-0700
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    bobtarling
+ *    Bob Tarling
  *****************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -41,7 +41,6 @@
 import java.util.Collection;
 
 import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementListModel2;
 
 
 /**
@@ -49,13 +48,13 @@
  *
  * @author Michiel
  */
-class UMLOperationRaisedSignalsListModel
+class UMLOperationRaisedExceptionsListModel
     extends UMLModelElementListModel {
 
     /**
      * The constructor.
      */
-    public UMLOperationRaisedSignalsListModel(Object modelElement) {
+    public UMLOperationRaisedExceptionsListModel(Object modelElement) {
         super("signal", true, false);
         setTarget(modelElement);
     }
@@ -68,7 +67,7 @@
             Collection signals = null;
             Object target = getTarget();
             if (Model.getFacade().isAOperation(target)) {
-                signals = Model.getFacade().getRaisedSignals(target);
+                signals = Model.getFacade().getRaisedExceptions(target);
             }
             setAllElements(signals);
         }
@@ -81,7 +80,7 @@
         Collection signals = null;
         Object target = getTarget();
         if (Model.getFacade().isAOperation(target)) {
-            signals = Model.getFacade().getRaisedSignals(target);
+            signals = Model.getFacade().getRaisedExceptions(target);
         }
         return (signals != null) && signals.contains(element);
     }

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

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

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