Author: dlanglais Date: 2010-02-07 18:58:57 +0100 (Sun, 07 Feb 2010) New Revision: 61 Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java Log: Am?\195?\169lioration qualit?\195?\169 de code. Utilisation de Log au lieu de system.out.println() ou e.printStackTrace(). Suppression de tabulation. Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-07 17:58:57 UTC (rev 61) @@ -5,6 +5,8 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ServiceLoader; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.BigTable; @@ -15,6 +17,11 @@ public class BigTableLoader extends URLClassLoader { /** + * Logger. + */ + private static final Log log = LogFactory.getLog(BigTableLoader.class); + + /** * The BigTable Set Loader. */ private ServiceLoader<BigTable> bigTableSetLoader; @@ -36,7 +43,7 @@ try { this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { - e.printStackTrace(); + log.error(e); } } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 17:58:57 UTC (rev 61) @@ -1,9 +1,13 @@ package org.nuiton.mapstoragemanager.core; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.BigTable; public class MainTestCore { + private static final Log log = LogFactory.getLog(MainTestCore.class); + /** * test for plugins loading and basic functions. * @param args args @@ -12,16 +16,16 @@ Core core = new Core(); - System.out.println("Plugins disponibles"); + log.info("Plugins disponibles"); for (String base : core.listPlugins()) { - System.out.println("* " + base); + log.info("* " + base); } /* Test du plugins */ for (BigTable bigTable : core.getAvailableBases()) { bigTable.put("clé", "valeur"); - System.out.println(bigTable.get("clé")); + log.info(bigTable.get("clé")); } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-07 17:58:57 UTC (rev 61) @@ -11,7 +11,8 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import java.util.logging.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * This class loads the plugins. @@ -21,9 +22,9 @@ public class PluginLoader extends URLClassLoader { /** - * A logger. + * Logger. */ - private Logger logger = Logger.getLogger(this.getClass().getName()); + private static final Log log = LogFactory.getLog(PluginLoader.class); /** * The plugin classes. @@ -53,6 +54,7 @@ this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { e.printStackTrace(); + log.error(e); } } } @@ -67,7 +69,7 @@ for (File file : libs.listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { try { - logger.info("== LIB " + file.getAbsolutePath() + "..."); + log.info("== LIB " + file.getAbsolutePath() + "..."); this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { e.printStackTrace(); @@ -78,7 +80,7 @@ // loads the jars classes for (File file : directory.listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { - logger.info("== JAR " + file.getAbsolutePath() + "..."); + log.info("== JAR " + file.getAbsolutePath() + "..."); loadJarClasses(file.getAbsolutePath()); } } @@ -93,7 +95,7 @@ private void loadJarClasses(final String jarPath) { File file = new File(jarPath); - logger.info("Loading " + jarPath + "..."); + log.info("Loading " + jarPath + "..."); JarFile jar = null; try { @@ -129,7 +131,7 @@ String extension = ".class"; if (fileName.endsWith(extension)) { - logger.info("Loading " + fileName + "..."); + log.info("Loading " + fileName + "..."); // formating file name fileName = fileName.substring(0, fileName.length() @@ -141,7 +143,7 @@ tmpClass = this.loadClass(fileName); //Class.forName(fileName, true, this); } catch (ClassNotFoundException e) { - e.printStackTrace(); + log.error(e); } classes.add(tmpClass); Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 17:58:57 UTC (rev 61) @@ -1,6 +1,8 @@ package org.nuiton.mapstoragemanager.core; import java.net.MalformedURLException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author fdesbois @@ -9,20 +11,25 @@ @Deprecated public class TestServiceLoader { + /** + * Logger. + */ + private static final Log log = LogFactory.getLog(TestServiceLoader.class); + public TestServiceLoader() { try { BigTableLoader p = - new BigTableLoader("plugins", - this.getClass().getClassLoader()); - System.out.println(p.getBigTable()); + new BigTableLoader("plugins", this.getClass().getClassLoader()); + log.info(p.getBigTable()); } catch (MalformedURLException e) { // TODO Auto-generated catch block - e.printStackTrace(); + //e.printStackTrace(); + log.error(e); } } public static void main(final String[] args) { - TestServiceLoader t = new TestServiceLoader(); + new TestServiceLoader(); } } \ No newline at end of file Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 17:58:57 UTC (rev 61) @@ -4,31 +4,28 @@ import java.util.Map; import java.util.Set; -public class OurHashMap implements BigTable{ +public class OurHashMap implements BigTable { - private Map<String,String> map = new HashMap<String, String>(); - - public String get(String key) { - return map.get(key); - } + private Map<String, String> map = new HashMap<String, String>(); - public Set<String> getKeys() { - return map.keySet(); - } + public String get(String key) { + return map.get(key); + } - public void put(String key, String value) { - map.put(key, value); - } + public Set<String> getKeys() { + return map.keySet(); + } - public void connect(String host, String base, String username, - String password) { - // TODO Auto-generated method stub - - } + public void put(String key, String value) { + map.put(key, value); + } - public void selectTable(String table) { - // TODO Auto-generated method stub - - } + public void connect(String host, String base, String username, + String password) { + // TODO Auto-generated method stub + } + public void selectTable(String table) { + // TODO Auto-generated method stub + } } 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-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-07 17:58:57 UTC (rev 61) @@ -47,9 +47,9 @@ * {@inheritDoc} */ public final void put(final String key, final Object content) { - try { + if(this.column.keySet().contains(key)) { this.column.get(key).put((T)content); - } catch (NullPointerException e) { + } else { this.column.put(key, new CellImpl<T>((T)content)); } } Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-07 17:58:57 UTC (rev 61) @@ -17,7 +17,11 @@ */ public final class CellTest extends TestCase { + /** + * Logger. + */ private static final Log log = LogFactory.getLog(CellTest.class); + private Cell<Object> cellActual; private Cell<Object> cell2Actual; private Object objectExcepted; Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-07 17:58:57 UTC (rev 61) @@ -17,7 +17,11 @@ public final class ColumnTest extends TestCase { + /** + * Logger. + */ private static final Log log = LogFactory.getLog(ColumnTest.class); + private Column columnActual; private Column column2Actual; private Object expected; Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-07 17:58:57 UTC (rev 61) @@ -8,7 +8,11 @@ public class RowTest extends TestCase { + /** + * Logger. + */ private static final Log log = LogFactory.getLog(RowTest.class); + private Structure structureExpected; private Map<String, Object> contentExpected; private Row rowActual; Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-07 17:58:57 UTC (rev 61) @@ -14,7 +14,11 @@ public class StructureTest extends TestCase { + /** + * Logger. + */ private static final Log log = LogFactory.getLog(StructureTest.class); + private Structure structureActual; private Map<String, Class<?>> structureContentActual; private Map<String, Class<?>> structureContentExpected; Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-07 12:01:09 UTC (rev 60) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-07 17:58:57 UTC (rev 61) @@ -23,6 +23,9 @@ */ public class TableTest extends TestCase { + /** + * Logger. + */ private static final Log log = LogFactory.getLog(TableTest.class); private Table tableActual;