Author: chatellier Date: 2009-12-10 17:00:49 +0000 (Thu, 10 Dec 2009) New Revision: 2814 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Log: Remove xml-rpc client and server Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-12-10 16:58:27 UTC (rev 2813) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-12-10 17:00:49 UTC (rev 2814) @@ -21,8 +21,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.Hashtable; -import java.util.Map; import java.util.Properties; import org.apache.commons.logging.Log; @@ -48,7 +46,7 @@ private static Log log = LogFactory.getLog(SimulationControl.class); protected PropertyChangeSupport listeners = new PropertyChangeSupport(this); - protected boolean inUpdateFromHashtable = false; + protected boolean inUpdateFromProperties = false; protected transient SimulationStorage simulation = null; protected String id = null; @@ -60,9 +58,6 @@ protected long progress = 0; protected String text = ""; - /** @deprecated only used in isis xml-rpc server. */ - protected Map<String, Object> update = new Hashtable<String, Object>(); - /** * * @param id simulation id @@ -274,22 +269,6 @@ } /** - * Convert current object in hashtable representation, and clear hashtable - * that contains last modified field. - * - * @return object hashtable representation - * @deprecated only used in xml-rpc isis server - */ - public Hashtable<String, Object> getUpdateHashtable() { - Hashtable<String, Object> result = new Hashtable<String, Object>(update); - update.clear(); - - result.put("id", getId()); - - return result; - } - - /** * Met dans un Properties tous les champs * @return un Properties avec tous les champs */ @@ -315,7 +294,7 @@ * @param props new properties to update from */ public void updateFromProperties(Properties props) { - inUpdateFromHashtable = true; + inUpdateFromProperties = true; if (log.isTraceEnabled()) { log.trace("updateFromProperties properties = " + props.toString()); @@ -359,61 +338,15 @@ setText(text); } } finally { - inUpdateFromHashtable = false; + inUpdateFromProperties = false; } } - /** - * update current object from hashtable representation - * - * @deprecated only used in xml-rpc isis server - */ - public void updateFromHashtable(Hashtable<String, Object> h) { - inUpdateFromHashtable = true; - try { - if (h.containsKey("started")) { - boolean started = (Boolean) h.get("started"); - setStarted(started); - } - if (h.containsKey("running")) { - boolean running = (Boolean) h.get("running"); - setRunning(running); - } - if (h.containsKey("stop")) { - boolean stop = (Boolean) h.get("stop"); - setStopSimulationRequest(stop); - } - if (h.containsKey("date")) { - Date date = new Date((Integer) h.get("date")); - setDate(date); - } - if (h.containsKey("progressMax")) { - long progressMax = (Long) h.get("progressMax"); - setProgressMax(progressMax); - } - if (h.containsKey("progress")) { - long progress = (Long) h.get("progress"); - setProgress(progress); - } - if (h.containsKey("text")) { - String text = (String) h.get("text"); - setText(text); - } - } finally { - inUpdateFromHashtable = false; - } - } - /* * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ public void propertyChange(PropertyChangeEvent e) { - String property = e.getPropertyName(); - if (inUpdateFromHashtable) { - update.remove(property); - } else { - Object value = e.getNewValue(); - update.put(property, value); + if (!inUpdateFromProperties) { if (getSimulation() != null) { getSimulation().saveControl(this); }