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

Author: tfmorris
Date: 2009-02-02 09:42:49-0800
New Revision: 16741

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java

Log:
Issue 5673: Move populate calls to constructor so they don't get lost and so they're with their own object's code

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	2009-02-02 09:42:49-0800
@@ -130,7 +130,6 @@
         operationsFig = new FigOperationsCompartment(owner, getDefaultBounds(),
                 getSettings());
         constructFigs();
-        operationsFig.populate(); // this fixes issue 5673
     }
 
     /*

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java	2009-02-02 09:42:49-0800
@@ -87,7 +87,6 @@
         super(owner, bounds, settings);
         attributesFigCompartment = new FigAttributesCompartment(owner,
                 DEFAULT_COMPARTMENT_BOUNDS, settings);
-        attributesFigCompartment.populate(); // this fixes issue 5673
     }
 
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	2009-02-02 09:42:49-0800
@@ -70,6 +70,7 @@
     public FigAttributesCompartment(Object owner, Rectangle bounds, 
             DiagramSettings settings) {
         super(owner, bounds, settings);
+        super.populate();
     }
     
     /*

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java	2009-02-02 09:42:49-0800
@@ -89,6 +89,8 @@
      * Construct a new FigGroup containing a "bigPort" or rectangle which
      * encloses the entire group for use in attaching edges, etc and a
      * separator.
+     * <p>
+     * NOTE: Subclasses should call populate() when they are fully constructed.
      * 
      * @param owner owning UML element
      * @param bounds bounding rectangle of fig
@@ -98,6 +100,8 @@
             DiagramSettings settings) {
         super(owner, bounds, settings); // This adds bigPort, i.e. number 1
         constructFigs();
+        // We'd like to call populate here, but our subclasses might not be
+        // completely built yet, so we defer this to them
     }
     
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	2009-02-02 09:42:49-0800
@@ -72,6 +72,7 @@
     public FigEnumLiteralsCompartment(Object owner, Rectangle bounds, 
             DiagramSettings settings) {
         super(owner, bounds, settings);
+        super.populate();
         
         // TODO: We don't really want this to be filled, but if it's not then
         // the user can't double click in the compartment to add a new literal

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java?view=diff&pathrev=16741&r1=16740&r2=16741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	2009-02-02 09:42:49-0800
@@ -73,6 +73,7 @@
     public FigOperationsCompartment(Object owner, Rectangle bounds, 
             DiagramSettings settings) {
         super(owner, bounds, settings);
+        super.populate();
     }
 
     /*

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

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