svn commit: r516171 - in /myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook: Address.java InMemoryAddressDao.java Picture.java web/SelectItemComparator.java

[bo...@apache.org]

Author: bommel
Date: Thu Mar  8 12:48:30 2007
New Revision: 516171

URL: http://svn.apache.org/viewvc?view=rev&rev=516171
Log:
some cleanups

Modified:
    myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
    myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java
    myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java
    myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java

Modified: myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java?view=diff&rev=516171&r1=516170&r2=516171
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java Thu Mar  8 12:48:30 2007
@@ -35,10 +35,11 @@
 import javax.persistence.Version;
 import java.util.Date;
 import java.util.Locale;
+import java.io.Serializable;
 
 @Entity
-public class Address {
-
+public class Address implements Serializable {
+  private static final long serialVersionUID = 1833416321633117657L;
   private static final Log LOG = LogFactory.getLog(Address.class);
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -74,6 +75,7 @@
   private String jobHomePage;
   @OneToOne(cascade = {CascadeType.ALL})
   private Picture picture;
+
 
   public Address() {
     LOG.debug("Creating new Address");

Modified: myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java?view=diff&rev=516171&r1=516170&r2=516171
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java Thu Mar  8 12:48:30 2007
@@ -63,7 +63,7 @@
   public synchronized void removeAddress(Address address) {
     Iterator<Address> it = addresses.iterator();
     while (it.hasNext()) {
-      if (it.next().getId() == address.getId()) {
+      if (it.next().getId().equals(address.getId())) {
         it.remove();
       }
     }
@@ -71,7 +71,7 @@
 
   public Address getAddress(Integer id) {
     for (Address address : addresses) {
-      if (address.getId() == id) {
+      if (address.getId().equals(id)) {
         return address;
       }
     }

Modified: myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java?view=diff&rev=516171&r1=516170&r2=516171
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java Thu Mar  8 12:48:30 2007
@@ -24,6 +24,7 @@
 import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import java.io.Serializable;
 
 /*
  * Created by IntelliJ IDEA.
@@ -32,7 +33,8 @@
  * Time: 7:45:33 PM
  */
 @Entity
-public class Picture {
+public class Picture implements Serializable {
+  private static final long serialVersionUID = -7637551581782102682L;
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Integer id;
@@ -40,6 +42,7 @@
   @Lob
   @Basic(fetch = FetchType.EAGER)
   private byte [] content;
+
 
   public Picture() {
   }

Modified: myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java?view=diff&rev=516171&r1=516170&r2=516171
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java Thu Mar  8 12:48:30 2007
@@ -19,8 +19,10 @@
 
 import javax.faces.model.SelectItem;
 import java.util.Comparator;
+import java.io.Serializable;
 
-public class SelectItemComparator implements Comparator<SelectItem> {
+public class SelectItemComparator implements Comparator<SelectItem>, Serializable {
+  private static final long serialVersionUID = -1581955960510873296L;
 
   public int compare(SelectItem s1, SelectItem s2) {
     return s1.getLabel().compareTo(s2.getLabel());