Minor updates to the Java client; SyncGateway now specified upon clie…

…nt creation and is subsequently unchanging. git-svn-id: http://google-mobwrite.googlecode.com/svn/trunk@94 6a03f37a-134a-0410-852f-bbb3195577bb
apenwarr · Dec 1, 2009 · 93e5fab · 93e5fab
1 parent 36f6892
commit 93e5fab
Show file tree

Hide file tree

Showing 10 changed files with 408 additions and 382 deletions.
diff --git a/html/compressed_form.js b/html/compressed_form.js
diff --git a/html/java-demos/mobwrite-demo.jar b/html/java-demos/mobwrite-demo.jar
diff --git a/html/mobwrite_core.js b/html/mobwrite_core.js
@@ -374,11 +374,9 @@ mobwrite.shareObj.prototype.syncText = function() {
     }
   } else {
     // The last delta postback from the server to this shareObj didn't match.
-    // Send a full text dump to get back in sync. This will result in any
+    // Send a full text dump to get back in sync.  This will result in any
     // changes since the last postback being wiped out. :(
-    if (this.shadowText != clientText) {
-      this.shadowText = clientText;
-    }
+    this.shadowText = clientText;
     this.clientVersion++;
     var action = 'r:' + this.clientVersion + ':' +
                  encodeURI(clientText).replace(/%20/g, ' ');

diff --git a/java/com/google/mobwrite/DemoEditorApplet.java b/java/com/google/mobwrite/DemoEditorApplet.java
@@ -22,12 +22,13 @@ public void init() {
         public void run() {
           createGUI();
 
-          MobWriteClient mobwrite = new MobWriteClient();
-
-          mobwrite.syncGateway = getParameter("syncGateway");
-          if (mobwrite.syncGateway == null) {
-            mobwrite.syncGateway = "http://mobwrite3.appspot.com/scripts/q.py";
+          String syncGateway = getParameter("syncGateway");
+          if (syncGateway == null) {
+            syncGateway = "http://mobwrite3.appspot.com/scripts/q.py";
           }
+
+          MobWriteClient mobwrite = new MobWriteClient(syncGateway);
+
           try {
             mobwrite.maxSyncInterval = Integer.parseInt(getParameter("maxSyncInterval"));
           } catch (Exception e) {

diff --git a/java/com/google/mobwrite/DemoFormApplet.java b/java/com/google/mobwrite/DemoFormApplet.java
@@ -59,12 +59,13 @@ public void init() {
         public void run() {
           createGUI();
 
-          MobWriteClient mobwrite = new MobWriteClient();
-
-          mobwrite.syncGateway = getParameter("syncGateway");
-          if (mobwrite.syncGateway == null) {
-            mobwrite.syncGateway = "http://mobwrite3.appspot.com/scripts/q.py";
+          String syncGateway = getParameter("syncGateway");
+          if (syncGateway == null) {
+            syncGateway = "http://mobwrite3.appspot.com/scripts/q.py";
           }
+
+          MobWriteClient mobwrite = new MobWriteClient(syncGateway);
+
           try {
             mobwrite.maxSyncInterval = Integer.parseInt(getParameter("maxSyncInterval"));
           } catch (Exception e) {