# HG changeset patch
# User Tad Glines <tad.glines@ngc.com>
# Date 1276011981 25200
# Branch local_changes
# Node ID 04441a67a1108ffcd44e27a635573110e3c51f5e
# Parent  dff264eac213617220338a81880a377a2c4a3d11
Changes to get wave to compile.

diff -r dff264eac213 -r 04441a67a110 gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/SimpleWebClient.gwt.xml
--- a/gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/SimpleWebClient.gwt.xml	Mon Jun 07 18:27:06 2010 +1000
+++ b/gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/SimpleWebClient.gwt.xml	Tue Jun 08 08:46:21 2010 -0700
@@ -3,7 +3,7 @@
   <!-- Inherit the core Web Toolkit stuff.                        -->
   <inherits name='com.google.gwt.user.User'/>
   <set-property name="compiler.emulatedStack" value="true"/>
-  <set-property name="user.agent" value="safari"/>
+<!--  <set-property name="user.agent" value="safari"/> -->
 
   <inherits name='com.google.gwt.json.JSON'/>
   <inherits name='com.google.gwt.websockets.WebSockets'/>
@@ -19,8 +19,7 @@
   <!-- the theme of your GWT application by uncommenting          -->
   <!-- any one of the following lines.                            -->
   <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/>
-    <inherits name="com.google.gwt.event.EventBase"/>
+ <inherits name='com.google.gwt.user.theme.chrome.Chrome'/>
     <inherits name="com.google.gwt.event.EventBase"/>
     <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/>     -->
 
