got rid of ViewPropEdit 'deleted' whose use I didn't understand, and added cancelation of side search on TextArea blur

Author: zackriegman

src/org/argmap/client/ModeEdit.java

@@ -43,14 +43,14 @@
 import com.google.gwt.user.client.ui.HTMLTable;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
 import com.google.gwt.user.client.ui.ResizeComposite;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.SplitLayoutPanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
 
 public class ModeEdit extends ResizeComposite implements KeyUpHandler,
 		OpenHandler<TreeItem>, CloseHandler<TreeItem>,
@@ -279,7 +279,8 @@ public void onSuccess() {
 					// propView.logNodeRecursive(0, "em.em.cb", true);
 				}
 				tree.resetState();
-				if (Log.on) tree.logTree(log);
+				if (Log.on)
+					tree.logTree(log);
 
 				updateTimer.start();
 				log.finish();
@@ -388,7 +389,9 @@ public void call(PartialTrees results) {
 								List<ViewProp> viewProps = new ArrayList<ViewProp>(
 										loadedProps.get(node.id));
 								for (ViewProp viewProp : viewProps) {
-									log.logln("prossesing ViewProp:" + viewProp);
+									log
+											.logln("prossesing ViewProp:"
+													+ viewProp);
 									updateNode(viewProp, node, results);
 								}
 							} else if (node instanceof Argument) {
@@ -743,24 +746,30 @@ public void call(PartialTrees trees) {
 						}
 					});
 		} else {
-			ArgMap.messageTimed(
-					"Cannot link to existing proposition when proposition currently being edited has children",
-					MessageType.ERROR);
+			ArgMap
+					.messageTimed(
+							"Cannot link to existing proposition when proposition currently being edited has children",
+							MessageType.ERROR);
 		}
 	}
 
-	public void sideSearch(ViewPropEdit viewProp) {
+	private void cancelSideSearch() {
 		if (sideSearch != null) {
 			sideSearch.cancelSearch();
 			sideSearch = null;
 		}
+		hideSearchBox();
+	}
+
+	public void sideSearch(ViewPropEdit viewProp) {
+		cancelSideSearch();
 
 		sideSearchResults.removeAllRows();
 		sideSearchContinueButton.setVisible(false);
 
 		String searchString = viewProp.getTextAreaContent().trim();
 		if (!searchString.equals("") && viewProp.getChildCount() == 0
-				&& !viewProp.deleted) {
+		/* && !viewProp.deleted */) {
 			List<Long> filterIDs = new ArrayList<Long>();
 			filterIDs.addAll(viewProp.getAncestorIDs());
 			if (viewProp.getParent() != null) {
@@ -1040,7 +1049,8 @@ public void run() {
 			}
 
 			schedule(currentFrequency);
-			if (on) getUpdatesAndApply();
+			if (on)
+				getUpdatesAndApply();
 		}
 
 		public void start() {
@@ -1129,9 +1139,17 @@ public void setViewProp(ViewPropEdit viewProp) {
 			}
 		}
 
+		public void cancelSearch() {
+			viewProp = null;
+			cancelSideSearch();
+			cancel();
+		}
+
 		@Override
 		public void run() {
-			sideSearch(viewProp);
+			if (viewProp != null) {
+				sideSearch(viewProp);
+			}
 		}
 
 		@Override
@@ -1302,8 +1320,8 @@ public void onOpen(OpenEvent<TreeItem> event) {
 			if (!source.isLoaded()) {
 				loadFromServer(source, 2, 1);
 			} else {
-				List<ViewNode> list = new ArrayList<ViewNode>(
-						source.getChildCount());
+				List<ViewNode> list = new ArrayList<ViewNode>(source
+						.getChildCount());
 				for (int i = 0; i < source.getChildCount(); i++) {
 					if (!source.getChild(i).isLoaded()) {
 						list.add(source.getChild(i));

src/org/argmap/client/ViewPropEdit.java

@@ -7,6 +7,8 @@
 import org.argmap.client.ServerComm.LocalCallback;
 import org.argmap.client.StarRating.RatingHandler;
 
+import com.google.gwt.event.dom.client.BlurEvent;
+import com.google.gwt.event.dom.client.BlurHandler;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -27,7 +29,7 @@
 import com.google.gwt.user.client.ui.TextArea;
 
 public class ViewPropEdit extends ViewProp implements ClickHandler,
-		KeyDownHandler, KeyUpHandler, FocusHandler, ChangeHandler,
+		KeyDownHandler, KeyUpHandler, FocusHandler, BlurHandler, ChangeHandler,
 		MouseOverHandler, MouseOutHandler, SavableNode, RatingHandler {
 
 	private static ViewPropEdit lastPropositionWithFocus = null;
@@ -46,7 +48,7 @@ public class ViewPropEdit extends ViewProp implements ClickHandler,
 			"probably true (~75% chance of being true)",
 			"definitely true (~100% chance of being true)" };
 
-	boolean deleted = false;
+	// boolean deleted = false;
 
 	public static ViewPropEdit getLastPropositionWithFocus() {
 		return lastPropositionWithFocus;
@@ -97,6 +99,7 @@ public ViewPropEdit(Proposition prop) {
 		textArea.addKeyDownHandler(this);
 		textArea.addKeyUpHandler(this);
 		textArea.addFocusHandler(this);
+		textArea.addBlurHandler(this);
 		textArea.addChangeHandler(this);
 		focusPanel.addFocusHandler(this);
 		focusPanel.addMouseOverHandler(this);
@@ -344,7 +347,13 @@ public void call(Void t) {
 						}
 					});
 		}
+	}
 
+	@Override
+	public void onBlur(BlurEvent event) {
+		if (event.getSource() == textArea) {
+			getEditMode().sideSearchTimer.cancelSearch();
+		}
 	}
 
 	public void onFocus(FocusEvent event) {
@@ -710,7 +719,7 @@ public void removePropositionAndMaybeParentArgument_DELETE_ME() {
 			// parent arguments if this proposition is top level.
 			getTree().removeItem(this);
 			ServerComm.deleteProp(this.proposition);
-			deleted = true;
+			// deleted = true;
 			return;
 		}
 
@@ -775,7 +784,7 @@ public void removePropositionAndMaybeParentArgument_DELETE_ME() {
 		}
 		ServerComm.deleteProp(this.proposition);
 
-		deleted = true;
+		// deleted = true;
 
 		/*
 		 * this must come after the ServerComm.removeProposition() otherwise it

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

@@ -1,8 +1,8 @@
-<!-- Indices written at Sun, 12 Dec 2010 15:16:07 EST -->
+<!-- Indices written at Sun, 12 Dec 2010 18:41:39 EST -->
 
 <datastore-indexes>
 
-    <!-- Used 24 times in query history -->
+    <!-- Used 28 times in query history -->
     <datastore-index kind="Proposition" ancestor="false" source="auto">
         <property name="root" direction="asc"/>
         <property name="created" direction="desc"/>