Author: tfmorris
Date: 2007-07-10 12:20:02-0700
New Revision: 13039
Modified:
trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Log:
Hoist getNewDiagramName to UMLDiagram since all implementations are identical.
Remove unnecessary calls to ProjectManager (issue 4789)
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java 2007-07-10 12:20:02-0700
@@ -35,7 +35,6 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.ActivityGraphsHelper;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
@@ -248,7 +247,7 @@
&& "remove".equals(evt.getPropertyName())) {
Model.getPump().removeModelEventListener(this,
theActivityGraph, new String[] {"remove", "namespace"});
- ProjectManager.getManager().getCurrentProject().moveToTrash(this);
+ getProject().moveToTrash(this);
}
if (evt.getSource() == getStateMachine()) {
Object newNamespace =
@@ -278,6 +277,10 @@
/**
* @return the statemachine
+ *
+ * TODO: If this method is called by any of the Figs, it will introduce
+ * a dependency cycle. It would be much better if they could just
+ * use {@link ArgoDiagram#getOwner()} which does the same thing.
*/
public Object getStateMachine() {
GraphModel gm = getGraphModel();
@@ -359,20 +362,6 @@
return actions;
}
- /**
- * Creates a new diagram name.<p>
- *
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -743,4 +732,4 @@
return Model.getFacade().getContents(partition).contains(state);
}
-} /* end class UMLActivityDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2007-07-10 12:20:02-0700
@@ -32,7 +32,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.collaboration.CollabDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionAddAssociationRole;
@@ -236,19 +235,6 @@
}
}
- /**
- * Creates a new diagramname.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java 2007-07-10 12:20:02-0700
@@ -32,7 +32,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Facade;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
@@ -85,10 +84,7 @@
private Action actionMGeneralization;
private Action actionMAbstraction;
-
- ////////////////////////////////////////////////////////////////
- // contructors
-
+
/**
* Constructor.
*/
@@ -190,19 +186,6 @@
*/
static final long serialVersionUID = -375918274062198744L;
- /**
- * Creates a new diagramname.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -473,11 +456,11 @@
* @see org.argouml.uml.diagram.ui.UMLDiagram#isRelocationAllowed(java.lang.Object)
*/
public boolean isRelocationAllowed(Object base) {
- return false;
- /* TODO: We may return the following when the
- * relocate() has been implemented.
- */
-// base == ProjectManager.getManager().getCurrentProject().getModel();
+ return false;
+ /* TODO: We may return the following when the
+ * relocate() has been implemented.
+ */
+// base == ProjectManager.getManager().getCurrentProject().getModel();
}
/*
@@ -532,4 +515,4 @@
}
}
-} /* end class UMLDeploymentDiagram */
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java 2007-07-10 12:20:02-0700
@@ -28,7 +28,6 @@
import java.util.Hashtable;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionSetAddMessageMode;
@@ -95,21 +94,6 @@
return getNamespace();
}
- /**
- * Creates a new diagramname.
- *
- * @return a new unique name.
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!(ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name))) {
- name = getNewDiagramName();
- }
- return name;
- }
-
-
@Override
public String getLabelName() {
return Translator.localize("label.sequence-diagram");
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2007-07-10 12:20:02-0700
@@ -31,7 +31,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
@@ -109,9 +108,6 @@
private Action actionTransition;
private Action actionJunctionPseudoState;
- ////////////////////////////////////////////////////////////////
- // contructors
-
/**
* This constructor is used to build a dummy statechart diagram so
* that a project will load properly.
@@ -182,7 +178,9 @@
}
Object namespace = Model.getFacade().getNamespace(machine);
- if (namespace != null) return namespace;
+ if (namespace != null) {
+ return namespace;
+ }
Object context = Model.getFacade().getContext(machine);
if (Model.getFacade().isAClassifier(context)) {
@@ -192,8 +190,7 @@
Model.getFacade().getOwner(context));
}
if (namespace == null) {
- namespace =
- ProjectManager.getManager().getCurrentProject().getRoot();
+ namespace = getProject().getRoot();
}
if (namespace == null || !Model.getFacade().isANamespace(namespace)) {
throw new IllegalStateException(
@@ -304,7 +301,7 @@
&& "remove".equals(evt.getPropertyName())) {
Model.getPump().removeModelEventListener(this,
theStateMachine, new String[] {"remove", "namespace"});
- ProjectManager.getManager().getCurrentProject().moveToTrash(this);
+ getProject().moveToTrash(this);
}
if (evt.getSource() == theStateMachine
&& "namespace".equals(evt.getPropertyName())) {
@@ -396,20 +393,6 @@
return actions;
}
- /**
- * Creates a name for the diagram.
- *
- * @return the new diagram name
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -706,7 +689,7 @@
*/
@Override
public Object getDependentElement() {
- return getStateMachine(); /* The StateMachine. */
+ return getStateMachine();
}
/*
@@ -732,4 +715,4 @@
// Do nothing.
}
-} /* end class UMLStateDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java 2007-07-10 12:20:02-0700
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.ui.ModeCreateDependency;
@@ -266,19 +265,6 @@
return actions;
}
- /**
- * Create a new diagram name.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-07-10 12:20:02-0700
@@ -42,6 +42,7 @@
import org.argouml.gefext.ArgoModeCreateFigText;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
import org.argouml.uml.UUIDHelper;
@@ -544,7 +545,23 @@
}
/**
+ * Create a new diagram name.
+ * @return String
+ */
+ protected String getNewDiagramName() {
+ String name = getLabelName() + " " + getNextDiagramSerial();
+ // Project project = getProject();
+ // TODO: If this gets called from the constructor the project
+ // won't be set yet. Figure out another way to handle it
+ Project project = ProjectManager.getManager().getCurrentProject();
+ if (!project.isValidDiagramName(name)) {
+ name = getNewDiagramName();
+ }
+ return name;
+ }
+
+ /**
* The UID.
*/
static final long serialVersionUID = -401219134410459387L;
-} /* end class UMLDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java?view=diff&rev=13039&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&r1=13038&r2=13039
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java 2007-07-10 12:20:02-0700
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
@@ -105,8 +104,6 @@
private Action actionExtensionPoint;
- // constructors
-
/**
* Construct a new use case diagram with no defined namespace.<p>
*
@@ -123,7 +120,7 @@
try {
setName(getNewDiagramName());
} catch (PropertyVetoException pve) { }
- // TODO: All super constrcutors should take a GraphModel
+ // TODO: All super constrctors should take a GraphModel
setGraphModel(createGraphModel());
}
@@ -254,18 +251,6 @@
return actions;
}
- /**
- * @return a new unique name for the diagram
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!(ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name))) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -459,4 +444,5 @@
FigNode oldEncloser, FigNode newEncloser) {
// Do nothing.
}
-} /* end class UMLUseCaseDiagram */
+
+}
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.