svn commit: r12623 - trunk/src_new/org/argouml/uml/diagram: . activity/ui deployment/ui ui

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: bobtarling
Date: 2007-05-15 14:16:51-0700
New Revision: 12623

Modified:
   trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
   trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Log:
Rename refactoring. This method does not change the encloser but should contain code to be executed when the encloser has been changed

Modified: trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java?view=diff&rev=12623&p1=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&r1=12622&r2=12623
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	2007-05-15 14:16:51-0700
@@ -490,7 +490,7 @@
      * @param oldEncloser the previous encloser
      * @param newEncloser the FigNode that encloses the dragged FigNode
      */
-    public void changeFigEncloser(
+    public void encloserChanged(
             FigNode enclosed, FigNode oldEncloser, FigNode newEncloser) {
 	// Do nothing, override in subclass.
 	// TODO: This should really be abstract, can we get rid of the static

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=12623&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=12622&r2=12623
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	2007-05-15 14:16:51-0700
@@ -699,11 +699,11 @@
      * @param oldEncloser The previous encloser (null if none)
      * @param newEncloser The encloser (null if none)
      */
-    public void changeFigEncloser(
+    public void encloserChanged(
             FigNode enclosed, FigNode oldEncloser, FigNode newEncloser) {
 	// TODO: Implement enclosement within pool here and determine
 	// which pools are overlapped.
-	super.changeFigEncloser(enclosed, oldEncloser, newEncloser);
+	super.encloserChanged(enclosed, oldEncloser, newEncloser);
     }
     
 

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=12623&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=12622&r2=12623
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	2007-05-15 14:16:51-0700
@@ -516,7 +516,7 @@
      * 
      * @see org.argouml.ui.ArgoDiagram#changeFigEncloser(org.tigris.gef.presentation.FigNode, org.tigris.gef.presentation.FigNode, org.tigris.gef.presentation.FigNode)
      */
-    public void changeFigEncloser(FigNode enclosed, FigNode oldEncloser, 
+    public void encloserChanged(FigNode enclosed, FigNode oldEncloser, 
             FigNode newEncloser) {
         if (oldEncloser != null && newEncloser == null
                 && Model.getFacade().isAComponent(oldEncloser.getOwner())) {

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12623&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12622&r2=12623
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2007-05-15 14:16:51-0700
@@ -575,7 +575,7 @@
 	LayerPerspective layer = (LayerPerspective) getLayer();
 	if (layer != null) {
             ArgoDiagram diagram = (ArgoDiagram) layer.getDiagram();
-            diagram.changeFigEncloser(
+            diagram.encloserChanged(
                     this,
         	    (FigNode) oldEncloser,
         	    (FigNode) newEncloser);
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.