moved a bunch of code to GWT.runAsync calls in effort to reduce size of the initial fragment.

Author: zackriegman

Implementation Notes.odt

@@ -5,7 +5,6 @@
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
-import com.google.gwt.core.client.RunAsyncCallback;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
@@ -141,7 +140,7 @@ public void onModuleLoad() {
 		messageMap = new MultiMap<String, Message>();
 		editMode = new ModeEdit(this);
 
-		GWT.runAsync(new RunAsyncCallback() {
+		GWT.runAsync(new AsyncRunCallback() {
 
 			@Override
 			public void onSuccess() {
@@ -174,13 +173,6 @@ public void onSuccess() {
 				getLoginInfo();
 
 			}
-
-			@Override
-			public void onFailure(Throwable reason) {
-				ArgMap.messageTimed("Code download failed", MessageType.ERROR);
-				Log.log("am.oml", "Code download failed" + reason.toString());
-
-			}
 		});
 	}
 
@@ -216,21 +208,13 @@ public void call(LoginInfo loginInfo) {
 					loginPanel.add(nickName);
 					loginPanel.add(signOutLink);
 					if (loginInfo.isAdmin) {
-						GWT.runAsync(new RunAsyncCallback() {
+						GWT.runAsync(new AsyncRunCallback() {
 
 							@Override
 							public void onSuccess() {
 								modePanel.add(new ModeAdmin(ArgMap.this),
 										"Admin");
 							}
-
-							@Override
-							public void onFailure(Throwable reason) {
-								ArgMap.messageTimed("Code download failed",
-										MessageType.ERROR);
-								Log.log("am.sv.a.of", "Code download failed"
-										+ reason.toString());
-							}
 						});
 					}
 				} else {
@@ -250,7 +234,7 @@ public static boolean loggedIn() {
 
 	public void showVersions() {
 		if (!versionsIsDisplayed()) {
-			GWT.runAsync(new RunAsyncCallback() {
+			GWT.runAsync(new AsyncRunCallback() {
 
 				@Override
 				public void onSuccess() {
@@ -259,14 +243,6 @@ public void onSuccess() {
 					}
 					modePanel.insert(versionsMode, "History", 1);
 				}
-
-				@Override
-				public void onFailure(Throwable reason) {
-					ArgMap.messageTimed("Code download failed",
-							MessageType.ERROR);
-					Log.log("am.sv.a.of",
-							"Code download failed" + reason.toString());
-				}
 			});
 		}
 	}

src/org/argmap/client/ArgMap.java

@@ -0,0 +1,13 @@
+package org.argmap.client;
+
+import org.argmap.client.ArgMap.MessageType;
+
+import com.google.gwt.core.client.RunAsyncCallback;
+
+public abstract class AsyncRunCallback implements RunAsyncCallback {
+	@Override
+	public void onFailure(Throwable reason) {
+		ArgMap.messageTimed("Code download failed", MessageType.ERROR);
+		Log.log("arc.on", "Code download failed" + reason.toString());
+	}
+}

src/org/argmap/client/AsyncRunCallback.java

@@ -13,7 +13,6 @@
 import org.argmap.client.ServerComm.LocalCallback;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.RunAsyncCallback;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -72,7 +71,7 @@ public class ModeEdit extends ResizeComposite implements KeyUpHandler,
 	// private SplitLayoutPanel sideSplit;
 
 	private TextBox searchTextBox;
-	private final EditModeTree tree;
+	private EditModeTree tree;
 	private Button addPropButton;
 	private MainSearchTimer mainSearchTimer;
 	public SideSearchTimer sideSearchTimer;
@@ -108,30 +107,34 @@ public ModeEdit(ArgMap argMap) {
 		this.argMap = argMap;
 
 		/***********************************************************
-		 * first setup the tree and start loading the propositions * so that
-		 * they can be loading while everything else is * being setup *
+		 * first start loading the propositions so that they can be loading
+		 * while everything else is being setup
 		 ***********************************************************/
-		/*
-		 * setup the tree area
-		 */
-		tree = new EditModeTree();
-		tree.addOpenHandlerTracked(this);
-		tree.addCloseHandler(this);
-		tree.addSelectionHandler(this);
-		tree.setAnimationEnabled(false);
 
 		/*
 		 * get the props and preload the callback
 		 */
 		getRootProps();
+
+		/*
+		 * note that setting up the tree is done in getRootPropsCallback inside
+		 * a GWT.async() to delay loading all the code having to do with the
+		 * tree until after we've fired of a getRootProps() request to the
+		 * server...
+		 * 
+		 * below we call getRootPropsCallback with a null argument so that the
+		 * very next thing we do is start downloading the code fragment to
+		 * handle whatever the server returns from the getRootProps() call, even
+		 * before that call returns.
+		 */
 		getRootPropsCallback(null);
 
 		/*
 		 * setup the update timer
 		 */
 		updateTimer = new UpdateTimer();
 
-		GWT.runAsync(new RunAsyncCallback() {
+		GWT.runAsync(new AsyncRunCallback() {
 
 			@Override
 			public void onSuccess() {
@@ -249,23 +252,33 @@ public void onClick(ClickEvent event) {
 				setSideBarText("welcome");
 				initWidget(mainSplit);
 			}
-
-			@Override
-			public void onFailure(Throwable reason) {
-				ArgMap.messageTimed("Code download failed", MessageType.ERROR);
-				Log.log("me.me", "Code download failed" + reason.toString());
-			}
 		});
 	}
 
+	private void initTree() {
+		/*
+		 * setup the tree area
+		 */
+		if (tree == null) {
+			tree = new EditModeTree();
+			tree.addOpenHandlerTracked(this);
+			tree.addCloseHandler(this);
+			tree.addSelectionHandler(this);
+			tree.setAnimationEnabled(false);
+		}
+	}
+
 	private void getRootPropsCallback(final PartialTrees allNodes) {
-		GWT.runAsync(new RunAsyncCallback() {
+		GWT.runAsync(new AsyncRunCallback() {
 
 			@Override
 			public void onSuccess() {
 				if (allNodes == null) {
 					return;
 				}
+
+				initTree();
+
 				Log log = Log.getLog("em.em.cb");
 				log.log("Prop Tree From Server");
 				for (Long id : allNodes.rootIDs) {
@@ -285,13 +298,6 @@ public void onSuccess() {
 				log.finish();
 
 			}
-
-			@Override
-			public void onFailure(Throwable reason) {
-				ArgMap.messageTimed("Code download failed", MessageType.ERROR);
-				Log.log("me.me", "Code download failed" + reason.toString());
-
-			}
 		});
 	}
 
@@ -1029,23 +1035,30 @@ private void message(String delay) {
 
 		@Override
 		public void run() {
-			long timeSinceUserAction = System.currentTimeMillis()
-					- lastUserAction;
-			if (timeSinceUserAction < 10 * MINUTE) {
-				currentFrequency = INITIAL_FREQUENCY;
-			} else if (timeSinceUserAction < HOUR) {
-				currentFrequency = 30 * SECOND;
-				message("30 seconds");
-			} else if (timeSinceUserAction < DAY) {
-				currentFrequency = 30 * MINUTE;
-				message("30 minutes");
-			} else {
-				currentFrequency = DAY;
-				message("24 hours");
-			}
+			GWT.runAsync(new AsyncRunCallback() {
+
+				@Override
+				public void onSuccess() {
+					long timeSinceUserAction = System.currentTimeMillis()
+							- lastUserAction;
+					if (timeSinceUserAction < 10 * MINUTE) {
+						currentFrequency = INITIAL_FREQUENCY;
+					} else if (timeSinceUserAction < HOUR) {
+						currentFrequency = 30 * SECOND;
+						message("30 seconds");
+					} else if (timeSinceUserAction < DAY) {
+						currentFrequency = 30 * MINUTE;
+						message("30 minutes");
+					} else {
+						currentFrequency = DAY;
+						message("24 hours");
+					}
+
+					schedule(currentFrequency);
+					if (on) getUpdatesAndApply();
+				}
+			});
 
-			schedule(currentFrequency);
-			if (on) getUpdatesAndApply();
 		}
 
 		public void start() {

src/org/argmap/client/ModeEdit.java

@@ -132,6 +132,7 @@ public class ModeVersions extends ResizeComposite implements
 	private Map<ViewChange, String> mapArgTitle;
 	private Map<ViewChange, Integer> mapPropIndex;
 	private Map<ViewChange, Integer> mapArgIndex;
+	private Map<ViewChange, Boolean> mapPropNegated;
 
 	/*
 	 * A ViewChange contains a pointer to a ViewNodeVer and a Change object, as