Author: dlanglais Date: 2010-02-17 12:30:37 +0100 (Wed, 17 Feb 2010) New Revision: 86 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java Log: Am?\195?\169lioration qualit?\195?\169 : "Only One Return" Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-17 02:10:47 UTC (rev 85) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-17 11:30:37 UTC (rev 86) @@ -71,11 +71,11 @@ * {@inheritDoc} */ public int hashCode() { + int hash = 0; if (! this.cell.isEmpty()) { - return this.get().hashCode(); - } else { - return 0; + hash = this.get().hashCode(); } + return hash; } /** @@ -84,30 +84,27 @@ * //TODO verify all the "versions" of the cell. */ public boolean equals(Object o) { + boolean equals = false; if (o instanceof CellImpl) { CellImpl another = (CellImpl) o; if(this.cell.size() == another.cell.size()) { if(this.cell.isEmpty()) { - return true; + equals = true; } else { - return this.get().equals(another.get()); + equals = this.get().equals(another.get()); } - } else { - return false; } - } else { - return false; } + return equals; } /** * {@inheritDoc} */ public String toString() { - + String ret = ""; if (! this.cell.isEmpty()) { - return ((T) this.get()).toString(); - } else { - return ""; + ret = ((T) this.get()).toString(); } + return ret; } } Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-17 02:10:47 UTC (rev 85) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-17 11:30:37 UTC (rev 86) @@ -76,15 +76,15 @@ * {@inheritDoc} */ public boolean equals(Object o) { + boolean equals = false; if (o instanceof Column) { ColumnImpl other = (ColumnImpl) o; - return other.column.equals(this.column); + equals = other.column.equals(this.column); - } else { - return false; } + return equals; } /** Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-17 02:10:47 UTC (rev 85) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-17 11:30:37 UTC (rev 86) @@ -60,29 +60,27 @@ * {@inheritDoc} */ public final int hashCode() { - if (structure.isEmpty()) { - return 0; - } else { - int hash = 0; + int hash = 0; + if ( ! structure.isEmpty()) { for (String key : structure.keySet() ) { hash += key.hashCode(); hash += structure.get(key).hashCode(); } - return hash; } + return hash; } /** * {@inheritDoc} */ public final boolean equals(Object o) { + boolean equals = false; if (o instanceof StructureImpl) { + StructureImpl another = (StructureImpl) o; - return this.structure.equals(another.structure); - - } else { - return false; + equals = this.structure.equals(another.structure); } + return equals; } }