svn commit: r17114 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui

Author: tfmorris
Date: 2009-04-13 23:26:35-0700
New Revision: 17114

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Log:
Fix failing tests

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java?view=diff&pathrev=17114&r1=17113&r2=17114
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java	2009-04-13 23:26:35-0700
@@ -150,7 +150,10 @@
     @SuppressWarnings("deprecation")
     @Deprecated
     public void setOwner(Object owner) {
-        throw new UnsupportedOperationException(
-                "Owner must be set in constructor and left unchanged");
+        if (owner != getOwner()) {
+            throw new UnsupportedOperationException(
+                    "Owner must be set in constructor and left unchanged");
+        }
     }
+    
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java?view=diff&pathrev=17114&r1=17113&r2=17114
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java	2009-04-13 23:26:35-0700
@@ -246,7 +246,10 @@
     @SuppressWarnings("deprecation")
     @Deprecated
     public void setOwner(Object owner) {
-        throw new UnsupportedOperationException(
-                "Owner must be set in constructor and left unchanged");
+        if (owner != getOwner()) {
+            throw new UnsupportedOperationException(
+                    "Owner must be set in constructor and left unchanged");
+        }
     }
+
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&pathrev=17114&r1=17113&r2=17114
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2009-04-13 23:26:35-0700
@@ -1618,7 +1618,10 @@
     @SuppressWarnings("deprecation")
     @Deprecated
     public void setOwner(Object owner) {
-        throw new UnsupportedOperationException(
-                "Owner must be set in constructor and left unchanged");
+        if (owner != getOwner()) {
+            throw new UnsupportedOperationException(
+                    "Owner must be set in constructor and left unchanged");
+        }
     }
+
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=17114&r1=17113&r2=17114
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2009-04-13 23:26:35-0700
@@ -2493,7 +2493,19 @@
     @SuppressWarnings("deprecation")
     @Deprecated
     public void setOwner(Object owner) {
-        throw new UnsupportedOperationException(
-                "Owner must be set in constructor and left unchanged");
+        if (owner != getOwner()) {
+            throw new UnsupportedOperationException(
+                    "Owner must be set in constructor and left unchanged");
+        }
+    }
+    
+    /*
+     * Override FigNode implementation to keep setOwner from getting called.
+     */
+    @Override
+    public void bindPort(Object port, Fig f) {
+        if (f.getOwner() != port) {
+            f.setOwner(port);
+        }
     }
 }

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

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