Author: tchemit Date: 2008-02-08 15:35:03 +0000 (Fri, 08 Feb 2008) New Revision: 754 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: logger Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:15:27 UTC (rev 753) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:35:03 UTC (rev 754) @@ -35,6 +35,9 @@ import java.util.SortedMap; import java.util.TreeMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Classe permettant de créer une base fictive * @@ -44,6 +47,8 @@ static final int SIZE = 10; + static protected Log log = LogFactory.getLog(MockDatabase.class); + /** * le dictionnaire d'ea indexées par leur uuid. * Le premier ea est le parent (donc la version la plus petite) @@ -117,9 +122,9 @@ } registerEA(uuid, listSons.toArray(new ExplorationApplication[listSons.size()])); } - System.out.println("nb ExplorationApplications : "+eas.size()); - System.out.println("nb LoggableElements : "+loggableElements.size()); - System.out.println("nb MetaDatas : "+metadatas.size()); + log.info("nb ExplorationApplications : "+eas.size()); + log.info("nb LoggableElements : "+loggableElements.size()); + log.info("nb MetaDatas : "+metadatas.size()); } protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-08 15:15:27 UTC (rev 753) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-08 15:35:03 UTC (rev 754) @@ -161,7 +161,7 @@ ElementGenerator.RandomStream stream = base.generateTextStream(); String md5 = stream.getMd5(); attachment.setDataHash(md5); - System.out.println("setMd5 "+ md5+" for "+element); + MockDatabase.log.info("setMd5 "+ md5+" for "+element); return stream.getStream(); } catch (Exception e) { throw new SimExplorerServiceException(e); @@ -202,7 +202,7 @@ int start, int count, int dateOrder) throws SimExplorerServiceException { int last = start + count; - System.out.println("ask data from " + start + " width:" + count); + MockDatabase.log.info("ask data from " + start + " width:" + count); SortedMap<String, MetaData[]> map = base.metadatas; if (last > map.size()) { last = map.size(); @@ -248,11 +248,9 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#loginUser(java.lang.String, java.lang.String) */ - public String loginUser(String login, String password) - throws SimExplorerServiceException { + public String loginUser(String login, String password) throws SimExplorerServiceException { if (login == null) { - throw new SimExplorerServiceException(new NullPointerException( - "login can not be null")); + throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } return "password"; }