Author: bobtarling
Date: 2008-05-31 06:09:25-0700
New Revision: 14848
Added:
trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
trunk/src/argouml-app/src/org/argouml/ui/ActionCreateEdgeModelElement.java
Modified:
trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
Log:
Extract a couple of Actions I'd like to reuse outside of the element explorer
Added: trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java?view=auto&rev=14848
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java 2008-05-31 06:09:25-0700
@@ -0,0 +1,68 @@
+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
+// 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.ui;
+
+import java.awt.event.ActionEvent;
+
+import org.argouml.model.Model;
+import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.ui.AbstractActionNewModelElement;
+
+/**
+ * An action to create a model element to be contained by the
+ * target model element.
+ *
+ * @author Scott Roberts
+ */
+public class ActionCreateContainedModelElement
+ extends AbstractActionNewModelElement {
+
+ private Object metaType;
+
+ /**
+ * Construct the action.
+ *
+ * @param theMetaType the element to be created
+ * @param target the container that will own the new element
+ * @param menuDescr the description for the menu item label.
+ */
+ public ActionCreateContainedModelElement(
+ Object theMetaType,
+ Object target,
+ String menuDescr) {
+ super(menuDescr);
+
+ metaType = theMetaType;
+
+ setTarget(target);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ Object newElement = Model.getUmlFactory().buildNode(metaType,
+ getTarget());
+
+ TargetManager.getInstance().setTarget(newElement);
+ }
+}
Added: trunk/src/argouml-app/src/org/argouml/ui/ActionCreateEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionCreateEdgeModelElement.java?view=auto&rev=14848
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionCreateEdgeModelElement.java 2008-05-31 06:09:25-0700
@@ -0,0 +1,95 @@
+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
+// 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.ui;
+
+import java.awt.event.ActionEvent;
+import java.text.MessageFormat;
+
+import javax.swing.AbstractAction;
+
+import org.apache.log4j.Logger;
+import org.argouml.kernel.ProjectManager;
+import org.argouml.model.IllegalModelElementConnectionException;
+import org.argouml.model.Model;
+import org.argouml.ui.explorer.ExplorerPopup;
+
+/**
+ * An action to create a relation between 2 model elements.
+ *
+ * @author Bob Tarling
+ */
+public class ActionCreateEdgeModelElement extends AbstractAction {
+
+ private static final Logger LOG =
+ Logger.getLogger(ExplorerPopup.class);
+
+ private final Object metaType;
+ private final Object source;
+ private final Object dest;
+
+ /**
+ * Create a new model element which in graph terminology is an edge,
+ * ie a model element that links two other model elements and makes
+ * no sense to exist by itelf.
+ * @param theMetaType The type of model element to create
+ * @param theSource The source model element to link
+ * @param theDestination The destination model element to link
+ * @param relationshipDescr A textual description that describes how
+ * source relates to destination
+ */
+ public ActionCreateEdgeModelElement(
+ final Object theMetaType,
+ final Object theSource,
+ final Object theDestination,
+ final String relationshipDescr) {
+ super(MessageFormat.format(
+ relationshipDescr,
+ new Object[] {
+ DisplayTextTree.getModelElementDisplayName(theSource),
+ DisplayTextTree.getModelElementDisplayName(
+ theDestination)}));
+ this.metaType = theMetaType;
+ this.source = theSource;
+ this.dest = theDestination;
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ Object rootModel =
+ ProjectManager.getManager().getCurrentProject().getModel();
+ try {
+ Model.getUmlFactory().buildConnection(
+ metaType,
+ source,
+ null,
+ dest,
+ null,
+ null,
+ rootModel);
+ } catch (IllegalModelElementConnectionException e1) {
+ LOG.error("Exception", e1);
+ }
+ }
+}
+
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=14848&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=14847&r2=14848
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java 2008-05-31 06:09:25-0700
@@ -46,6 +46,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.IllegalModelElementConnectionException;
import org.argouml.model.Model;
+import org.argouml.ui.ActionCreateContainedModelElement;
+import org.argouml.ui.ActionCreateEdgeModelElement;
import org.argouml.ui.DisplayTextTree;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
@@ -446,7 +448,7 @@
// this element can be contained add a menu item
// that allows the user to take that action
menuItems.add(new OrderedMenuItem(
- new ActionCreateContainedElement(
+ new ActionCreateContainedModelElement(
MODEL_ELEMENT_MENUITEMS[iter],
target,
(String)
@@ -506,7 +508,7 @@
if (Model.getUmlFactory().isConnectionValid(
metaType, source, dest, true)) {
JMenuItem menuItem = new JMenuItem(
- new ActionCreateModelElement(
+ new ActionCreateEdgeModelElement(
metaType,
source,
dest,
@@ -664,54 +666,6 @@
}
}
-
-
-
- /**
- * An action to create a relation between 2 model elements.
- *
- * @author Bob Tarling
- */
- private class ActionCreateModelElement extends AbstractAction {
-
- private Object metaType;
- private Object source;
- private Object dest;
-
- public ActionCreateModelElement(
- Object theMetaType,
- Object theSource,
- Object theDestination,
- String relationshipDescr) {
- super(MessageFormat.format(
- relationshipDescr,
- new Object[] {
- DisplayTextTree.getModelElementDisplayName(theSource),
- DisplayTextTree.getModelElementDisplayName(
- theDestination)}));
- this.metaType = theMetaType;
- this.source = theSource;
- this.dest = theDestination;
- }
-
- public void actionPerformed(ActionEvent e) {
- Object rootModel =
- ProjectManager.getManager().getCurrentProject().getModel();
- try {
- Model.getUmlFactory().buildConnection(
- metaType,
- source,
- null,
- dest,
- null,
- null,
- rootModel);
- } catch (IllegalModelElementConnectionException e1) {
- LOG.error("Exception", e1);
- }
- }
- }
-
/**
* An action to create an association between 2 or more model elements.
*
@@ -803,43 +757,6 @@
}
}
- /**
- * An action to create a model element to be contained by the
- * target model element.
- *
- * @author Scott Roberts
- */
- private class ActionCreateContainedElement
- extends AbstractActionNewModelElement {
-
- private Object metaType;
-
- /**
- * Construct the action.
- *
- * @param theMetaType the element to be created
- * @param target the container that will own the new element
- * @param menuDescr the description for the menu item label.
- */
- public ActionCreateContainedElement(
- Object theMetaType,
- Object target,
- String menuDescr) {
- super(menuDescr);
-
- metaType = theMetaType;
-
- setTarget(target);
- }
-
- public void actionPerformed(ActionEvent e) {
- Object newElement = Model.getUmlFactory().buildNode(metaType,
- getTarget());
-
- TargetManager.getInstance().setTarget(newElement);
- }
- }
-
private boolean isRelatedToProfiles(Project currentProject,
Object selectedItem) {
boolean found = selectedItem instanceof ProfileConfiguration
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.