Revision: 8499
Author: [email protected]
Date: Fri Aug 6 11:47:57 2010
Log: Remaining changes to bikeshed/scaffold app as a result of using Long
ids instead of String ids.
Patch by: amitmanjhi
Review by: cromwellian (tbr)
http://code.google.com/p/google-web-toolkit/source/detail?r=8499
Modified:
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/MobileReportEntry.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/EmployeeRecord.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/ReportRecord.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeListView.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java
/trunk/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequest.java
/trunk/user/src/com/google/gwt/requestfactory/shared/RequestObject.java
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/MobileReportEntry.java
Thu Aug 5 15:15:34 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/MobileReportEntry.java
Fri Aug 6 11:47:57 2010
@@ -87,7 +87,7 @@
report = (ReportRecord) requestFactory.create(ReportRecord.class);
requestObject = requestFactory.reportRequest().persist(report);
DeltaValueStore deltas = requestObject.getDeltaValueStore();
- deltas.set(ReportRecord.reporterKey, report, reporterId.toString());
+ deltas.set(ReportRecord.reporterKey, report, reporterId);
displayReport();
}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/EmployeeRecord.java
Wed Jun 23 14:38:51 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/EmployeeRecord.java
Fri Aug 6 11:47:57 2010
@@ -32,8 +32,8 @@
Property<String> displayName = new
Property<String>("displayName", "Display Name",
String.class);
Property<String> password = new Property<String>("password", "Password",
String.class);
- Property<String> supervisorKey = new
Property<String>("supervisorKey", "Supervisor Key",
- String.class);
+ Property<Long> supervisorKey = new
Property<Long>("supervisorKey", "Supervisor Key",
+ Long.class);
Property<String> department = new
Property<String>("department", "Department", String.class);
@@ -43,7 +43,7 @@
String getPassword();
- String getSupervisorKey();
+ Long getSupervisorKey();
String getUserName();
}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/ReportRecord.java
Wed Jun 23 14:38:51 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/ReportRecord.java
Fri Aug 6 11:47:57 2010
@@ -30,16 +30,16 @@
@DataTransferObject(com.google.gwt.sample.expenses.server.domain.Report.class)
public interface ReportRecord extends Record {
- Property<String> approvedSupervisorKey = new
Property<String>("approvedSupervisorKey", "Approved Supervisor Key",
- String.class);
+ Property<Long> approvedSupervisorKey = new
Property<Long>("approvedSupervisorKey", "Approved Supervisor Key",
+ Long.class);
Property<Date> created = new Property<Date>("created", "Created",
Date.class);
Property<String> department = new
Property<String>("department", "Department", String.class);
Property<String> notes = new Property<String>("notes", "Notes",
String.class);
Property<String> purpose = new Property<String>("purpose", "Purpose",
String.class);
- Property<String> reporterKey = new
Property<String>("reporterKey", "Reporter Key",
- String.class);
-
- String getApprovedSupervisorKey();
+ Property<Long> reporterKey = new Property<Long>("reporterKey", "Reporter
Key",
+ Long.class);
+
+ Long getApprovedSupervisorKey();
Date getCreated();
@@ -49,5 +49,5 @@
String getPurpose();
- String getReporterKey();
-}
+ Long getReporterKey();
+}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java
Fri Jul 30 17:29:09 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java
Fri Aug 6 11:47:57 2010
@@ -95,7 +95,7 @@
displayName.setInnerText(record.getDisplayName());
userName.setInnerText(record.getUserName());
password.setInnerText(record.getPassword());
- supervisorKey.setInnerText(record.getSupervisorKey());
+ supervisorKey.setInnerText(String.valueOf(record.getSupervisorKey()));
idSpan.setInnerText(record.getId().toString());
versionSpan.setInnerText(record.getVersion().toString());
}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeListView.java
Fri Jun 18 20:16:34 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeListView.java
Fri Aug 6 11:47:57 2010
@@ -15,6 +15,7 @@
*/
package com.google.gwt.sample.expenses.gwt.ui.employee;
+import com.google.gwt.app.client.LongRenderer;
import com.google.gwt.app.place.AbstractRecordListView;
import com.google.gwt.app.place.PropertyColumn;
import com.google.gwt.core.client.GWT;
@@ -52,8 +53,8 @@
columns.add(PropertyColumn.<EmployeeRecord>
getStringPropertyColumn(EmployeeRecord.userName));
columns.add(PropertyColumn.<EmployeeRecord>
getStringPropertyColumn(EmployeeRecord.displayName));
columns.add(PropertyColumn.<EmployeeRecord>
getStringPropertyColumn(EmployeeRecord.password));
- columns.add(PropertyColumn.<EmployeeRecord>
getStringPropertyColumn(EmployeeRecord.supervisorKey));
-
+ columns.add(new PropertyColumn<EmployeeRecord, java.lang.Long>(
+ EmployeeRecord.supervisorKey, LongRenderer.instance()));
return columns;
}
}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java
Fri Jul 30 17:29:09 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java
Fri Aug 6 11:47:57 2010
@@ -99,7 +99,7 @@
created.setInnerText(DateTimeFormat.getShortDateFormat().format(record.getCreated()));
idSpan.setInnerText(record.getId().toString());
versionSpan.setInnerText(record.getVersion().toString());
- reporterKey.setInnerText(record.getReporterKey());
- approvedSupervisorKey.setInnerText(record.getApprovedSupervisorKey());
+ reporterKey.setInnerText(String.valueOf(record.getReporterKey()));
+
approvedSupervisorKey.setInnerText(String.valueOf(record.getApprovedSupervisorKey()));
}
}
=======================================
---
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java
Fri Jun 18 20:16:34 2010
+++
/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java
Fri Aug 6 11:47:57 2010
@@ -15,6 +15,7 @@
*/
package com.google.gwt.sample.expenses.gwt.ui.report;
+import com.google.gwt.app.client.LongRenderer;
import com.google.gwt.app.place.AbstractRecordListView;
import com.google.gwt.app.place.PropertyColumn;
import com.google.gwt.core.client.GWT;
@@ -57,9 +58,10 @@
columns.add(new PropertyColumn<ReportRecord,
Date>(ReportRecord.created,
new DateTimeFormatRenderer(DateTimeFormat.getShortDateFormat())));
columns.add(PropertyColumn.<ReportRecord>
getStringPropertyColumn(ReportRecord.purpose));
- columns.add(PropertyColumn.<ReportRecord>
getStringPropertyColumn(ReportRecord.reporterKey));
- columns.add(PropertyColumn.<ReportRecord>
getStringPropertyColumn(ReportRecord.approvedSupervisorKey));
-
+ columns.add(new PropertyColumn<ReportRecord, java.lang.Long>(
+ ReportRecord.reporterKey, LongRenderer.instance()));
+ columns.add(new PropertyColumn<ReportRecord, java.lang.Long>(
+ ReportRecord.approvedSupervisorKey, LongRenderer.instance()));
return columns;
}
}
=======================================
---
/trunk/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequest.java
Thu Aug 5 10:04:19 2010
+++
/trunk/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequest.java
Fri Aug 6 11:47:57 2010
@@ -19,7 +19,6 @@
import com.google.gwt.requestfactory.shared.Receiver;
import com.google.gwt.requestfactory.shared.RequestObject;
import com.google.gwt.valuestore.shared.Property;
-import com.google.gwt.valuestore.shared.Record;
import java.util.Collection;
import java.util.Collections;
@@ -85,10 +84,6 @@
ValueStoreJsonImpl valueStore = requestFactory.getValueStore();
deltaValueStore = new DeltaValueStoreJsonImpl(valueStore,
requestFactory);
}
-
- public <V> void set(Property<V> property, Record record, V value) {
- deltaValueStore.set(property, record, value);
- }
/**
* Subclasses must override to return {...@code this}, to allow
builder-style
=======================================
--- /trunk/user/src/com/google/gwt/requestfactory/shared/RequestObject.java
Thu Aug 5 15:15:34 2010
+++ /trunk/user/src/com/google/gwt/requestfactory/shared/RequestObject.java
Fri Aug 6 11:47:57 2010
@@ -15,9 +15,6 @@
*/
package com.google.gwt.requestfactory.shared;
-import com.google.gwt.valuestore.shared.Property;
-import com.google.gwt.valuestore.shared.Record;
-
/**
* <p>
* <span style="color:red">Experimental API: This class is still under
rapid
@@ -40,5 +37,4 @@
void handleResponseText(String responseText);
- <V> void set(Property<V> property, Record record, V value);
-}
+}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
