Author: maurelio1234
Date: 2007-06-12 10:16:57-0700
New Revision: 12824
Modified:
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigClass.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log:
refactoring setBoundsImpl
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=12824&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=12823&r2=12824
==============================================================================
--- 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-12 10:16:57-0700
@@ -46,6 +46,7 @@
import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.argouml.uml.diagram.ui.FigAttributesCompartment;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.ui.foundation.core.ActionAddAttribute;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
@@ -580,88 +581,70 @@
* @param h Desired height of the FigClass
*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
+ * @see FigNodeModelElement#setBoundsImpl(int, int, int, int)
*/
- protected void setBoundsImpl(final int x, final int y,
- final int w, final int h) {
- Rectangle oldBounds = getBounds();
-
- if (stereotypeFigProfileIcon != null) {
- getBigPort().setBounds(x, y, w, h);
- borderFig.setBounds(x, y, w, h);
-
- super.updateProfileBounds(x,y,w,h);
- } else {
- // set bounds of big box
- getBigPort().setBounds(x, y, w, h);
- borderFig.setBounds(x, y, w, h);
-
- // Save our old boundaries (needed later), and get minimum size
- // info. "whitespace" will be used to maintain a running calculation
- // of our size at various points.
-
- final int whitespace = h - getMinimumSize().height;
-
- getNameFig().setLineWidth(0);
- getNameFig().setLineColor(Color.red);
- int currentHeight = 0;
-
- if (getStereotypeFig().isVisible()) {
- int stereotypeHeight = getStereotypeFig().getMinimumSize().height;
- getStereotypeFig().setBounds(
- x,
- y,
- w,
- stereotypeHeight);
- currentHeight = stereotypeHeight;
- }
-
- int nameHeight = getNameFig().getMinimumSize().height;
- getNameFig().setBounds(x, y + currentHeight, w, nameHeight);
- currentHeight += nameHeight;
-
- if (isAttributesVisible()) {
- int attributesHeight = getAttributesFig().getMinimumSize().height;
- if (isOperationsVisible()) {
- attributesHeight += whitespace / 2;
- }
- getAttributesFig().setBounds(
- x,
- y + currentHeight,
- w,
- attributesHeight);
- currentHeight += attributesHeight;
- }
-
- if (isOperationsVisible()) {
- int operationsY = y + currentHeight;
- int operationsHeight = (h + y) - operationsY - 1;
- if (operationsHeight < getOperationsFig().getMinimumSize().height) {
- operationsHeight = getOperationsFig().getMinimumSize().height;
- }
- getOperationsFig().setBounds(
- x,
- operationsY,
- w,
- operationsHeight);
- }
+ protected void setStandardBounds(final int x, final int y, final int w,
+ final int h) {
+ Rectangle oldBounds = getBounds();
+
+ // set bounds of big box
+ getBigPort().setBounds(x, y, w, h);
+ borderFig.setBounds(x, y, w, h);
+
+ // Save our old boundaries (needed later), and get minimum size
+ // info. "whitespace" will be used to maintain a running calculation
+ // of our size at various points.
+
+ final int whitespace = h - getMinimumSize().height;
+
+ getNameFig().setLineWidth(0);
+ getNameFig().setLineColor(Color.red);
+ int currentHeight = 0;
+
+ if (getStereotypeFig().isVisible()) {
+ int stereotypeHeight = getStereotypeFig().getMinimumSize().height;
+ getStereotypeFig().setBounds(x, y, w, stereotypeHeight);
+ currentHeight = stereotypeHeight;
+ }
- updateStereotypeIcon();
+ int nameHeight = getNameFig().getMinimumSize().height;
+ getNameFig().setBounds(x, y + currentHeight, w, nameHeight);
+ currentHeight += nameHeight;
+
+ if (isAttributesVisible()) {
+ int attributesHeight = getAttributesFig().getMinimumSize().height;
+ if (isOperationsVisible()) {
+ attributesHeight += whitespace / 2;
+ }
+ getAttributesFig().setBounds(x, y + currentHeight, w,
+ attributesHeight);
+ currentHeight += attributesHeight;
}
- // Now force calculation of the bounds of the figure, update the edges
- // and trigger anyone who's listening to see if the "bounds" property
- // has changed.
- calcBounds();
- updateEdges();
- firePropChange("bounds", oldBounds, getBounds());
+ if (isOperationsVisible()) {
+ int operationsY = y + currentHeight;
+ int operationsHeight = (h + y) - operationsY - 1;
+ if (operationsHeight < getOperationsFig().getMinimumSize().height) {
+ operationsHeight = getOperationsFig().getMinimumSize().height;
+ }
+ getOperationsFig().setBounds(x, operationsY, w, operationsHeight);
+ }
+
+ updateStereotypeIcon();
+ // Now force calculation of the bounds of the figure, update the edges
+ // and trigger anyone who's listening to see if the "bounds" property
+ // has changed.
+
+ calcBounds();
+ updateEdges();
+ firePropChange("bounds", oldBounds, getBounds());
}
/**
- * Updates the attributes in the fig. Called from modelchanged if there is
- * a modelevent effecting the attributes and from renderingChanged in all
- * cases.
- * TODO: Looks like this should be private - Bob.
- */
+ * Updates the attributes in the fig. Called from modelchanged if there
+ * is a modelevent effecting the attributes and from renderingChanged in
+ * all cases. TODO: Looks like this should be private - Bob.
+ */
protected void updateAttributes() {
if (!isAttributesVisible()) {
return;
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2007-06-12 10:16:57-0700
@@ -527,7 +527,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
- protected void setBoundsImpl(int px, int py, int w, int h) {
+ protected void setStandardBounds(int px, int py, int w, int h) {
if (bodyTextFig == null) {
return;
}
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigDataType.java 2007-06-12 10:16:57-0700
@@ -318,7 +318,7 @@
* @param h Desired height of the figure
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
- protected void setBoundsImpl(final int x, final int y, final int w,
+ protected void setStandardBounds(final int x, final int y, final int w,
final int h) {
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java 2007-06-12 10:16:57-0700
@@ -237,7 +237,7 @@
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
@Override
- protected void setBoundsImpl(final int x, final int y, final int w,
+ protected void setStandardBounds(final int x, final int y, final int w,
final int h) {
// Save our old boundaries so it can be used in property message later
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInstance.java 2007-06-12 10:16:57-0700
@@ -128,7 +128,7 @@
*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
- protected void setBoundsImpl(int x, int y, int w, int h) {
+ protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) return;
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigInterface.java 2007-06-12 10:16:57-0700
@@ -476,7 +476,7 @@
*
* @param h Desired height of the FigInterface
*/
- protected void setBoundsImpl(final int x, final int y, final int w,
+ protected void setStandardBounds(final int x, final int y, final int w,
final int h) {
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigModel.java 2007-06-12 10:16:57-0700
@@ -73,7 +73,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
- protected void setBoundsImpl(int x, int y, int w, int h) {
+ protected void setStandardBounds(int x, int y, int w, int h) {
if (figPoly != null) {
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-06-12 10:16:57-0700
@@ -417,7 +417,7 @@
*
* @param h Desired height of the FigClass
*/
- protected void setBoundsImpl(int xa, int ya, int w, int h) {
+ protected void setStandardBounds(int xa, int ya, int w, int h) {
// Save our old boundaries (needed later), and get minimum size
// info. "aSize" will be used to maintain a running calculation of our
// size at various points.
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSignal.java 2007-06-12 10:16:57-0700
@@ -196,7 +196,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
- protected void setBoundsImpl(final int x, final int y, final int w,
+ protected void setStandardBounds(final int x, final int y, final int w,
final int h) {
// Save our old boundaries so it can be used in property message later
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java 2007-06-12 10:16:57-0700
@@ -195,7 +195,7 @@
*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
- protected void setBoundsImpl(final int x, final int y,
+ protected void setStandardBounds(final int x, final int y,
final int w, final int h) {
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java 2007-06-12 10:16:57-0700
@@ -67,7 +67,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
- protected void setBoundsImpl(int x, int y, int w, int h) {
+ protected void setStandardBounds(int x, int y, int w, int h) {
if (figPoly != null) {
Rectangle oldBounds = getBounds();
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigMessage.java 2007-06-12 10:16:57-0700
@@ -289,7 +289,7 @@
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
@Override
- protected void setBoundsImpl(int x, int y, int w, int h) {
+ protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
}
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java?view=diff&rev=12824&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java&r1=12823&r2=12824
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/uml/diagram/ui/FigNodeAssociation.java 2007-06-12 10:16:57-0700
@@ -266,7 +266,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
- protected void setBoundsImpl(int x, int y, int w, int h) {
+ protected void setStandardBounds(int x, int y, int w, int h) {
Rectangle oldBounds = getBounds();
getBigPort().setBounds(x, y, w, h);
head.setBounds(x, y, w, h);
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=12824&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=12823&r2=12824
==============================================================================
--- 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-12 10:16:57-0700
@@ -30,7 +30,6 @@
import java.awt.Graphics;
import java.awt.Image;
import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
@@ -48,7 +47,6 @@
import javax.swing.Action;
import javax.swing.Icon;
-import javax.swing.JComponent;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
@@ -530,7 +528,6 @@
stereotypesView.addRadioItem(new ActionStereotypeViewBigIcon(this));
stereotypesView.addRadioItem(new ActionStereotypeViewSmallIcon(this));
- System.out.println("BUILDING!!! STVIEW: " + getStereotypeView());
popUpActions.insertElementAt(stereotypesView, 0);
}
return popUpActions;
@@ -1539,19 +1536,6 @@
// this.redraw();
}
- public void updateProfileBounds(int x, int y, int w, int h) {
- if (getStereotypeView() == STEREOTYPE_VIEW_BIG_ICON) {
- stereotypeFigProfileIcon.setBounds(x, y, w, h);
- } else if (getStereotypeView() == STEREOTYPE_VIEW_BIG_ICON) {
- int i = this.getWidth();
-
- for (Object ficon : this.floatingStereotypes) {
- ((FigImage)ficon).setLocation(i, this.getBigPort().getY()+2);
- i -= ICON_WIDTH - 2;
- }
- }
- }
-
/*
* @see org.tigris.gef.presentation.Fig#calcBounds()
*/
@@ -1923,4 +1907,65 @@
renderingChanged();
}
+ /**
+ * @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
+ */
+ protected final void setBoundsImpl(final int x, final int y, final int w,
+ final int h) {
+
+ if (getStereotypeView() == STEREOTYPE_VIEW_BIG_ICON) {
+ if (stereotypeFigProfileIcon != null) {
+ stereotypeFigProfileIcon.setBounds(x, y, w, h);
+ // FigClass calls setBoundsImpl before we set
+ // the stereotypeFigProfileIcon
+ }
+ } else {
+ setStandardBounds(x, y, w, h);
+ if (getStereotypeView() == STEREOTYPE_VIEW_SMALL_ICON) {
+ int i = this.getWidth() + this.getX() - ICON_WIDTH - 2;
+
+ for (Object ficon : this.floatingStereotypes) {
+ ((FigImage) ficon).setLocation(i,
+ this.getBigPort().getY() + 2);
+ i -= ICON_WIDTH - 2;
+ }
+ }
+ }
+ }
+
+ /**
+ * Sets the bounds, but the size will be at least the one returned by
+ * {@link #getMinimumSize()}, unless checking of size is disabled.
+ * <p>
+ *
+ * If the required height is bigger, then the additional height is
+ * equally distributed among all figs (i.e. compartments), such that the
+ * cumulated height of all visible figs equals the demanded height
+ * <p>.
+ *
+ * Some of this has "magic numbers" hardcoded in. In particular there is
+ * a knowledge that the minimum height of a name compartment is 21
+ * pixels.
+ * <p>
+ *
+ * @param x
+ * Desired X coordinate of upper left corner
+ *
+ * @param y
+ * Desired Y coordinate of upper left corner
+ *
+ * @param w
+ * Desired width of the FigClass
+ *
+ * @param h
+ * Desired height of the FigClass
+ *
+ * @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int,
+ * int)
+ */
+ protected void setStandardBounds(final int x, final int y,
+ final int w, final int h) {
+
+ }
+
} /* end class FigNodeModelElement */
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.