Author: tfmorris
Date: 2008-11-10 12:25:22-0800
New Revision: 16011
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramUtils.java (contents, props changed)
Modified:
trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java
trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.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
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java
Log:
Get active diagram from GEF instead of ProjectManager
Modified: trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java&p2=trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ProjectActions.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2007 The Regents of the University of California. All
+// Copyright (c) 2007-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
@@ -41,6 +41,7 @@
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.ui.ActionRemoveFromDiagram;
import org.tigris.gef.base.Editor;
@@ -170,9 +171,8 @@
}
/**
- * Given a list of targets, displays the according diagram.
- * This method jumps to the diagram showing the targets,
- * and scrolls to make it visible.
+ * Display the diagram which contains the given list of targets and scroll
+ * to make them visible.
*
* @param targets Collection of targets to show
*/
@@ -192,8 +192,15 @@
setTarget(first);
return;
}
- List<ArgoDiagram> diagrams =
- ProjectManager.getManager().getCurrentProject().getDiagramList();
+
+ // TODO: This should get the containing project from the list of
+ // targets, not from some global
+ Project project = ProjectManager.getManager().getCurrentProject();
+ if (project == null) {
+ return;
+ }
+
+ List<ArgoDiagram> diagrams = project.getDiagramList();
Object target = TargetManager.getInstance().getTarget();
if ((target instanceof ArgoDiagram)
&& ((ArgoDiagram) target).countContained(targets) == targets.size()) {
@@ -214,26 +221,22 @@
}
}
if (bestDiagram != null) {
- if (!ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram().equals(bestDiagram)) {
+ if (!DiagramUtils.getActiveDiagram().equals(bestDiagram)) {
setTarget(bestDiagram);
}
setTarget(first);
}
// making it possible to jump to the modelroots
- if (ProjectManager.getManager().getCurrentProject().getRoots()
- .contains(first)) {
+ if (project.getRoots().contains(first)) {
setTarget(first);
}
// and finally, adjust the scrollbars to show the Fig
- Project p = ProjectManager.getManager().getCurrentProject();
- if (p != null) {
- Object f = TargetManager.getInstance().getFigTarget();
- if (f instanceof Fig) {
- Globals.curEditor().scrollToShow((Fig) f);
- }
+ Object f = TargetManager.getInstance().getFigTarget();
+ if (f instanceof Fig) {
+ Globals.curEditor().scrollToShow((Fig) f);
}
+
}
private static void setTarget(Object o) {
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java&p2=trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanel.java 2008-11-10 12:25:22-0800
@@ -38,11 +38,10 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.LabelledLayout;
@@ -95,10 +94,7 @@
public void setTarget(Object t) {
if (!(t instanceof Fig)) {
if (Model.getFacade().isAUMLElement(t)) {
- Project p =
- ProjectManager.getManager()
- .getCurrentProject();
- ArgoDiagram diagram = p.getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
if (diagram != null) {
t = diagram.presentationFor(t);
}
@@ -135,9 +131,7 @@
* @see org.argouml.ui.TabTarget#shouldBeEnabled(java.lang.Object)
*/
public boolean shouldBeEnabled(Object target) {
- ArgoDiagram diagram =
- ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
target =
(target instanceof Fig) ? target : diagram.getContainingFig(target);
return (target instanceof Fig);
Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java&p2=trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/PrintManager.java 2008-11-10 12:25:22-0800
@@ -24,8 +24,8 @@
package org.argouml.ui.cmd;
-import org.argouml.kernel.ProjectManager;
-import org.tigris.gef.base.Diagram;
+import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.PrintAction;
/**
@@ -55,9 +55,9 @@
* Print the active diagram
*/
public void print() {
- Object target = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
- if (target instanceof Diagram) {
+
+ Object target = DiagramUtils.getActiveDiagram();
+ if (target instanceof ArgoDiagram) {
printCmd.actionPerformed(null);
}
}
@@ -68,4 +68,4 @@
public void showPageSetupDialog() {
printCmd.doPageSetup();
}
-} /* end class ActionPrint */
+}
Added: trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramUtils.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramUtils.java?view=auto&rev=16011
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramUtils.java 2008-11-10 12:25:22-0800
@@ -0,0 +1,67 @@
+// $Id$
+// 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;
+
+import org.apache.log4j.Logger;
+import org.tigris.gef.base.Globals;
+import org.tigris.gef.base.Layer;
+import org.tigris.gef.base.LayerPerspective;
+
+/**
+ * A utility class for diagrams (ArgoDiagrams). It provides convenience
+ * methods which encapsulate and isolate access to GEF.
+ *
+ * @author Tom Morris <[email protected]>
+ */
+public class DiagramUtils {
+
+ private static final Logger LOG = Logger.getLogger(DiagramUtils.class);
+
+ /**
+ * @return the diagram containing the mouse (or which most recently
+ * contained the mouse).
+ */
+ public static ArgoDiagram getActiveDiagram() {
+ LayerPerspective layer = getActiveLayer();
+ if (layer != null) {
+ return (ArgoDiagram) layer.getDiagram();
+ }
+ LOG.debug("No active diagram");
+ return null;
+ }
+
+ /**
+ * @return the active diagram layer. If the currently active layer is not a
+ * LayerPerspective, it can't be associated with a Diagram, so
+ * return null.
+ */
+ private static LayerPerspective getActiveLayer() {
+ Layer layer = Globals.curEditor().getLayerManager().getActiveLayer();
+ if (layer instanceof LayerPerspective) {
+ return (LayerPerspective) layer;
+ }
+ return null;
+ }
+}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -27,10 +27,10 @@
import java.awt.event.ActionEvent;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Globals;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.undo.UndoableAction;
@@ -73,8 +73,8 @@
// 3. Both of the nodes are not yet on the diagram.
// For the time being we will only implement situation 1.
// TODO: implement situation 2 and 3.
- MutableGraphModel gm = (MutableGraphModel) ProjectManager.getManager().
- getCurrentProject().getActiveDiagram().getGraphModel();
+ MutableGraphModel gm = (MutableGraphModel) DiagramUtils
+ .getActiveDiagram().getGraphModel();
if (gm.canAddEdge(edge)) { // situation 1
gm.addEdge(edge);
if (Model.getFacade().isAAssociationClass(edge)) {
@@ -90,8 +90,7 @@
@Override
public boolean isEnabled() {
Object target = TargetManager.getInstance().getModelTarget();
- ArgoDiagram dia = ProjectManager.getManager().getCurrentProject().
- getActiveDiagram();
+ ArgoDiagram dia = DiagramUtils.getActiveDiagram();
if (dia == null) {
return false;
}
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=16011&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=16010&r2=16011
==============================================================================
--- 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-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -28,10 +28,10 @@
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.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.graph.GraphModel;
@@ -68,8 +68,7 @@
*/
public boolean isEnabled() {
Object target = TargetManager.getInstance().getTarget();
- ArgoDiagram dia = ProjectManager.getManager().
- getCurrentProject().getActiveDiagram();
+ ArgoDiagram dia = DiagramUtils.getActiveDiagram();
if (dia == null) {
return 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=16011&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=16010&r2=16011
==============================================================================
--- 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-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2006-2007 The Regents of the University of California. All
+// Copyright (c) 2006-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
@@ -30,10 +30,10 @@
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.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.graph.GraphModel;
@@ -68,8 +68,7 @@
*/
@Override
public boolean isEnabled() {
- ArgoDiagram dia = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
+ ArgoDiagram dia = DiagramUtils.getActiveDiagram();
if (dia == null) {
return false;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -34,13 +34,13 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.UmlModelMutator;
import org.argouml.model.Model;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigEdge;
@@ -91,8 +91,7 @@
Collection targets = TargetManager.getInstance().getModelTargets();
//Let's build the comment first, unlinked.
- ArgoDiagram diagram =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
Object comment =
Model.getCoreFactory().buildComment(null,
diagram.getNamespace());
@@ -211,4 +210,4 @@
* The UID.
*/
private static final long serialVersionUID = 6502515091619480472L;
-} /* end class ActionAddNote */
+}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -32,9 +32,9 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Selection;
@@ -81,8 +81,7 @@
@Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- ArgoDiagram d = ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram d = DiagramUtils.getActiveDiagram();
Editor ce = Globals.curEditor();
MutableGraphModel mgm = (MutableGraphModel) ce.getGraphModel();
@@ -110,8 +109,9 @@
edge = Model.getFacade().getAssociation(edge);
}
Fig fig = d.presentationFor(edge);
- if (fig != null)
+ if (fig != null) {
fig.removeFromDiagram();
+ }
}
//The next does not yet work for comment edges:
// Collection c = Model.getFacade().getComments(owner);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -31,9 +31,9 @@
import java.awt.event.MouseEvent;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Command;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
@@ -116,11 +116,10 @@
String instructions = null;
ModePlace placeMode = null;
if (object != null) {
- ArgoDiagram activeDiagram = ProjectManager.getManager().
- getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
- if (activeDiagram instanceof UMLDiagram &&
- ((UMLDiagram) activeDiagram).doesAccept(object)) {
+ if (activeDiagram instanceof UMLDiagram
+ && ((UMLDiagram) activeDiagram).doesAccept(object)) {
instructions = ((UMLDiagram) activeDiagram).
getInstructions(object);
placeMode = ((UMLDiagram) activeDiagram).
@@ -130,8 +129,8 @@
// TODO: work here !
instructions =
Translator.localize(
- "misc.message.click-on-diagram-to-add",
- new Object[] {Model.getFacade().toString(object),});
+ "misc.message.click-on-diagram-to-add",
+ new Object[] {Model.getFacade().toString(object), });
placeMode = new ModePlace(this, instructions);
placeMode.setAddRelatedEdges(true);
}
@@ -184,9 +183,7 @@
* This binds the use of this Command to the
* current diagram of the current project!
*/
- ArgoDiagram diagram =
- ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
Fig aFig = diagram.presentationFor(object);
aFig.setSize(aFig.getPreferredSize());
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/DnDJGraph.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-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
@@ -37,9 +37,9 @@
import java.util.Iterator;
import org.apache.log4j.Logger;
-import org.argouml.kernel.ProjectManager;
import org.argouml.ui.TransferableModelElements;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
@@ -137,8 +137,7 @@
*/
public void dragOver(DropTargetDragEvent dtde) {
try {
- ArgoDiagram dia = ProjectManager.getManager().
- getCurrentProject().getActiveDiagram();
+ ArgoDiagram dia = DiagramUtils.getActiveDiagram();
if (dia instanceof UMLDiagram
/*&& ((UMLDiagram) dia).doesAccept(dtde.getSource())*/) {
dtde.acceptDrag(dtde.getDropAction());
@@ -188,15 +187,14 @@
//get the model elements that are being transfered.
Collection modelElements;
try {
- ArgoDiagram diagram = ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
modelElements =
(Collection) tr.getTransferData(
TransferableModelElements.UML_COLLECTION_FLAVOR);
Iterator i = modelElements.iterator();
while (i.hasNext()) {
- FigNode figNode = ((UMLDiagram )diagram).drop(i.next(),
+ FigNode figNode = ((UMLDiagram ) diagram).drop(i.next(),
dropTargetDropEvent.getLocation());
if (figNode != null) {
Modified: 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=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeAddToDiagram.java 2008-11-10 12:25:22-0800
@@ -34,8 +34,8 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.argouml.kernel.ProjectManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.FigModifyingModeImpl;
import org.tigris.gef.base.Layer;
@@ -131,8 +131,7 @@
final List<FigNode> placedFigs =
new ArrayList<FigNode>(modelElements.size());
- ArgoDiagram diag = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
+ ArgoDiagram diag = DiagramUtils.getActiveDiagram();
if (diag instanceof UMLDiagram) {
for (final Object node : modelElements) {
if (((UMLDiagram) diag).doesAccept(node)) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/RadioAction.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-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
@@ -28,8 +28,8 @@
import javax.swing.Action;
import javax.swing.Icon;
-import org.argouml.kernel.ProjectManager;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.toolbar.toolbutton.AbstractButtonAction;
@@ -61,8 +61,7 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(java.awt.event.ActionEvent actionEvent) {
- UMLDiagram diagram = (UMLDiagram)
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ UMLDiagram diagram = (UMLDiagram) DiagramUtils.getActiveDiagram();
if (Globals.getSticky() && diagram.getSelectedAction() == this) {
// If the user selects an Action that is already selected in sticky
// mode (double clicked) then we turn off sticky mode and make sure
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java 2008-11-10 12:25:22-0800
@@ -45,11 +45,11 @@
import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.configuration.Configuration;
-import org.argouml.kernel.ProjectManager;
import org.argouml.ui.TabModelTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.ui.ActionCopy;
import org.argouml.uml.ui.ActionCut;
import org.tigris.gef.base.Diagram;
@@ -411,8 +411,7 @@
public void propertyChange(PropertyChangeEvent arg0) {
if ("remove".equals(arg0.getPropertyName())) {
- ArgoDiagram diagram = ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
TargetManager.getInstance().setTarget(diagram);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -32,10 +32,10 @@
import javax.swing.Action;
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.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.generator.ui.ClassGenerationDialog;
import org.tigris.gef.undo.UndoableAction;
@@ -70,8 +70,7 @@
@Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- ArgoDiagram activeDiagram =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
if (!(activeDiagram instanceof UMLClassDiagram)) {
return;
}
@@ -130,8 +129,7 @@
*/
@Override
public boolean isEnabled() {
- ArgoDiagram activeDiagram =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
return super.isEnabled()
&& (activeDiagram instanceof UMLClassDiagram);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -32,9 +32,9 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.generator.GeneratorManager;
import org.argouml.uml.generator.ui.ClassGenerationDialog;
import org.tigris.gef.undo.UndoableAction;
@@ -66,8 +66,7 @@
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
List classes = new ArrayList();
- ArgoDiagram activeDiagram =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
if (activeDiagram == null) {
return;
}
@@ -103,8 +102,7 @@
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
public boolean isEnabled() {
- ArgoDiagram activeDiagram = ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
return super.isEnabled() && (activeDiagram != null);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -29,8 +29,8 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -38,26 +38,22 @@
*/
public class ActionGenerationSettings extends UndoableAction {
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*/
public ActionGenerationSettings() {
super(Translator
.localize("action.settings-for-project-code-generation"), null);
- // Set the tooltip string:
+ // Set the tooltip string:
putValue(Action.SHORT_DESCRIPTION, Translator
.localize("action.settings-for-project-code-generation"));
}
- // //////////////////////////////////////////////////////////////
- // main methods
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
SourcePathDialog cgd = new SourcePathDialog();
@@ -68,11 +64,11 @@
* @return true if the action is enabled and the active diagram is a diagram
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
- ArgoDiagram activeDiagram =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
return super.isEnabled()
&& (activeDiagram != null);
}
-} /* end class ActionGenerationSettings */
+}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionLayout.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -30,10 +30,9 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.ui.UndoableAction;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.diagram.activity.layout.ActivityDiagramLayouter;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.layout.Layouter;
@@ -71,15 +70,13 @@
* @return true if the action is enabled
* @see org.argouml.ui.ProjectBrowser
*/
+ @Override
public boolean isEnabled() {
if (!super.isEnabled()) {
return false;
}
- Project p = ProjectManager.getManager().getCurrentProject();
- if (p == null) {
- return false;
- }
- ArgoDiagram d = p.getActiveDiagram();
+
+ ArgoDiagram d = DiagramUtils.getActiveDiagram();
if (d instanceof UMLClassDiagram
|| d instanceof UMLActivityDiagram) {
return true;
@@ -92,10 +89,10 @@
*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- ArgoDiagram diagram = ProjectManager.getManager()
- .getCurrentProject().getActiveDiagram();
+ ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
Layouter layouter;
if (diagram instanceof UMLClassDiagram) {
layouter = new ClassdiagramLayouter(diagram);
@@ -112,10 +109,8 @@
// Create a selection containing all figures in diagram
Editor ce = Globals.curEditor();
SelectionManager sm = ce.getSelectionManager();
- Collection nodes =
- ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram()
- .getLayer().getContents();
+ Collection nodes = DiagramUtils.getActiveDiagram().getLayer()
+ .getContents();
sm.select(nodes);
// Rearrange the diagram layout
@@ -126,4 +121,4 @@
sm.endTrans();
sm.deselectAll();
}
-} /* end class ActionLayout */
+}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java 2008-11-10 12:25:22-0800
@@ -46,6 +46,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.util.ArgoFrame;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.SaveGraphicsAction;
@@ -110,7 +111,7 @@
return false;
}
boolean okSoFar = true;
- ArgoDiagram activeDiagram = p.getActiveDiagram();
+ ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
for (ArgoDiagram d : p.getDiagramList()) {
tm.setTarget(d);
okSoFar = trySaveDiagram(d, saveDir);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java 2008-11-10 12:25:22-0800
@@ -45,6 +45,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.ui.ExceptionDialog;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.util.ArgoFrame;
import org.argouml.util.SuffixFilter;
import org.tigris.gef.base.Diagram;
@@ -84,8 +85,7 @@
* @return true if all went well.
*/
private boolean trySave() {
- Object target =
- ProjectManager.getManager().getCurrentProject().getActiveDiagram();
+ Object target = DiagramUtils.getActiveDiagram();
if (!(target instanceof Diagram)) {
return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java?view=diff&rev=16011&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java&r1=16010&r2=16011
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java 2008-11-10 12:25:22-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -27,8 +27,8 @@
import java.beans.PropertyVetoException;
-import org.argouml.kernel.ProjectManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.ui.UMLPlainTextDocument;
/**
@@ -46,8 +46,7 @@
* @see org.argouml.uml.ui.UMLPlainTextDocument#setProperty(java.lang.String)
*/
protected void setProperty(String text) {
- Object target = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
+ Object target = DiagramUtils.getActiveDiagram();
if (target instanceof ArgoDiagram) {
try {
((ArgoDiagram) target).setName(text);
@@ -61,8 +60,7 @@
* @see org.argouml.uml.ui.UMLPlainTextDocument#getProperty()
*/
protected String getProperty() {
- Object target = ProjectManager.getManager().getCurrentProject()
- .getActiveDiagram();
+ Object target = DiagramUtils.getActiveDiagram();
if (target instanceof ArgoDiagram) {
return ((ArgoDiagram) target).getName();
}
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.