Author: bobtarling
Date: 2008-07-01 18:58:04-0700
New Revision: 15142
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java
Modified:
trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
Log:
Provide a Mode class to handle the interaction of adding to a specific location on the diagram.
Defect 5193
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=15142&p1=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&r1=15141&r2=15142
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java 2008-07-01 18:58:04-0700
@@ -259,6 +259,7 @@
&& !dataValueSelected
&& !sequenceDiagramActive)
|| nAryAssociationSelected || commentSelected) {
+ // TODO: Why can't we use ActionAddExistingNodes here? Bob.
Action action =
new ActionAddExistingNode(
menuLocalize("menu.popup.add-to-diagram"),
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java?view=diff&rev=15142&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&r1=15141&r2=15142
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNode.java 2008-07-01 18:58:04-0700
@@ -27,9 +27,14 @@
import java.awt.event.ActionEvent;
+import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
+import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.tigris.gef.base.Editor;
+import org.tigris.gef.base.Globals;
+import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.undo.UndoableAction;
@@ -38,6 +43,7 @@
*
* @author Eugenio Alvarez
* Data Access Technologies.
+* TODO: Why do we have this class as well as ActionAddExistingNodes?
*/
public class ActionAddExistingNode extends UndoableAction {
@@ -76,7 +82,27 @@
*/
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- AddExistingNodeCommand cmd = new AddExistingNodeCommand(object);
- cmd.execute();
+ Editor ce = Globals.curEditor();
+ GraphModel gm = ce.getGraphModel();
+ if (!(gm instanceof MutableGraphModel)) {
+ return;
+ }
+
+ String instructions = null;
+ if (object != null) {
+ instructions =
+ Translator.localize(
+ "misc.message.click-on-diagram-to-add",
+ new Object[] {
+ Model.getFacade().toString(object),
+ });
+ Globals.showStatus(instructions);
+ }
+
+ final ModeAddToDiagram placeMode = new ModeAddToDiagram(
+ TargetManager.getInstance().getTargets(),
+ instructions);
+
+ Globals.mode(placeMode, false);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java?view=diff&rev=15142&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&r1=15141&r2=15142
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java 2008-07-01 18:58:04-0700
@@ -29,11 +29,14 @@
import java.awt.event.ActionEvent;
import java.util.Collection;
+import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
+import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.undo.UndoableAction;
@@ -82,11 +85,22 @@
@Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- if (!objects.isEmpty()) {
- ArgoDiagram dia = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
- addNodes(objects, null, dia);
+ Editor ce = Globals.curEditor();
+ GraphModel gm = ce.getGraphModel();
+ if (!(gm instanceof MutableGraphModel)) {
+ return;
}
+
+ String instructions =
+ Translator.localize(
+ "misc.message.click-on-diagram-to-add");
+ Globals.showStatus(instructions);
+
+ final ModeAddToDiagram placeMode = new ModeAddToDiagram(
+ objects,
+ instructions);
+
+ Globals.mode(placeMode, false);
}
/**
Added: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java?view=auto&rev=15142
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java 2008-07-01 18:58:04-0700
@@ -0,0 +1,236 @@
+// Copyright (c) 2008 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.ui;
+
+import java.awt.Cursor;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.tigris.gef.base.Editor;
+import org.tigris.gef.base.FigModifyingModeImpl;
+import org.tigris.gef.base.Layer;
+import org.tigris.gef.graph.GraphNodeRenderer;
+import org.tigris.gef.graph.MutableGraphModel;
+import org.tigris.gef.presentation.Fig;
+import org.tigris.gef.presentation.FigNode;
+import org.tigris.gef.undo.Memento;
+import org.tigris.gef.undo.UndoManager;
+
+/**
+ * This is the mode the editor is in having selected a number of model elements
+ * and executing Add To Diagram.
+ */
+
+public class ModeAddToDiagram extends FigModifyingModeImpl {
+
+ private static final long serialVersionUID = 8861862975789222877L;
+
+ /**
+ * The nodes to be added.
+ */
+ private final Collection<Object> modelElements;
+
+ private final boolean addRelatedEdges = true;
+
+ private final String instructions;
+
+ private static final Logger LOG = Logger.getLogger(ModeAddToDiagram.class);
+
+ /**
+ * Create a mode to add the given elements to the diagram
+ * @param modelElements the model elements to add
+ * @param instructions the instruction to place in status bar
+ */
+ public ModeAddToDiagram(
+ final Collection<Object> modelElements,
+ final String instructions) {
+ this.modelElements = modelElements;
+ if (instructions == null) {
+ this.instructions = "";
+ } else {
+ this.instructions = instructions;
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////
+ // user feedback
+
+ /**
+ * @return A string to be shown in the status bar of the Editor when this
+ * mode is on top of the ModeManager.
+ */
+ @Override
+ public String instructions() {
+ return instructions;
+ }
+
+ /**
+ * @return a cross hair cursor
+ */
+ public Cursor getInitialCursor() {
+ return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+ }
+
+ /**
+ * On mouse release add the elements to the diagram
+ * @param me the mouse event
+ */
+ @Override
+ public void mouseReleased(MouseEvent me) {
+ if (me.isConsumed()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("MouseReleased but rejected as already consumed");
+ }
+ return;
+ }
+ UndoManager.getInstance().addMementoLock(this);
+ start();
+ MutableGraphModel gm = (MutableGraphModel) editor.getGraphModel();
+
+ int x = me.getX();
+ int y = me.getY();
+ editor.damageAll();
+ Point snapPt = new Point(x, y);
+ editor.snap(snapPt);
+ editor.damageAll();
+
+ Layer lay = editor.getLayerManager().getActiveLayer();
+ GraphNodeRenderer renderer = editor.getGraphNodeRenderer();
+
+ final List<FigNode> placedFigs =
+ new ArrayList<FigNode>(modelElements.size());
+
+ for (final Object node : modelElements) {
+ if (gm.canAddNode(node)) {
+ FigNode pers = renderer.getFigNodeFor(gm, lay, node, null);
+ pers.setLocation(snapPt.x, snapPt.y);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("mouseMoved: Location set ("
+ + pers.getX() + "," + pers.getY() + ")");
+ }
+ UndoManager.getInstance().startChain();
+ editor.add(pers);
+ gm.addNode(node);
+ if (addRelatedEdges) {
+ gm.addNodeRelatedEdges(node);
+ }
+
+ Fig encloser = null;
+ Rectangle bbox = pers.getBounds();
+ List otherFigs = lay.getContents();
+ Iterator it = otherFigs.iterator();
+ while (it.hasNext()) {
+ Fig otherFig = (Fig) it.next();
+ if (!(otherFig.getUseTrapRect())) {
+ continue;
+ }
+ if (!(otherFig instanceof FigNode)) {
+ continue;
+ }
+ if (!otherFig.isVisible()) {
+ continue;
+ }
+ if (otherFig.equals(pers)) {
+ continue;
+ }
+ Rectangle trap = otherFig.getTrapRect();
+ if (trap != null
+ && trap.contains(bbox.x, bbox.y)
+ && trap.contains(
+ bbox.x + bbox.width,
+ bbox.y + bbox.height)) {
+ encloser = otherFig;
+ }
+ }
+ pers.setEnclosingFig(encloser);
+
+ placedFigs.add(pers);
+ }
+ }
+
+ UndoManager.getInstance().removeMementoLock(this);
+ if (UndoManager.getInstance().isGenerateMementos()) {
+ AddToDiagramMemento memento =
+ new AddToDiagramMemento(editor, placedFigs);
+ UndoManager.getInstance().addMemento(memento);
+ }
+ UndoManager.getInstance().addMementoLock(this);
+
+ done();
+ me.consume();
+ }
+
+ public void keyTyped(KeyEvent ke) {
+ if (ke.getKeyChar() == KeyEvent.VK_ESCAPE) {
+ LOG.debug("ESC pressed");
+ leave();
+ }
+ }
+}
+
+class AddToDiagramMemento extends Memento {
+
+ private final List<FigNode> nodesPlaced;
+ private final Editor editor;
+ private final MutableGraphModel mgm;
+
+ AddToDiagramMemento(final Editor ed, final List<FigNode> nodesPlaced) {
+ this.nodesPlaced = nodesPlaced;
+ this.editor = ed;
+ this.mgm = (MutableGraphModel) editor.getGraphModel();
+ }
+
+ public void undo() {
+ UndoManager.getInstance().addMementoLock(this);
+ for (FigNode node : nodesPlaced) {
+ editor.getSelectionManager().deselect(node);
+ mgm.removeNode(node.getOwner());
+ editor.remove(node);
+ }
+ UndoManager.getInstance().removeMementoLock(this);
+ }
+ public void redo() {
+ UndoManager.getInstance().addMementoLock(this);
+ for (FigNode node : nodesPlaced) {
+ editor.add(node);
+ mgm.addNode(node.getOwner());
+ }
+ editor.getSelectionManager().select(nodesPlaced);
+ UndoManager.getInstance().removeMementoLock(this);
+ }
+ public void dispose() {
+ }
+
+ public String toString() {
+ return (isStartChain() ? "*" : " ")
+ + "AddToDiagramMemento";
+ }
+}
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.