Revision: 8024
Author: [email protected]
Date: Fri Apr 30 13:33:12 2010
Log: Sort, format, and update comments.
Patch by: amitmanjhi
Review by: rjrjr (desk review)
http://code.google.com/p/google-web-toolkit/source/detail?r=8024
Modified:
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/Receiver.java
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/client/ValueStoreJsonImpl.java
/branches/2.1/bikeshed/test/com/google/gwt/app/place/ActivityManagerTest.java
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/Receiver.java
Thu Apr 29 07:36:37 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/Receiver.java
Fri Apr 30 13:33:12 2010
@@ -16,7 +16,7 @@
package com.google.gwt.requestfactory.shared;
/**
- * Implemented by objects that display a list of values.
+ * Implemented by objects that display values.
*
* @param <V> value type
*/
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/client/ValueStoreJsonImpl.java
Thu Apr 29 07:36:37 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/client/ValueStoreJsonImpl.java
Fri Apr 30 13:33:12 2010
@@ -72,7 +72,11 @@
RecordJsoImpl oldRecord = records.get(recordKey);
if (oldRecord == null) {
records.put(recordKey, newRecord);
+ // TODO: need to fire a create event.
} else {
+ // TODO: Merging is not the correct thing to do but it works as long
as we
+ // don't have filtering by properties. Need to revisit this once
response
+ // only has a subset of all properties.
boolean changed = oldRecord.merge(newRecord);
newRecord = oldRecord.cast();
if (array != null) {
=======================================
---
/branches/2.1/bikeshed/test/com/google/gwt/app/place/ActivityManagerTest.java
Wed Apr 28 14:11:42 2010
+++
/branches/2.1/bikeshed/test/com/google/gwt/app/place/ActivityManagerTest.java
Fri Apr 30 13:33:12 2010
@@ -25,9 +25,6 @@
* Eponymous unit test.
*/
public class ActivityManagerTest extends TestCase {
- private static class MyPlace extends Place {
- }
-
private static class MyActivity implements Activity {
Boolean canceled = null;
Boolean stopped = null;
@@ -55,9 +52,19 @@
public boolean willStop() {
return willStop;
}
-
+ }
+
+ private static class MyDisplay implements Activity.Display {
+ IsWidget widget = null;
+
+ public void showActivityWidget(IsWidget widget) {
+ this.widget = widget;
+ }
};
+ private static class MyPlace extends Place {
+ }
+
private static class MyView implements IsWidget {
boolean asWidgetCalled = false;
@@ -66,14 +73,6 @@
return null;
}
}
-
- private static class MyDisplay implements Activity.Display {
- IsWidget widget = null;
-
- public void showActivityWidget(IsWidget widget) {
- this.widget = widget;
- }
- }
private final MyPlace place1 = new MyPlace();
private final MyPlace place2 = new MyPlace();
@@ -96,8 +95,8 @@
}
};
- HandlerManager eventBus = new HandlerManager(null);
- ActivityManager<MyPlace> manager = new ActivityManager<MyPlace>(myMap,
eventBus);
+ private HandlerManager eventBus = new HandlerManager(null);
+ private ActivityManager<MyPlace> manager = new
ActivityManager<MyPlace>(myMap, eventBus);
public void testEventSetupAndTeardown() {
assertEquals(0, eventBus.getHandlerCount(PlaceChangeEvent.TYPE));
@@ -114,9 +113,11 @@
assertEquals(0,
eventBus.getHandlerCount(PlaceChangeRequestedEvent.TYPE));
}
- public void testSimpleDispatch() {
+ public void testRejected() {
manager.setDisplay(display);
+ activity1.willStop = false;
+
PlaceChangeRequestedEvent<MyPlace> event = new
PlaceChangeRequestedEvent<MyPlace>(place1);
eventBus.fireEvent(event);
assertFalse(event.isRejected());
@@ -127,18 +128,13 @@
event = new PlaceChangeRequestedEvent<MyPlace>(place2);
eventBus.fireEvent(event);
- assertFalse(event.isRejected());
+ assertTrue(event.isRejected());
assertEquals(activity1.view, display.widget);
-
- eventBus.fireEvent(new PlaceChangeEvent<Place>(place2));
- assertEquals(activity2.view, display.widget);
}
- public void testRejected() {
+ public void testSimpleDispatch() {
manager.setDisplay(display);
- activity1.willStop = false;
-
PlaceChangeRequestedEvent<MyPlace> event = new
PlaceChangeRequestedEvent<MyPlace>(place1);
eventBus.fireEvent(event);
assertFalse(event.isRejected());
@@ -149,7 +145,10 @@
event = new PlaceChangeRequestedEvent<MyPlace>(place2);
eventBus.fireEvent(event);
- assertTrue(event.isRejected());
+ assertFalse(event.isRejected());
assertEquals(activity1.view, display.widget);
+
+ eventBus.fireEvent(new PlaceChangeEvent<Place>(place2));
+ assertEquals(activity2.view, display.widget);
}
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
