Author: bpoussin Date: 2010-10-21 00:26:21 +0200 (Thu, 21 Oct 2010) New Revision: 439 Url: http://nuiton.org/repositories/revision/wikitty/439 Log: modification pour preparer le remplacement de UpdateResponse par WikittyServiceEvent http://www.nuiton.org/issues/show/944 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-20 22:26:21 UTC (rev 439) @@ -58,15 +58,16 @@ public void addDeletionDateUpdate(String id, Date date) { idDeletionDateMap.put(id, date); } +// @Deprecated +// public void update(BusinessEntity e) { +// update((BusinessEntityWikitty) e); +// } - public void update(BusinessEntity e) { - update((BusinessEntityWikitty) e); - } +// @Deprecated +// public void update(BusinessEntityWikitty e) { +// update(e.getWikitty()); +// } - public void update(BusinessEntityWikitty e) { - update(e.getWikitty()); - } - /** * Update data directly in object passed in argument. * Actualy only version and deletion date are updated. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-20 22:26:21 UTC (rev 439) @@ -123,7 +123,7 @@ public <E extends BusinessEntity> E store(E e) { Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); UpdateResponse resp = wikittyService.store(securityToken, w); - resp.update(e); + resp.update(w); return e; } @@ -146,8 +146,8 @@ UpdateResponse resp = wikittyService.store(securityToken, wikitties); // update object - for (E e : objets) { - resp.update(e); + for (Wikitty w : wikitties) { + resp.update(w); } return objets; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-20 22:26:21 UTC (rev 439) @@ -69,7 +69,7 @@ } - /** Remote event (received from jgroup). */ + /** Remote event (received from server). */ protected boolean remote; /** event type */ @@ -91,6 +91,7 @@ /** * Map between extensions set for each id. + * Not used for extension event */ protected Map<String, Set<String>> idExtensions; @@ -100,6 +101,11 @@ protected Map<String, String> idVersions; /** + * Map between deletion date for each id, if event is REMOVE. + */ + protected Map<String, String> idDeletionDate; + + /** * Constructor with source {@link WikittyService}. * * @param source wikitty service @@ -212,7 +218,7 @@ String toString = getClass().getName() + "[source=" + source + ", type=" + type + ", remote=" + remote + ", ids=" + ids + ", idExtensions=" + idExtensions + - ", idVersions=" + idVersions + "]"; + ", idVersions=" + idVersions + ", idDeletionDate=" + idVersions + "]"; return toString; }