Revision: 9624
Author: [email protected]
Date: Wed Jan 26 07:25:18 2011
Log: Cherry picking r9623 into releases/2.2, Bump pom.xml version, and fix
NPE in samples/expenses
http://code.google.com/p/google-web-toolkit/source/detail?r=9624
Modified:
/releases/2.2/samples/expenses/pom.xml
/releases/2.2/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
=======================================
--- /releases/2.2/samples/expenses/pom.xml Tue Dec 14 16:34:23 2010
+++ /releases/2.2/samples/expenses/pom.xml Wed Jan 26 07:25:18 2011
@@ -7,7 +7,7 @@
<version>0.1.0.BUILD-SNAPSHOT</version>
<name>expenses</name>
<properties>
- <gwt.version>2.1.1</gwt.version>
+ <gwt.version>2.2-rc1</gwt.version>
<roo.version>1.1.0.RELEASE</roo.version>
<spring.version>3.0.3.RELEASE</spring.version>
<slf4j.version>1.6.1</slf4j.version>
=======================================
---
/releases/2.2/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
Wed Dec 1 05:40:20 2010
+++
/releases/2.2/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
Wed Jan 26 07:25:18 2011
@@ -287,6 +287,7 @@
lastDepartment = "";
} else if (selected instanceof EmployeeProxy) {
lastEmployee = (EmployeeProxy) selected;
+ lastDepartment = lastEmployee.getDepartment();
} else if (selected instanceof String) {
lastEmployee = null;
if (model.isAllDepartment(selected)) {
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
