Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java @ 831:9101b4d64666
Datacage: Re-written ToLoad to feature the new filter models.
flys-client/trunk@2539 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Tue, 23 Aug 2011 16:58:07 +0000 |
parents | 3dde14f0bd98 |
children | 29966a53cfeb |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java Tue Aug 23 16:30:22 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java Tue Aug 23 16:58:07 2011 +0000 @@ -32,12 +32,19 @@ this.num = num; } + protected static boolean equals(String a, String b) { + if (a == null && b == null) return true; + if (a == null && b != null) return false; + if (a != null && b == null) return false; + return a.equals(b); + } + public boolean equals(Object other) { if (!(other instanceof FacetFilter)) { return false; } FacetFilter o = (FacetFilter)other; - return o.name.equals(name) && o.num.equals(num); + return equals(o.name, name) && equals(o.num, num); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :