added some notes; fixed a bug in versions mode that occured when opening a closed branch and loading the branch from the server... if there was a deleted node in that branch it would throw an exception because it would try to get the current version of the node to send back with the changes so the client could rewind from the current version. Now the server returns null for deleted nodes instead of failing with an exception, and the client knows that if it gets null that means the node has been deleted.

Author: zackriegman

src/org/argmap/client/ArgMap.java

@@ -21,7 +21,6 @@
 import com.google.gwt.user.client.ui.TabLayoutPanel;
 import com.google.gwt.user.client.ui.Widget;
 
-//TODO: opening any tree with links doesn't seem to work
 //TODO: test opening negated links in versions mode (probably won't work!!!)
 //TODO: fix versions mode formating
 //TODO: versioning root node with no modifications/adds throws exception because of empty change list

src/org/argmap/server/ArgMapServiceImpl.java

@@ -605,15 +605,14 @@ public Map<Long, NodeWithChanges> getPropsWithChanges(List<Long> propIDs) {
 		Map<Long, NodeWithChanges> map = new HashMap<Long, NodeWithChanges>();
 		for (Long propID : propIDs) {
 			NodeWithChanges propWithChanges = new NodeWithChanges();
-			// try {
-			propWithChanges.node = ofy.get(Proposition.class, propID);
-			// } catch (NotFoundException e) {
-			// /*
-			// * if the node doesn't currently exist because it has been
-			// * deleted, just return null
-			// */
-			// propWithChanges.node = null;
-			// }
+
+			/*
+			 * we find() instead of get() because the node in question might not
+			 * currently exist; it might have been deleted in which case
+			 * returning null should be fine
+			 */
+			propWithChanges.node = ofy.find(Proposition.class, propID);
+
 			propWithChanges.nodeChanges = getPropChanges(propID);
 			map.put(propID, propWithChanges);
 		}
@@ -625,15 +624,14 @@ public Map<Long, NodeWithChanges> getArgsWithChanges(List<Long> argIDs) {
 		Map<Long, NodeWithChanges> map = new HashMap<Long, NodeWithChanges>();
 		for (Long argID : argIDs) {
 			NodeWithChanges argWithChanges = new NodeWithChanges();
-			// try {
-			argWithChanges.node = ofy.get(Argument.class, argID);
-			// } catch (NotFoundException e) {
-			// /*
-			// * if the node doesn't currently exist because it has been
-			// * deleted, just return null
-			// */
-			// argWithChanges.node = null;
-			// }
+
+			/*
+			 * we find() instead of get() because the node in question might not
+			 * currently exist; it might have been deleted in which case
+			 * returning null should be fine
+			 */
+			argWithChanges.node = ofy.find(Argument.class, argID);
+
 			argWithChanges.nodeChanges = getArgChanges(argID,
 					argWithChanges.unlinkedLinks);
 			map.put(argID, argWithChanges);

war/WEB-INF/appengine-generated/datastore-indexes-auto.xml

@@ -1,8 +1,8 @@
-<!-- Indices written at Wed, 15 Dec 2010 13:35:11 EST -->
+<!-- Indices written at Wed, 15 Dec 2010 17:39:37 EST -->
 
 <datastore-indexes>
 
-    <!-- Used 9 times in query history -->
+    <!-- Used 11 times in query history -->
     <datastore-index kind="Proposition" ancestor="false" source="auto">
         <property name="root" direction="asc"/>
         <property name="created" direction="desc"/>