Author: yurize
Date: Mon May 14 18:35:03 2012
New Revision: 1338336
URL: http://svn.apache.org/viewvc?rev=1338336&view=rev
Log:
Fixes Waveharness - issue WAVE-346
https://reviews.apache.org/r/5068/
Added:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java
- copied, changed from r1334496,
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/title/WindowTitleHandler.java
Removed:
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/title/WindowTitleHandler.java
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StageTwoProvider.java
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StagesProvider.java
incubator/wave/trunk/src/org/waveprotocol/wave/client/StageTwo.java
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StageTwoProvider.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StageTwoProvider.java?rev=1338336&r1=1338335&r2=1338336&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StageTwoProvider.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StageTwoProvider.java
Mon May 14 18:35:03 2012
@@ -19,7 +19,6 @@
package org.waveprotocol.box.webclient.client;
import com.google.common.base.Preconditions;
-import com.google.gwt.dom.client.Element;
import com.google.gwt.user.client.Command;
import org.waveprotocol.wave.client.StageOne;
@@ -27,6 +26,7 @@ import org.waveprotocol.wave.client.Stag
import org.waveprotocol.wave.client.account.ProfileManager;
import org.waveprotocol.wave.client.common.util.AsyncHolder;
import org.waveprotocol.wave.concurrencycontrol.channel.WaveViewService;
+import org.waveprotocol.wave.concurrencycontrol.common.UnsavedDataListener;
import org.waveprotocol.wave.model.id.IdGenerator;
import org.waveprotocol.wave.model.schema.SchemaProvider;
import org.waveprotocol.wave.model.schema.conversation.ConversationSchemas;
@@ -65,8 +65,8 @@ public class StageTwoProvider extends St
*/
public StageTwoProvider(StageOne stageOne, WaveRef waveRef,
RemoteViewServiceMultiplexer channel,
boolean isNewWave, IdGenerator idGenerator, ProfileManager profiles,
- Element unsavedIndicatorElement) {
- super(stageOne, unsavedIndicatorElement);
+ UnsavedDataListener unsavedDataListener) {
+ super(stageOne, unsavedDataListener);
Preconditions.checkArgument(stageOne != null);
Preconditions.checkArgument(waveRef != null);
Preconditions.checkArgument(waveRef.getWaveId() != null);
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StagesProvider.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StagesProvider.java?rev=1338336&r1=1338335&r2=1338336&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StagesProvider.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/StagesProvider.java
Mon May 14 18:35:03 2012
@@ -36,7 +36,6 @@ import org.waveprotocol.wave.client.wave
import org.waveprotocol.wave.client.wavepanel.impl.focus.FocusFramePresenter;
import org.waveprotocol.wave.client.wavepanel.impl.focus.ViewTraverser;
import org.waveprotocol.wave.client.wavepanel.impl.reader.Reader;
-import org.waveprotocol.wave.client.wavepanel.impl.title.WindowTitleHandler;
import org.waveprotocol.wave.client.wavepanel.view.BlipView;
import org.waveprotocol.wave.client.wavepanel.view.dom.ModelAsViewProvider;
import org.waveprotocol.wave.client.wavepanel.view.dom.full.BlipQueueRenderer;
@@ -127,8 +126,8 @@ public class StagesProvider extends Stag
@Override
protected AsyncHolder<StageTwo> createStageTwoLoader(StageOne one) {
- return haltIfClosed(new StageTwoProvider(
- this.one = one, waveRef, channel, isNewWave, idGenerator, profiles,
unsavedIndicatorElement));
+ return haltIfClosed(new StageTwoProvider(this.one = one, waveRef, channel,
isNewWave,
+ idGenerator, profiles, new
SavedStateIndicator(unsavedIndicatorElement)));
}
@Override
Copied:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java
(from r1334496,
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/title/WindowTitleHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java?p2=incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java&p1=incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/title/WindowTitleHandler.java&r1=1334496&r2=1338336&rev=1338336&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/title/WindowTitleHandler.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java
Mon May 14 18:35:03 2012
@@ -15,11 +15,10 @@
*
*/
-package org.waveprotocol.wave.client.wavepanel.impl.title;
+package org.waveprotocol.box.webclient.client;
import com.google.gwt.user.client.Window;
-import org.waveprotocol.box.webclient.client.Session;
import org.waveprotocol.box.webclient.search.WaveContext;
import org.waveprotocol.box.webclient.search.WaveStore;
import org.waveprotocol.box.webclient.widget.frame.FramedPanel;
Modified: incubator/wave/trunk/src/org/waveprotocol/wave/client/StageTwo.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/StageTwo.java?rev=1338336&r1=1338335&r2=1338336&view=diff
==============================================================================
--- incubator/wave/trunk/src/org/waveprotocol/wave/client/StageTwo.java
(original)
+++ incubator/wave/trunk/src/org/waveprotocol/wave/client/StageTwo.java Mon May
14 18:35:03 2012
@@ -19,7 +19,6 @@ import com.google.common.base.Preconditi
import com.google.gwt.dom.client.Element;
import com.google.gwt.user.client.Command;
-import org.waveprotocol.box.webclient.client.SavedStateIndicator;
import org.waveprotocol.wave.client.account.ProfileManager;
import org.waveprotocol.wave.client.account.impl.ProfileManagerImpl;
import org.waveprotocol.wave.client.common.util.AsyncHolder;
@@ -239,11 +238,11 @@ public interface StageTwo {
private DiffController diffController;
private Reader reader;
- private final Element unsavedIndicatorElement;
+ private final UnsavedDataListener unsavedDataListener;
- public DefaultProvider(StageOne stageOne, Element unsavedIndicatorElement)
{
+ public DefaultProvider(StageOne stageOne, UnsavedDataListener
unsavedDataListener) {
this.stageOne = stageOne;
- this.unsavedIndicatorElement = unsavedIndicatorElement;
+ this.unsavedDataListener = unsavedDataListener;
}
/**
@@ -532,8 +531,7 @@ public interface StageTwo {
ViewChannelFactory viewFactory =
ViewChannelImpl.factory(createWaveViewService(), logger);
UnsavedDataListenerFactory unsyncedListeners = new
UnsavedDataListenerFactory() {
- private final UnsavedDataListener listener = new SavedStateIndicator(
- unsavedIndicatorElement);
+ private final UnsavedDataListener listener = unsavedDataListener;
@Override
public UnsavedDataListener create(WaveletId waveletId) {
