Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java @ 4392:0dace49f89a0
Merged
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 05 Nov 2012 09:18:59 +0100 |
parents | 3937c6a85db4 |
children |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java Fri Nov 02 15:13:49 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java Mon Nov 05 09:18:59 2012 +0100 @@ -1,7 +1,5 @@ package de.intevation.flys.artifacts.model; -import java.util.Date; - import org.apache.commons.lang.builder.HashCodeBuilder; @@ -12,29 +10,35 @@ private String river; private double startKm; private double endKm; - private Date date; + private int sYear; + private int eYear; public StaticSedimentLoadCacheKey( String river, double startKm, double endKm, - Date date + int sYear, + int eYear ) { this.river = river; this.startKm = startKm; this.endKm = endKm; - this.date = date; + this.sYear = sYear; + this.eYear = eYear; } + @Override public int hashCode() { HashCodeBuilder builder = new HashCodeBuilder(); builder.append(river); builder.append(startKm); builder.append(endKm); - builder.append(date); + builder.append(sYear); + builder.append(eYear); return builder.toHashCode(); } + @Override public boolean equals(Object other) { if (!(other instanceof StaticBedHeightCacheKey)) { return false; @@ -43,6 +47,7 @@ return this.river == o.river && this.startKm == o.startKm && this.endKm == o.endKm && - this.date == o.date; + this.sYear == o.sYear && + this.eYear == o.eYear; } }