svn commit: r13618 - trunk/src_new/org/argouml/uml/diagram/static_structure/ui

Author: tfmorris
Date: 2007-09-27 01:38:48-0700
New Revision: 13618

Modified:
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java

Log:
Fix stackoverflows in setStandardBounds()

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java?view=diff&rev=13618&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java&r1=13617&r2=13618
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java	2007-09-27 01:38:48-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -73,6 +73,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
      */
+    @Override
     protected void setStandardBounds(int x, int y, int w, int h) {
 
         if (figPoly != null) {
@@ -81,14 +82,15 @@
                     - oldBounds.y);
 
         }
-        super.setBoundsImpl(x, y, w, h);
+        super.setStandardBounds(x, y, w, h);
     }
 
     /*
      * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
      */
+    @Override
     public String placeString() {
         return "new Model";
     }
 
-} /* end class FigModel */
+}

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java?view=diff&rev=13618&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&r1=13617&r2=13618
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java	2007-09-27 01:38:48-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -39,7 +39,14 @@
     private FigPoly figPoly = new FigPoly(Color.black, Color.black);
 
     /**
-     * The main Constructor.
+     * Constructor.
+     * 
+     * @param modelElement
+     *                Subsystem model element for which Fig is to be created.
+     * @param x
+     *                initial X coordinate
+     * @param y
+     *                initial Y coordinate
      */
     public FigSubsystem(Object modelElement, int x, int y) {
         super(modelElement, x, y);
@@ -67,6 +74,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
      */
+    @Override
     protected void setStandardBounds(int x, int y, int w, int h) {
 
         if (figPoly != null) {
@@ -75,14 +83,15 @@
                     - oldBounds.y);
 
         }
-        super.setBoundsImpl(x, y, w, h);
+        super.setStandardBounds(x, y, w, h);
     }
 
     /*
      * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
      */
+    @Override
     public String placeString() {
         return "new Subsystem";
     }
 
-} /* end class FigSubsystem */
+}