svn commit: r14320 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java

Author: penyaskito
Date: 2008-04-11 04:45:38-0700
New Revision: 14320

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java

Log:
Fixed FigHead getMinimumSize in Sequence2 diagrams, so classifiers can be shrinked. Fixes issue #5006.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java?view=diff&rev=14320&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java&r1=14319&r2=14320
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigHead.java	2008-04-11 04:45:38-0700
@@ -89,13 +89,7 @@
 
     @Override
     public Dimension getMinimumSize() {
-        Dimension d = null;
-        int minWidth = stereotypeFig.getMinimumSize().width;
-        if (minWidth < nameFig.getWidth()) {
-            minWidth = nameFig.getWidth();
-        }
-        d = new Dimension(minWidth, getMinimumHeight());
-        return d;
+        return new Dimension(getMinimumWidth(), getMinimumHeight());
     }
     
     int getMinimumHeight() {
@@ -106,6 +100,17 @@
         return h;
     }
     
+    int getMinimumWidth() {
+        int minWidth = 50;
+        if (minWidth < stereotypeFig.getMinimumSize().width) {
+            minWidth = stereotypeFig.getMinimumSize().width;
+        }
+        if (minWidth < nameFig.getMinimumSize().width) {
+            minWidth = nameFig.getMinimumSize().width;
+        }
+        return minWidth;
+    }
+    
     @Override
     public void setFilled (boolean filled) {
         rectFig.setFilled(filled);