Reviewers: amitmanjhi,

Description:
AbstractEditView now requests all the paths it needs

Review by: [email protected]

Please review this at http://gwt-code-reviews.appspot.com/786802/show

Affected files:
M bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditActivity.java M bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java
  M user/src/com/google/gwt/app/place/AbstractRecordEditActivity.java


Index: bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditActivity.java
===================================================================
--- bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditActivity.java (revision 8629) +++ bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditActivity.java (working copy)
@@ -20,6 +20,7 @@
 import com.google.gwt.app.place.RecordEditView;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.requestfactory.shared.Receiver;
+import com.google.gwt.requestfactory.shared.RecordRequest;
 import com.google.gwt.requestfactory.shared.RequestObject;
 import com.google.gwt.sample.expenses.gwt.request.EmployeeRecord;
 import com.google.gwt.sample.expenses.gwt.request.ExpensesRequestFactory;
@@ -89,9 +90,8 @@
   }

   @Override
-  protected void fireFindRequest(Value<Long> id,
-      Receiver<EmployeeRecord> callback) {
-    requests.employeeRequest().findEmployee(id).fire(callback);
+  protected RecordRequest<EmployeeRecord> getFindRequest(Value<Long> id) {
+    return requests.employeeRequest().findEmployee(id);
   }

   protected RequestObject<Void> getPersistRequest(EmployeeRecord record) {
Index: bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java
===================================================================
--- bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java (revision 8629) +++ bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java (working copy)
@@ -20,6 +20,7 @@
 import com.google.gwt.app.place.RecordEditView;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.requestfactory.shared.Receiver;
+import com.google.gwt.requestfactory.shared.RecordRequest;
 import com.google.gwt.requestfactory.shared.RequestObject;
 import com.google.gwt.sample.expenses.gwt.request.EmployeeRecord;
 import com.google.gwt.sample.expenses.gwt.request.ExpensesRequestFactory;
@@ -89,8 +90,8 @@
   }

   @Override
- protected void fireFindRequest(Value<Long> id, Receiver<ReportRecord> callback) {
-    requests.reportRequest().findReport(id).fire(callback);
+  protected RecordRequest<ReportRecord> getFindRequest(Value<Long> id) {
+    return requests.reportRequest().findReport(id);
   }

   protected RequestObject<Void> getPersistRequest(ReportRecord record) {
Index: user/src/com/google/gwt/app/place/AbstractRecordEditActivity.java
===================================================================
--- user/src/com/google/gwt/app/place/AbstractRecordEditActivity.java (revision 8629) +++ user/src/com/google/gwt/app/place/AbstractRecordEditActivity.java (working copy)
@@ -18,6 +18,7 @@
 import com.google.gwt.app.place.ProxyPlace.Operation;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.requestfactory.shared.Receiver;
+import com.google.gwt.requestfactory.shared.RecordRequest;
 import com.google.gwt.requestfactory.shared.RequestFactory;
 import com.google.gwt.requestfactory.shared.RequestObject;
 import com.google.gwt.user.client.Window;
@@ -146,7 +147,6 @@
     toCommit.fire(receiver);
   }

-  @SuppressWarnings("unchecked")
   public void start(Display display, EventBus eventBus) {
     this.display = display;

@@ -154,11 +154,12 @@
     view.setCreating(creating);

     if (creating) {
-      R tempRecord = (R) requests.create(proxyType);
+      R tempRecord = requests.create(proxyType);
       futureId = tempRecord.getId();
       doStart(display, tempRecord);
     } else {
-      fireFindRequest(Value.of(getRecord().getId()), new Receiver<R>() {
+ RecordRequest<R> findRequest = getFindRequest(Value.of(getRecord().getId()));
+      findRequest.with(getView().getPaths()).fire(new Receiver<R>() {
         public void onSuccess(R record, Set<SyncResult> syncResults) {
           if (AbstractRecordEditActivity.this.display != null) {
             doStart(AbstractRecordEditActivity.this.display, record);
@@ -189,7 +190,7 @@
   /**
    * Called to fetch the details of the edited record.
    */
- protected abstract void fireFindRequest(Value<Long> id, Receiver<R> callback);
+  protected abstract RecordRequest<R> getFindRequest(Value<Long> id);

   protected abstract RequestObject<Void> getPersistRequest(R record);



--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to