svn commit: r12768 - branches/gsoc2007/maurelio1234/argouml: ext org/argouml/uml/diagram/static_structure/ui org/argouml/uml/diagram/ui

Author: maurelio1234
Date: 2007-06-07 05:15:24-0700
New Revision: 12768

Modified:
   branches/gsoc2007/maurelio1234/argouml/ext/profile-javabeans.jar
   branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java
   branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java
   branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java

Log:
figures work only for classes

Modified: branches/gsoc2007/maurelio1234/argouml/ext/profile-javabeans.jar
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/ext/profile-javabeans.jar?view=diff&rev=12768&p1=branches/gsoc2007/maurelio1234/argouml/ext/profile-javabeans.jar&p2=branches/gsoc2007/maurelio1234/argouml/ext/profile-javabeans.jar&r1=12767&r2=12768
==============================================================================
Binary files. No diff available.

Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=12768&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=12767&r2=12768
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java	(original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java	2007-06-07 05:15:24-0700
@@ -586,6 +586,9 @@
         Rectangle oldBounds = getBounds();
 
 	if (stereotypeFigProfileIcon != null) {
+	    getBigPort().setBounds(x, y, w, h);	    
+	    borderFig.setBounds(x, y, w, h);
+
 	    stereotypeFigProfileIcon.setBounds(x, y, w, h);
 	} else {
 	        // set bounds of big box
@@ -650,7 +653,6 @@
         calcBounds();
         updateEdges();
         firePropChange("bounds", oldBounds, getBounds());
-	System.out.println("FIGNODEMODELELEMENT: " + getBounds());
     }
 
     /**

Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12768&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12767&r2=12768
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2007-06-07 05:15:24-0700
@@ -1432,7 +1432,7 @@
 	    this.removeFig(stereotypeFigProfileIcon);
 	}	
 	if (originalNameFig != null) {
-		this.setNameFig(originalNameFig);        	    
+	    this.setNameFig(originalNameFig);        	    
 	}
 	
         Object modelElement = getOwner();
@@ -1452,6 +1452,8 @@
             if (replaceIcon != null) {        	
         	stereotypeFigProfileIcon = new FigProfileIcon(replaceIcon, getName());
             	stereotypeFigProfileIcon.setOwner(getOwner());
+            	
+            	stereotypeFigProfileIcon.setLocation(getBigPort().getLocation());
         	this.addFig(stereotypeFigProfileIcon);
 
         	originalNameFig = this.getNameFig();
@@ -1468,9 +1470,6 @@
 	    }
     	    this.redraw();
         }
-        
-        System.out.println("ICON: "+stereotypeFigProfileIcon);
-        System.out.println("NAME: "+getNameFig() + "[" + originalNameFig);
     }
     
     /*

Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java?view=diff&rev=12768&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java&r1=12767&r2=12768
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java	(original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigProfileIcon.java	2007-06-07 05:15:24-0700
@@ -26,11 +26,11 @@
 

 import java.awt.Image;

 

-import org.tigris.gef.presentation.FigGroup;

 import org.tigris.gef.presentation.FigImage;

+import org.tigris.gef.presentation.FigNode;

 import org.tigris.gef.presentation.FigText;

 

-public class FigProfileIcon extends FigGroup {

+public class FigProfileIcon extends FigNode {

 

     private FigImage image = null;

     

@@ -57,7 +57,7 @@
 	label.setLocation(x + (width - label.getWidth())/2, y + image.getHeight()+GAP);

 	

         calcBounds();

-	System.out.println("FIGPROFILEICON: " + getBounds());

+        updateEdges();

     }

 

     public FigText getLabelFig() {