Author: dlanglais Date: 2010-01-29 02:47:20 +0100 (Fri, 29 Jan 2010) New Revision: 43 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java Log: Correction de la classe CellImpl. En effet, l'utilisation du timestamp de la machine n'est pas forc?\195?\169ment tr?\195?\168s judicieux -> deux objects ins?\195?\169r?\195?\169s "durant la m?\195?\170me milliseconde" ont le m?\195?\170me timestamp, et donc sont ?\195?\169crasement de version... Maintenant, r?\195?\169f?\195?\169renc?\195?\169 par le num?\195?\169ro de version. Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-29 01:06:36 UTC (rev 42) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-29 01:47:20 UTC (rev 43) @@ -41,7 +41,8 @@ * {@inheritDoc} */ public final void put(final T t) { - cell.put(System.currentTimeMillis(), t); + cell.put((long)cell.size(), t); + //cell.put(System.currentTimeMillis(), t); } /** @@ -58,9 +59,9 @@ if (cell.size() == 0) { throw new NoSuchElementException(); } - Long max = cell.keySet().iterator().next(); + Long max = 0L; for (Long current : cell.keySet()) { - if (max > current) { + if (max < current) { max = current; } } Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-29 01:06:36 UTC (rev 42) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-29 01:47:20 UTC (rev 43) @@ -155,17 +155,25 @@ public void testToString() { /** - * We create one cell and werify that toString equals "". + * We create one cell and werify that toString equals "" when the cell + * is empty. */ cellActual = new CellImpl<Object>(); assertEquals(cellActual.toString(), ""); + /** + * We create and put one object Integer(1337) and control that + * toString() equals "1337" + */ objectExcepted = new Integer(1337); - cellActual.put(objectExcepted); assertEquals(cellActual.toString(), objectExcepted.toString()); assertEquals(cellActual.toString(), "1337"); + /** + * We create and put another object String("String for testing") and + * control that toString() equals "String for testing". + */ objectExcepted = new String("String for testing"); cellActual.put(objectExcepted); assertEquals(cellActual.toString(), objectExcepted.toString());