Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java @ 7252:c894b7b45c4c
Replaced some tabs by spaces. Guys, please configure your editors not to insert tabs!
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Sat, 05 Oct 2013 12:48:44 +0200 |
| parents | 4c3ccf2b0304 |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java Sat Oct 05 12:19:54 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java Sat Oct 05 12:48:44 2013 +0200 @@ -588,11 +588,11 @@ public boolean equals(Object other) { if ( (this == other ) ) return true; - if ( (other == null ) ) return false; - if ( !(other instanceof SsiebungsiebId) ) return false; - SsiebungsiebId castOther = ( SsiebungsiebId ) other; + if ( (other == null ) ) return false; + if ( !(other instanceof SsiebungsiebId) ) return false; + SsiebungsiebId castOther = ( SsiebungsiebId ) other; - return (this.getSiebanalyseid()==castOther.getSiebanalyseid()) + return (this.getSiebanalyseid()==castOther.getSiebanalyseid()) && (this.getGsiebsatzid()==castOther.getGsiebsatzid()) && ( (this.getGmasse()==castOther.getGmasse()) || ( this.getGmasse()!=null && castOther.getGmasse()!=null && this.getGmasse().equals(castOther.getGmasse()) ) ) && ( (this.getMasche01()==castOther.getMasche01()) || ( this.getMasche01()!=null && castOther.getMasche01()!=null && this.getMasche01().equals(castOther.getMasche01()) ) )