Revision: 8096
Author: r...@google.com
Date: Tue May 11 11:18:39 2010
Log: Fix and checkstyle problems and suggestion from previous TBR review
http://code.google.com/p/google-web-toolkit/source/detail?r=8096
Modified:
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/LoadExpensesDB.java
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Expense.java
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/LoadExpensesDB.java
Tue May 11 10:56:00 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/gwt/client/LoadExpensesDB.java
Tue May 11 11:18:39 2010
@@ -60,6 +60,8 @@
root.add(generateButton);
root.add(amountTextBox);
root.add(generateLabel);
+
+ // This button deletes the entire data store -- don't expose it by
default
// root.add(deleteButton);
dataService.getNumReports(new AsyncCallback<Integer>() {
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Expense.java
Tue May 11 10:56:00 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/domain/Expense.java
Tue May 11 11:18:39 2010
@@ -34,10 +34,6 @@
@Entity
public class Expense {
- public static final EntityManager entityManager() {
- return EMF.get().createEntityManager();
- }
-
public static long countExpenses() {
EntityManager em = entityManager();
try {
@@ -46,6 +42,10 @@
em.close();
}
}
+
+ public static final EntityManager entityManager() {
+ return EMF.get().createEntityManager();
+ }
@SuppressWarnings("unchecked")
public static List<Expense> findAllExpenses() {
@@ -90,31 +90,31 @@
public static List<Expense> findListOfOneExpense(Long id) {
return Collections.singletonList(findExpense(id));
}
-
- @Id
- @Column(name = "id")
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
-
- @Version
- @Column(name = "version")
- private Integer version;
private Double amount;
private String approval;
-
+
private String category;
-
+
private Date created;
private String description;
+ @Id
+ @Column(name = "id")
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
private String reasonDenied;
-
+
// @JoinColumn
private Long reportId;
+ @Version
+ @Column(name = "version")
+ private Integer version;
+
public Double getAmount() {
return this.amount;
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
