[Acmcontester-developers] SF.net SVN: acmcontester: [100] WebEditor/src/edu/lnu/FireFly/WebEditor/GUI

[<se...@us...>]

Revision: 100
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=100&view=rev
Author:   sem62
Date:     2008-05-07 10:51:30 -0700 (Wed, 07 May 2008)

Log Message:
-----------
* Fixed bug with move item down in tree
* Fixed notify sending to tree for updating it after moving items.

Modified Paths:
--------------
    WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Reorganizer.java

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java	2008-05-07 17:28:19 UTC (rev 99)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java	2008-05-07 17:51:30 UTC (rev 100)
@@ -124,7 +124,7 @@
 		}
 
 		if (menuItem == moveUpItemMenu) {
-			Reorganizer.getInstance().moveDown(manifestItem);
+			Reorganizer.getInstance().moveUp(manifestItem);
 		}
 
 		if (menuItem == moveDownItemMenu) {

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Reorganizer.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Reorganizer.java	2008-05-07 17:28:19 UTC (rev 99)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Reorganizer.java	2008-05-07 17:51:30 UTC (rev 100)
@@ -34,10 +34,21 @@
 		}
 
 		if (moved) {
-			TreeDataModel.getInstance().updateAllTree();
+			updateAfterMoved(anItem, -1);
 		}
 	}
 
+	private void updateAfterMoved(TreeItem anItem, int otherItemOffset) {
+		TreeDataModel.getInstance().treeNodesDeleted(anItem);
+		TreeDataModel.getInstance().treeNodesInserted(anItem);
+		
+		int anItemIndex = anItem.getParent().getChildIndex(anItem);
+		TreeItem item = anItem.getParent().getChild(anItemIndex + otherItemOffset);
+		
+		TreeDataModel.getInstance().treeNodesDeleted(item);
+		TreeDataModel.getInstance().treeNodesInserted(item);
+	}
+
 	public boolean canMoveDown(TreeItem anItem) {
 		int brothersCount = anItem.getParent().getChildCount();
 		int index = anItem.getParent().getChildIndex(anItem);
@@ -75,7 +86,7 @@
 		}
 
 		if (moved) {
-			TreeDataModel.getInstance().updateAllTree();
+			updateAfterMoved(anItem, 1);
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.