Repository: incubator-wave
Updated Branches:
  refs/heads/master 285bee3be -> 3682cf914


http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3682cf91/src/org/waveprotocol/wave/model/conversation/TitleHelper.java
----------------------------------------------------------------------
diff --git a/src/org/waveprotocol/wave/model/conversation/TitleHelper.java 
b/src/org/waveprotocol/wave/model/conversation/TitleHelper.java
index 9402d67..093e0ca 100644
--- a/src/org/waveprotocol/wave/model/conversation/TitleHelper.java
+++ b/src/org/waveprotocol/wave/model/conversation/TitleHelper.java
@@ -19,11 +19,10 @@
 
 package org.waveprotocol.wave.model.conversation;
 
-//TODO (alown): should the WaveContext live under model instead?
-import org.waveprotocol.box.webclient.search.WaveContext;
 import org.waveprotocol.wave.model.document.Document;
 import org.waveprotocol.wave.model.document.MutableDocument;
 import org.waveprotocol.wave.model.document.ReadableWDocument;
+import org.waveprotocol.wave.model.document.WaveContext;
 import org.waveprotocol.wave.model.document.operation.Attributes;
 import org.waveprotocol.wave.model.document.operation.DocInitialization;
 import 
org.waveprotocol.wave.model.document.operation.impl.AnnotationBoundaryMapImpl;

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3682cf91/src/org/waveprotocol/wave/model/document/WaveContext.java
----------------------------------------------------------------------
diff --git a/src/org/waveprotocol/wave/model/document/WaveContext.java 
b/src/org/waveprotocol/wave/model/document/WaveContext.java
new file mode 100644
index 0000000..ac141b6
--- /dev/null
+++ b/src/org/waveprotocol/wave/model/document/WaveContext.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.waveprotocol.wave.model.document;
+
+import org.waveprotocol.wave.client.state.BlipReadStateMonitor;
+import org.waveprotocol.wave.model.conversation.ObservableConversationView;
+import org.waveprotocol.wave.model.supplement.ObservableSupplementedWave;
+import org.waveprotocol.wave.model.wave.opbased.ObservableWaveView;
+
+/**
+ * Bundles together strongly-related wave objects.
+ *
+ * @author [email protected] (David Hearnden)
+ */
+public final class WaveContext {
+  private final ObservableWaveView wave;
+  private final ObservableConversationView conversations;
+  private final ObservableSupplementedWave supplement;
+  private final BlipReadStateMonitor threadMonitor;
+
+  public WaveContext(ObservableWaveView wave, ObservableConversationView 
conversations,
+      ObservableSupplementedWave supplement, BlipReadStateMonitor 
threadMonitor) {
+    this.wave = wave;
+    this.conversations = conversations;
+    this.supplement = supplement;
+    this.threadMonitor = threadMonitor;
+  }
+
+  /**
+   * @return the wave
+   */
+  public ObservableWaveView getWave() {
+    return wave;
+  }
+
+  /**
+   * @return the conversations
+   */
+  public ObservableConversationView getConversations() {
+    return conversations;
+  }
+
+  /**
+   * @return the supplement
+   */
+  public ObservableSupplementedWave getSupplement() {
+    return supplement;
+  }
+
+  /**
+   * @return the threadMonitor
+   */
+  public BlipReadStateMonitor getBlipMonitor() {
+    return threadMonitor;
+  }
+}

Reply via email to