Author: bobtarling Date: 2011-04-18 15:47:22-0700 New Revision: 19259 Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
Log: Make as many classes as possible package scope Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java 2011-04-18 15:47:22-0700 @@ -21,7 +21,7 @@ import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.presentation.FigPoly; -public class ConcavePentagonDisplayState extends BaseDisplayState +class ConcavePentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { private static final int PADDING = 8; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java 2011-04-18 15:47:22-0700 @@ -2,7 +2,7 @@ import java.awt.Dimension; -public interface DiagramElement extends org.argouml.uml.diagram.DiagramElement { +interface DiagramElement extends org.argouml.uml.diagram.DiagramElement { Dimension getMinimumSize(); } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java 2011-04-18 15:47:22-0700 @@ -7,7 +7,7 @@ * move to the diagrams module * @author Bob Tarling */ -public interface DiagramNode extends DiagramElement { +interface DiagramNode extends DiagramElement { Rectangle getBounds(); void setNameDiagramElement(DiagramElement name); Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java 2011-04-18 15:47:22-0700 @@ -13,7 +13,6 @@ package org.argouml.activity2.diagram; -import java.awt.Color; import java.awt.Dimension; import java.awt.Rectangle; @@ -28,7 +27,7 @@ /** * @author Bob Tarling */ -public class FigNotation extends FigText implements NotatedItem, DiagramElement { +class FigNotation extends FigText implements NotatedItem, DiagramElement { private final NotationType notationType; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java 2011-04-18 15:47:22-0700 @@ -18,9 +18,10 @@ import org.tigris.gef.presentation.Fig; import org.tigris.gef.undo.UndoManager; -public class ModePlaceDiagramElement extends FigModifyingModeImpl { +class ModePlaceDiagramElement extends FigModifyingModeImpl { - private static final Logger LOG = Logger.getLogger(ModePlaceDiagramElement.class); + private static final Logger LOG = + Logger.getLogger(ModePlaceDiagramElement.class); private final Object metaType; private final String style; private final String instructions; @@ -33,10 +34,10 @@ private static final int HEIGHT = 25; public ModePlaceDiagramElement( - BaseDiagram diagram, - Object metaType, - String style, - String instructions) { + final BaseDiagram diagram, + final Object metaType, + final String style, + final String instructions) { this.diagram = diagram; this.metaType = metaType; this.style = style; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java 2011-04-18 15:47:22-0700 @@ -20,7 +20,7 @@ import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.presentation.FigPoly; -public class PentagonDisplayState extends BaseDisplayState +class PentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { private static final int PADDING = 8; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java 2011-04-18 15:47:22-0700 @@ -24,7 +24,7 @@ * The state for displaying a node as a rounded rectangle * @author Bob Tarling */ -public class RRectDisplayState extends BaseDisplayState +class RRectDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { private static final int PADDING = 8; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java?view=diff&pathrev=19259&r1=19258&r2=19259 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java 2011-04-18 15:47:22-0700 @@ -19,7 +19,7 @@ import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.presentation.FigRect; -public class RectDisplayState extends BaseDisplayState +class RectDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { private static final int PADDING = 8; ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2721164 To unsubscribe from this discussion, e-mail: [[email protected]].
