[gwt-contrib] [google-web-toolkit] r7948 committed - - Removed redundant modifiers from EmployeeRecord and ReportRecord....

Mon, 19 Apr 2010 18:43:13 -0700 

Revision: 7948
Author: [email protected]
Date: Mon Apr 19 14:08:52 2010
Log: - Removed redundant modifiers from EmployeeRecord and ReportRecord.
- Added assertions to RecordKey constructors.
- Fixed sync operation on the server side.

Patch by: amitmanjhi
Review by: rjrjr (desk review)

http://code.google.com/p/google-web-toolkit/source/detail?r=7948

Modified:
/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/server/ExpensesDataServlet.java /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Employee.java /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Report.java 
 /trunk/bikeshed/src/com/google/gwt/valuestore/client/RecordKey.java

=======================================
--- /trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/EmployeeRecord.java Fri Apr 16 12:47:47 2010 +++ /trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/EmployeeRecord.java Mon Apr 19 14:08:52 2010 
@@ -25,11 +25,10 @@
* IRL this class will be generated by a JPA-savvy tool run before compilation. 
  */
 public interface EmployeeRecord extends Record {
-  public static final Property<String> userName = new Property<String>(
-      "userName", String.class);
-  public static final Property<String> displayName = new Property<String>(
-      "displayName", String.class);
- public static final Property<EmployeeRecord> supervisor = new Property<EmployeeRecord>( + Property<String> userName = new Property<String>("userName", String.class); 
+  Property<String> displayName = new Property<String>("displayName",
+      String.class);
+  Property<EmployeeRecord> supervisor = new Property<EmployeeRecord>(
       "supervisor", EmployeeRecord.class);

   String getDisplayName();
=======================================
--- /trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/ReportRecord.java Fri Apr 16 12:47:47 2010 +++ /trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/request/ReportRecord.java Mon Apr 19 14:08:52 2010 
@@ -28,12 +28,10 @@
  */
 public interface ReportRecord extends Record {
- public static final Property<Date> created = new Property<Date>("created", 
-      Date.class);
-  public static final Property<String> purpose = new Property<String>(
-      "purpose", String.class);
- public static final Property<EmployeeRecord> reporter = new Property<EmployeeRecord>( 
-      "reporter", EmployeeRecord.class);
+  Property<Date> created = new Property<Date>("created", Date.class);
+  Property<String> purpose = new Property<String>("purpose", String.class);
+ Property<EmployeeRecord> reporter = new Property<EmployeeRecord>("reporter", 
+      EmployeeRecord.class);

   Date getCreated();

=======================================
--- /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java Fri Apr 16 14:50:53 2010 +++ /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java Mon Apr 19 14:08:52 2010 
@@ -96,7 +96,7 @@
       int length = reportArray.length();
       if (length > 0) {
         JSONObject report = reportArray.getJSONObject(0);
-        Report r = Report.findReport(report.getLong(Record.id.getName()));
+ Report r = Report.findReport(report.getString(Record.id.getName())); 
         r.setPurpose(report.getString(ReportRecord.purpose.getName()));
         r.persist();
         report.put(Record.version.getName(), r.getVersion());
=======================================
--- /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Employee.java Thu Apr 15 13:39:36 2010 +++ /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Employee.java Mon Apr 19 14:08:52 2010 
@@ -60,7 +60,7 @@
     }
   }

-  public static Employee findEmployee(Long id) {
+  public static Employee findEmployee(String id) {
     if (id == null) {
       return null;
     }
=======================================
--- /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Report.java Thu Apr 15 13:39:36 2010 +++ /trunk/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Report.java Mon Apr 19 14:08:52 2010 
@@ -62,7 +62,7 @@
     }
   }

-  public static Report findReport(Long id) {
+  public static Report findReport(String id) {
     if (id == null) {
       return null;
     }
=======================================
--- /trunk/bikeshed/src/com/google/gwt/valuestore/client/RecordKey.java Fri Apr 16 12:47:47 2010 +++ /trunk/bikeshed/src/com/google/gwt/valuestore/client/RecordKey.java Mon Apr 19 14:08:52 2010 
@@ -19,18 +19,28 @@
 import com.google.gwt.valuestore.shared.impl.RecordJsoImpl;
 import com.google.gwt.valuestore.shared.impl.RecordSchema;

+/**
+ * The key used to store {...@link com.google.gwt.valuestore.shared.Record Record}s 
+ * in {...@link com.google.gwt.valuestore.shared.ValueStore ValueStore}.
+ */
 class RecordKey {
   final RecordSchema<?> schema;
   final Object id;

   RecordKey(RecordImpl record) {
-    this.schema = record.getSchema();
-    this.id = record.getId();
+    this(record.getId(), record.getSchema());
   }

   RecordKey(RecordJsoImpl record) {
-    this.schema = record.getSchema();
-    this.id = record.getId();
+    this(record.getId(), record.getSchema());
+  }
+
+  private RecordKey(Object id, RecordSchema<?> schema) {
+    assert id != null;
+    assert schema != null;
+
+    this.id = id;
+    this.schema = schema;
   }

   @Override

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

Reply via email to