svn commit: r12579 - trunk/src_new/org/argouml/uml: cognitive/critics diagram diagram/deployment/ui diagram/static_structure/ui

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]> 
Author: tfmorris
Date: 2007-05-09 10:27:08-0700
New Revision: 12579

Added:
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
      - copied, changed from r12574, /trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNodeInstance.java
Modified:
   trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
   trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java
   trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java
   trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java

Log:
Rename FigMNodeInstance to current naming scheme

Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java	(original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java	2007-05-09 10:27:08-0700
@@ -34,7 +34,7 @@
 import org.argouml.uml.cognitive.UMLDecision;
 import org.argouml.uml.cognitive.UMLToDoItem;
 import org.argouml.uml.diagram.deployment.ui.FigComponentInstance;
-import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
 import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
 
 /**
@@ -107,7 +107,7 @@
         Object obj = null;
 	while (it.hasNext()) {
 	    obj = it.next();
-	    if (obj instanceof FigMNodeInstance) {
+	    if (obj instanceof FigNodeInstance) {
                 isNode = true;
             }
 	}

Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java	(original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceInsideElement.java	2007-05-09 10:27:08-0700
@@ -32,7 +32,7 @@
 import org.argouml.cognitive.ToDoItem;
 import org.argouml.uml.cognitive.UMLDecision;
 import org.argouml.uml.cognitive.UMLToDoItem;
-import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
 import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
 
 /**
@@ -103,10 +103,10 @@
 	ListSet offs = null;
 	while (figIter.hasNext()) {
 	    Object obj = figIter.next();
-	    if (!(obj instanceof FigMNodeInstance)) {
+	    if (!(obj instanceof FigNodeInstance)) {
                 continue;
             }
-	    FigMNodeInstance fn = (FigMNodeInstance) obj;
+	    FigNodeInstance fn = (FigNodeInstance) obj;
 	    if (fn.getEnclosingFig() != null) {
 		if (offs == null) {
 		    offs = new ListSet();

Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java	(original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNodeInstanceWithoutClassifier.java	2007-05-09 10:27:08-0700
@@ -33,7 +33,7 @@
 import org.argouml.model.Model;
 import org.argouml.uml.cognitive.UMLDecision;
 import org.argouml.uml.cognitive.UMLToDoItem;
-import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
 import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
 
 /**
@@ -108,10 +108,10 @@
 	ListSet offs = null;
 	while (figIter.hasNext()) {
 	    Object obj = figIter.next();
-	    if (!(obj instanceof FigMNodeInstance)) {
+	    if (!(obj instanceof FigNodeInstance)) {
 	        continue;
 	    }
-	    FigMNodeInstance fn = (FigMNodeInstance) obj;
+	    FigNodeInstance fn = (FigNodeInstance) obj;
 	    if (fn != null) {
 		Object noi = /*(MNodeInstance)*/ fn.getOwner();
 		if (noi != null) {

Modified: trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	2007-05-09 10:27:08-0700
@@ -40,7 +40,7 @@
 import org.argouml.uml.diagram.deployment.ui.FigComponent;
 import org.argouml.uml.diagram.deployment.ui.FigComponentInstance;
 import org.argouml.uml.diagram.deployment.ui.FigMNode;
-import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
 import org.argouml.uml.diagram.deployment.ui.FigObject;
 import org.argouml.uml.diagram.state.ui.FigBranchState;
 import org.argouml.uml.diagram.state.ui.FigCompositeState;
@@ -161,7 +161,7 @@
         } else if (Model.getFacade().isANode(node)) {
             figNode = new FigMNode();
         } else if (Model.getFacade().isANodeInstance(node)) {
-            figNode = new FigMNodeInstance();
+            figNode = new FigNodeInstance();
         } else if (Model.getFacade().isAComponent(node)) {
             figNode = new FigComponent();
         } else if (Model.getFacade().isAComponentInstance(node)) {

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	2007-05-09 10:27:08-0700
@@ -79,7 +79,7 @@
         } else if (Model.getFacade().isAAssociation(node)) {
             figNode = new FigNodeAssociation(gm, node);
         } else if (Model.getFacade().isANodeInstance(node)) {
-            figNode = new FigMNodeInstance(gm, node);
+            figNode = new FigNodeInstance(gm, node);
         } else if (Model.getFacade().isAComponent(node)) {
             figNode = new FigComponent(gm, node);
         } else if (Model.getFacade().isAComponentInstance(node)) {

Copied: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java (from r12574, /trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNodeInstance.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java?view=diff&rev=12579&p1=/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNodeInstance.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&r1=12574&r2=12579
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNodeInstance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java	2007-05-09 10:27:08-0700
@@ -55,7 +55,7 @@
  *
  * @author [email protected]
  */
-public class FigMNodeInstance extends FigNodeModelElement {
+public class FigNodeInstance extends FigNodeModelElement {
 
     private int d = 20;
     ////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@
     /**
      * Main constructor - used for file loading.
      */
-    public FigMNodeInstance() {
+    public FigNodeInstance() {
         setBigPort(new CubePortFigRect(x, y - d, width + d, height + d, d));
         getBigPort().setFilled(false);
         getBigPort().setLineWidth(0);
@@ -101,7 +101,7 @@
      * @param gm ignored
      * @param node the UML element
      */
-    public FigMNodeInstance(GraphModel gm, Object node) {
+    public FigNodeInstance(GraphModel gm, Object node) {
         this();
         setOwner(node);
         if (Model.getFacade().isAClassifier(node)
@@ -133,7 +133,7 @@
      * @see java.lang.Object#clone()
      */
     public Object clone() {
-        FigMNodeInstance figClone = (FigMNodeInstance) super.clone();
+        FigNodeInstance figClone = (FigNodeInstance) super.clone();
         Iterator it = figClone.getFigs().iterator();
         figClone.setBigPort((FigRect) it.next());
         figClone.cover = (FigCube) it.next();
@@ -310,11 +310,6 @@
         return true;
     }
 
-    /**
-     * The UID.
-     */
-    static final long serialVersionUID = 8822005566372687713L;
-
     /*
      * @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
      */

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&rev=12579&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&r1=12578&r2=12579
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	2007-05-09 10:27:08-0700
@@ -34,7 +34,7 @@
 import org.argouml.ui.GraphChangeAdapter;
 import org.argouml.uml.diagram.UmlDiagramRenderer;
 import org.argouml.uml.diagram.deployment.ui.FigComponentInstance;
-import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
 import org.argouml.uml.diagram.deployment.ui.FigObject;
 import org.argouml.uml.diagram.ui.FigAssociation;
 import org.argouml.uml.diagram.ui.FigAssociationClass;
@@ -144,7 +144,7 @@
         } else if (Model.getFacade().isAObject(node)) {
             figNode = new FigObject(gm, node);
         } else if (Model.getFacade().isANodeInstance(node)) {
-            figNode = new FigMNodeInstance(gm, node);
+            figNode = new FigNodeInstance(gm, node);
         } else if (Model.getFacade().isAComponentInstance(node)) {
             figNode = new FigComponentInstance(gm, node);
         } else {
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.