diff -r dff264eac213 -r 04441a67a110 gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/client/CcStackManager.java
--- a/gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/client/CcStackManager.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/gwt_src/org/waveprotocol/wave/examples/fedone/simplewebclient/client/CcStackManager.java	Tue Jun 08 08:46:21 2010 -0700
@@ -72,8 +72,9 @@
   public static class SimpleCcDocument implements CcDocument {
     class MutableDocProxy extends MutableDocumentProxy<Doc.N, Doc.E, Doc.T>
         implements Document {
-      MutableDocProxy() {
+      MutableDocProxy(MutableDocument<Doc.N, Doc.E, Doc.T> doc) {
         super();
+        setDelegate(doc);
       }
     }
 
@@ -100,8 +101,7 @@
 
     @Override
     public Document getMutableDocument() {
-      MutableDocProxy docProxy = new MutableDocProxy();
-      docProxy.setDelegate((MutableDocument) ((EditorImpl) blipView.getEditor()).mutable());
+      MutableDocProxy docProxy = new MutableDocProxy((MutableDocument) ((EditorImpl) blipView.getEditor()).mutable());
       return docProxy;
     }
 
@@ -117,7 +117,7 @@
 
     @Override
     public void consume(DocOp op) throws OperationException {
-      blipView.getEditor().execute(op);
+      blipView.getEditor().getContent().consume(op);
     }
   }
 
@@ -209,7 +209,7 @@
 
     view = CcBasedWaveViewImpl.create(docFactory, new ConversationSchemas(),
         viewService.getWaveId(), mux, IdFilters.ALL_IDS, idGen, loggerBundle,
-        new BasicWaveletHelper(participant, idGen),
+        new BasicWaveletHelper(participant),
         new CcBasedWaveViewImpl.DisconnectedHandler() {
           @Override
           public void onWaveDisconnected(CorruptionDetail detail) {
diff -r dff264eac213 -r 04441a67a110 gwt_src/org/waveprotocol/wave/examples/fedone/waveclient/common/WaveViewServiceImpl.java
--- a/gwt_src/org/waveprotocol/wave/examples/fedone/waveclient/common/WaveViewServiceImpl.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/gwt_src/org/waveprotocol/wave/examples/fedone/waveclient/common/WaveViewServiceImpl.java	Tue Jun 08 08:46:21 2010 -0700
@@ -361,7 +361,7 @@
     WaveletId waveletId = wavelet.waveletId;
     List<OpenCallback> callbacks =
         new ArrayList<OpenCallback>();
-    if (waveletFilter != null && waveletFilter.first.accepts(waveletId)) {
+    if (waveletFilter != null && IdFilter.accepts(waveletFilter.first, waveletId)) {
       callbacks.add(waveletFilter.second);
     }
     return callbacks;
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/client/Client.gwt.xml
--- a/src/org/waveprotocol/wave/client/Client.gwt.xml	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/client/Client.gwt.xml	Tue Jun 08 08:46:21 2010 -0700
@@ -1,3 +1,3 @@
 <module>
-<source path=""/>
+  <inherits name='org.waveprotocol.wave.client.editor.Editor'/>
 </module>
\ No newline at end of file
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/client/common/util/JsoStringMap.java
--- a/src/org/waveprotocol/wave/client/common/util/JsoStringMap.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/client/common/util/JsoStringMap.java	Tue Jun 08 08:46:21 2010 -0700
@@ -62,14 +62,14 @@
       // Not using Preconditions.checkState to avoid unecessary string concatenation
       throw new IllegalStateException("getExisting: Key '" + key + "' is not in map");
     }
-    return backend.getObjectUnsafe(key);
+    return backend.<V>getObjectUnsafe(key);
   }
 
   @Override
   public V get(String key, V defaultValue) {
     key = escape(key);
     if (backend.containsKey(key)) {
-      return backend.getObjectUnsafe(key);
+      return backend.<V>getObjectUnsafe(key);
     } else {
       return defaultValue;
     }
@@ -77,7 +77,7 @@
 
   @Override
   public V get(String key) {
-    return backend.getObjectUnsafe(escape(key));
+    return backend.<V>getObjectUnsafe(escape(key));
   }
 
   @Override
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/client/editor/Editor.gwt.xml
--- a/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml	Tue Jun 08 08:46:21 2010 -0700
@@ -10,11 +10,23 @@
     <inherits name="org.waveprotocol.wave.model.Model"/>
     <inherits name="org.waveprotocol.wave.model.richtext.RichText"/>
     <inherits name="org.waveprotocol.wave.client.widget.popup.Popup"/>
-    <source path=""/>
+    <source path="">
+        <exclude name="content/**"/>
+        <exclude name="debug/**"/>
+        <exclude name="event/**"/>
+        <exclude name="extract/**"/>
+        <exclude name="gwt/**"/>
+        <exclude name="impl/**"/>
+        <exclude name="keys/**"/>
+        <exclude name="operation/**"/>
+        <exclude name="selection/**"/>
+        <exclude name="sugg/**"/>
+        <exclude name="testing/**"/>
+        <exclude name="testtools/**"/>
+        <exclude name="util/**"/>
+        <exclude name="webdriver/**"/>
+    </source>
     <source path="content"/>
-    <source path="content/img"/>
-    <source path="content/misc"/>
-    <source path="content/paragraph"/>
     <source path="debug"/>
     <source path="event"/>
     <source path="extract"/>
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/concurrencycontrol/client/ConcurrencyControl.java
--- a/src/org/waveprotocol/wave/concurrencycontrol/client/ConcurrencyControl.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/concurrencycontrol/client/ConcurrencyControl.java	Tue Jun 08 08:46:21 2010 -0700
@@ -16,8 +16,6 @@
  */
 package org.waveprotocol.wave.concurrencycontrol.client;
 
-import com.google.common.collect.Iterables;
-
 import org.waveprotocol.wave.concurrencycontrol.common.ChannelException;
 import org.waveprotocol.wave.concurrencycontrol.common.Delta;
 import org.waveprotocol.wave.concurrencycontrol.common.DeltaPair;
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/crypto/CachedCertPathValidator.java
--- a/src/org/waveprotocol/wave/crypto/CachedCertPathValidator.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/crypto/CachedCertPathValidator.java	Tue Jun 08 08:46:21 2010 -0700
@@ -100,6 +100,7 @@
       CertPath certPath = certFactory.generateCertPath(certs);
       validator.validate(certPath, params);
     } catch (GeneralSecurityException e) {
+    	e.printStackTrace();
       throw new SignatureException("Certificate validation failure", e);
     }
   }
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/model/Model.gwt.xml
--- a/src/org/waveprotocol/wave/model/Model.gwt.xml	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/model/Model.gwt.xml	Tue Jun 08 08:46:21 2010 -0700
@@ -2,5 +2,6 @@
   <inherits name="com.google.gwt.user.User" />
   <source path="">
     <exclude name="testing/**"/>
+    <exclude name="conversation/testing/**"/>
   </source>
 </module>
diff -r dff264eac213 -r 04441a67a110 src/org/waveprotocol/wave/model/document/util/LineContainers.java
--- a/src/org/waveprotocol/wave/model/document/util/LineContainers.java	Mon Jun 07 18:27:06 2010 +1000
+++ b/src/org/waveprotocol/wave/model/document/util/LineContainers.java	Tue Jun 08 08:46:21 2010 -0700
@@ -154,7 +154,7 @@
           while (nodeAfter != null && !isLineElement(doc, nodeAfter)) {
             nodeAfter = doc.getNextSibling(nodeAfter);
           }
-          return Point.inElement(el, nodeAfter);
+          return Point.<N>inElement(el, nodeAfter);
         } else { // otherwise, round left (backwards)
           N nodeBefore = point.isInTextNode() ? doc.getPreviousSibling(point.getContainer())
               : Point.nodeBefore(doc, point.asElementPoint());