Author: bobtarling Date: 2011-04-26 13:30:07-0700 New Revision: 19282 Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java
Log: Change margin sizes Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java?view=diff&pathrev=19282&r1=19281&r2=19282 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java 2011-04-26 13:30:07-0700 @@ -27,6 +27,7 @@ private final DiagramElement border; private final DiagramElement nameDisplay; private static final int MIN_WIDTH = 90; + private static final int MARGIN = 1; public FigBasePresentation( final Object owner, @@ -103,4 +104,20 @@ w = Math.max(w, MIN_WIDTH); return new Dimension(w, h); } + + int getRightMargin() { + return MARGIN; + } + + int getLeftMargin() { + return MARGIN; + } + + int getTopMargin() { + return MARGIN; + } + + int getBottomMargin() { + return MARGIN; + } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java?view=diff&pathrev=19282&r1=19281&r2=19282 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java 2011-04-26 13:30:07-0700 @@ -94,8 +94,11 @@ * Change the position of the object from where it is to where it is plus dx * and dy. Often called when an object is dragged. This could be very useful * if local-coordinate systems are used because deltas need less - * transforming... maybe. Fires property "bounds". + * transforming... maybe. + * @param dx the x delta + * @param dy the y delta */ + @Override protected void translateImpl(int dx, int dy) { if (dx ==0 || dy == 0) { return; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java?view=diff&pathrev=19282&r1=19281&r2=19282 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java 2011-04-26 13:30:07-0700 @@ -13,7 +13,6 @@ package org.argouml.activity2.diagram; import java.awt.Color; -import java.awt.Dimension; import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; @@ -22,8 +21,6 @@ class FigNamedRect extends FigBasePresentation implements StereotypeDisplayer, NameDisplayer { - private static final int PADDING = 8; - public FigNamedRect( final Object owner, final Rectangle rect, Color lineColor, Color fillColor, Object modelElement, DiagramSettings settings) { ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2724419 To unsubscribe from this discussion, e-mail: [[email protected]].
