Author: bobtarling
Date: 2008-07-02 18:53:32-0700
New Revision: 15147
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
Log:
Defect 3719
Clearly separate the two contract and expand actions into different classes.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java?view=diff&rev=15147&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java&r1=15146&r2=15147
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java 2008-07-02 18:53:32-0700
@@ -35,6 +35,11 @@
import org.argouml.i18n.Translator;
+/**
+ *
+ *
+ * @deprecated in 0.26 alpha3 Use ModeContract or ModeExpand
+ */
public class ModeChangeHeight extends FigModifyingModeImpl {
/**
Added: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java?view=auto&rev=15147
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java 2008-07-02 18:53:32-0700
@@ -0,0 +1,123 @@
+// $Id: ModeContract.java 11516 2006-11-25 04:30:15Z tfmorris $
+// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.uml.diagram.sequence.ui;
+
+import java.awt.Color;
+import java.awt.Graphics;
+
+import java.awt.event.MouseEvent;
+
+import org.tigris.gef.base.Editor;
+import org.tigris.gef.base.FigModifyingModeImpl;
+import org.tigris.gef.base.Globals;
+
+import org.argouml.i18n.Translator;
+
+public class ModeContract extends FigModifyingModeImpl {
+
+ private int startX, startY, currentY;
+ private Editor editor;
+ private Color rubberbandColor;
+
+ /**
+ * The constructor.
+ *
+ */
+ public ModeContract() {
+ editor = Globals.curEditor();
+ rubberbandColor = Globals.getPrefs().getRubberbandColor();
+ }
+
+ /*
+ * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
+ */
+ public void mousePressed(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ startY = me.getY();
+ startX = me.getX();
+ start();
+ me.consume();
+ }
+
+ /*
+ * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
+ */
+ public void mouseDragged(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ currentY = me.getY();
+ editor.damageAll();
+ me.consume();
+ }
+
+ /*
+ * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
+ */
+ public void mouseReleased(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ SequenceDiagramLayer layout =
+ (SequenceDiagramLayer) Globals.curEditor().getLayerManager()
+ .getActiveLayer();
+ int endY = me.getY();
+ int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ int endOffset;
+ if (startY > endY) {
+ endOffset = startOffset;
+ startOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ } else {
+ endOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ }
+ int diff = endOffset - startOffset;
+ if (diff > 0) {
+ layout.contractDiagram(startOffset, diff);
+ }
+
+ me.consume();
+ done();
+ }
+
+ /*
+ * @see org.tigris.gef.base.FigModifyingMode#paint(java.awt.Graphics)
+ */
+ public void paint(Graphics g) {
+ g.setColor(rubberbandColor);
+ g.drawLine(startX, startY, startX, currentY);
+ }
+
+ /*
+ * @see org.tigris.gef.base.FigModifyingMode#instructions()
+ */
+ public String instructions() {
+ return Translator.localize("action.sequence-contract");
+ }
+}
Added: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java?view=auto&rev=15147
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java 2008-07-02 18:53:32-0700
@@ -0,0 +1,122 @@
+// $Id: ModeChangeHeight.java 11516 2006-11-25 04:30:15Z tfmorris $
+// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.uml.diagram.sequence.ui;
+
+import java.awt.Color;
+import java.awt.Graphics;
+
+import java.awt.event.MouseEvent;
+
+import org.tigris.gef.base.Editor;
+import org.tigris.gef.base.FigModifyingModeImpl;
+import org.tigris.gef.base.Globals;
+
+import org.argouml.i18n.Translator;
+
+public class ModeExpand extends FigModifyingModeImpl {
+
+ private int startX, startY, currentY;
+ private Editor editor;
+ private Color rubberbandColor;
+
+ /**
+ * The constructor.
+ *
+ */
+ public ModeExpand() {
+ editor = Globals.curEditor();
+ rubberbandColor = Globals.getPrefs().getRubberbandColor();
+ }
+
+ /*
+ * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
+ */
+ public void mousePressed(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ startY = me.getY();
+ startX = me.getX();
+ start();
+ me.consume();
+ }
+
+ /*
+ * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
+ */
+ public void mouseDragged(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ currentY = me.getY();
+ editor.damageAll();
+ me.consume();
+ }
+
+ /*
+ * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
+ */
+ public void mouseReleased(MouseEvent me) {
+ if (me.isConsumed()) {
+ return;
+ }
+
+ SequenceDiagramLayer layout =
+ (SequenceDiagramLayer) Globals.curEditor().getLayerManager()
+ .getActiveLayer();
+ int endY = me.getY();
+ int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ if (startOffset > 0 && endY < startY) {
+ startOffset--;
+ }
+ int diff = SequenceDiagramLayer.getNodeIndex(endY) - startOffset;
+ if (diff < 0) {
+ diff = -diff;
+ }
+ if (diff > 0) {
+ layout.expandDiagram(startOffset, diff);
+ }
+
+ me.consume();
+ done();
+ }
+
+ /*
+ * @see org.tigris.gef.base.FigModifyingMode#paint(java.awt.Graphics)
+ */
+ public void paint(Graphics g) {
+ g.setColor(rubberbandColor);
+ g.drawLine(startX, startY, startX, currentY);
+ }
+
+ /*
+ * @see org.tigris.gef.base.FigModifyingMode#instructions()
+ */
+ public String instructions() {
+ return Translator.localize("action.sequence-expand");
+ }
+}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java?view=diff&rev=15147&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&r1=15146&r2=15147
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java 2008-07-02 18:53:32-0700
@@ -140,13 +140,13 @@
args.put("name", SEQUENCE_EXPAND_BUTTON);
actions[5] =
- new RadioAction(new ActionSetMode(ModeChangeHeight.class,
+ new RadioAction(new ActionSetMode(ModeExpand.class,
args,
SEQUENCE_EXPAND_BUTTON));
args.clear();
args.put("name", SEQUENCE_CONTRACT_BUTTON);
actions[6] =
- new RadioAction(new ActionSetMode(ModeChangeHeight.class,
+ new RadioAction(new ActionSetMode(ModeContract.class,
args,
SEQUENCE_CONTRACT_BUTTON));
}
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.