litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Generify: User implements Comparable<User>

Browse source
This commit is contained in:
jeb228 2010-10-27 17:01:00 +00:00
parent 2057087789
commit 2181d4178b
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/User.java
View file

@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.beans;
import java.text.Collator; import java.text.Collator;
import java.util.Date; import java.util.Date;
public class User implements Comparable { public class User implements Comparable<User> {
public final static int MIN_PASSWORD_LENGTH = 6; public final static int MIN_PASSWORD_LENGTH = 6;
public final static int MAX_PASSWORD_LENGTH = 12; public final static int MAX_PASSWORD_LENGTH = 12;
@ -107,9 +107,8 @@ public class User implements Comparable {
this.firstName = firstName; this.firstName = firstName;
} }
public int compareTo(Object o) { public int compareTo(User other) {
Collator collator = Collator.getInstance(); Collator collator = Collator.getInstance();
User other = ((User)o);
if( this.getUsername() == null && other.getUsername() == null ) if( this.getUsername() == null && other.getUsername() == null )
return 0; return 0;
else if( this.getUsername() == null ) else if( this.getUsername() == null )
@ -117,7 +116,7 @@ public class User implements Comparable {
else if( other.getUsername() == null) else if( other.getUsername() == null)
return 1; return 1;
else else
return collator.compare(this.getUsername(),((User)o).getUsername()); return collator.compare(this.getUsername(),other.getUsername());
} }
} }