Author: dlanglais Date: 2010-02-08 15:32:24 +0100 (Mon, 08 Feb 2010) New Revision: 64 Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.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/HBase.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm-bighashmap/pom.xml trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.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 Log: Am?\195?\169lioration Usability. Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-08 14:32:24 UTC (rev 64) @@ -16,9 +16,8 @@ * $Author: tchemit $ */ public class Main { - - public static void main(String... args) { - + + public Main(){ I18n.setUniqueBundleName("mapstoragemanager-i18n"); I18n.init(Locale.FRANCE); final MainUI ui = new MainUI(); @@ -32,6 +31,10 @@ } }); } + + public static void main(String... args) { + new Main(); + } } 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-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-08 14:32:24 UTC (rev 64) @@ -19,7 +19,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(BigTableLoader.class); + private static final Log LOG = LogFactory.getLog(BigTableLoader.class); /** * The BigTable Set Loader. @@ -43,7 +43,7 @@ try { this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { - log.error(e); + LOG.error(e.toString(),e); } } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-02-08 14:32:24 UTC (rev 64) @@ -23,7 +23,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(Core.class); + private static final Log LOG = LogFactory.getLog(Core.class); /** * A map "name of the plugin" - "plugin instance". @@ -48,13 +48,13 @@ this.getClass().getClassLoader()); } catch (Exception e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } try { loadAvailableBases(); } catch (IOException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } } @@ -76,10 +76,10 @@ (BigTable) tmpClass.newInstance()); } catch (InstantiationException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } catch (IllegalAccessException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), 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-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-08 14:32:24 UTC (rev 64) @@ -9,7 +9,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(MainTestCore.class); + private static final Log LOG = LogFactory.getLog(MainTestCore.class); /** * test for plugins loading and basic functions. @@ -19,16 +19,16 @@ Core core = new Core(); - log.info("Plugins disponibles"); + LOG.info("Plugins disponibles"); for (String base : core.listPlugins()) { - log.info("* " + base); + LOG.info("* " + base); } /* Test du plugins */ for (BigTable bigTable : core.getAvailableBases()) { bigTable.put("clé", "valeur"); - log.info(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-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-08 14:32:24 UTC (rev 64) @@ -24,7 +24,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(PluginLoader.class); + private static final Log LOG = LogFactory.getLog(PluginLoader.class); /** * The plugin classes. @@ -54,7 +54,7 @@ this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } } } @@ -69,11 +69,11 @@ for (File file : libs.listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { try { - log.info("== LIB " + file.getAbsolutePath() + "..."); + LOG.info("== LIB " + file.getAbsolutePath() + "..."); this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } } } @@ -81,7 +81,7 @@ // loads the jars classes for (File file : directory.listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { - log.info("== JAR " + file.getAbsolutePath() + "..."); + LOG.info("== JAR " + file.getAbsolutePath() + "..."); loadJarClasses(file.getAbsolutePath()); } } @@ -96,14 +96,14 @@ private void loadJarClasses(final String jarPath) { File file = new File(jarPath); - log.info("Loading " + jarPath + "..."); + LOG.info("Loading " + jarPath + "..."); JarFile jar = null; try { jar = new JarFile(file.getAbsolutePath()); } catch (IOException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } // Enumeration < JarEntry > entries2 = jar.entries(); @@ -133,7 +133,7 @@ String extension = ".class"; if (fileName.endsWith(extension)) { - log.info("Loading " + fileName + "..."); + LOG.info("Loading " + fileName + "..."); // formating file name fileName = fileName.substring(0, fileName.length() @@ -145,7 +145,7 @@ tmpClass = this.loadClass(fileName); //Class.forName(fileName, true, this); } catch (ClassNotFoundException e) { - log.error(e); + LOG.error(e.toString(),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-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-08 14:32:24 UTC (rev 64) @@ -14,17 +14,17 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(TestServiceLoader.class); + private static final Log LOG = LogFactory.getLog(TestServiceLoader.class); public TestServiceLoader() { try { BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); - log.info(p.getBigTable()); + LOG.info(p.getBigTable()); } catch (MalformedURLException e) { // TODO Auto-generated catch block //e.printStackTrace(); - log.error(e); + LOG.error(e.toString(),e); } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-08 14:32:24 UTC (rev 64) @@ -20,7 +20,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(HBase.class); + private static final Log LOG = LogFactory.getLog(HBase.class); private HBaseConfiguration config; private HTable table; @@ -35,7 +35,7 @@ // be found on the CLASSPATH org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(); config = new HBaseConfiguration(conf); - log.info("test"); + LOG.info("test"); selectTable(tableName); put("test", "val"); put("test", "val2"); @@ -87,13 +87,13 @@ Get g = new Get(Bytes.toBytes(rowName)); Result r; byte[] value = null; -// try { -// r = table.get(g); -// value = r.getValue(Bytes.toBytes(familyName), -// Bytes.toBytes(key)); -// } catch (IOException e) { -// e.printStackTrace(); -// } +// try { +// r = table.get(g); +// value = r.getValue(Bytes.toBytes(familyName), +// Bytes.toBytes(key)); +// } catch (IOException e) { +// e.printStackTrace(); +// } // If we convert the value bytes, we should get back 'Some Value', the // value we inserted at this location. @@ -120,7 +120,7 @@ } catch (IOException e) { // TODO Auto-generated catch block //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } try { // Scanners return Result instances. @@ -128,14 +128,15 @@ try { for (Result rr = scanner.next(); rr != null; rr = scanner.next()) { // print out the row we found and the columns we were looking for - System.out.println("Found row: " + rr); + //System.out.println("Found row: " + rr); + LOG.info("Found row: " + rr); keySet.add(rr.toString()); } } catch (IOException e) { // TODO Auto-generated catch block //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } // The other approach is to use a foreach loop. Scanners are iterable! @@ -158,7 +159,7 @@ table = new HTable(config, tableName); } catch (IOException e) { //e.printStackTrace(); - log.error(e.toString(), e); + LOG.error(e.toString(), e); } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-08 14:32:24 UTC (rev 64) @@ -3,6 +3,8 @@ import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JOptionPane; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Engine Class with methods for application user interface. @@ -11,6 +13,11 @@ */ public class ApplicationEngine { + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + Locale currentLocale; ResourceBundle messages; @@ -42,7 +49,6 @@ public void setLocale(String language, String country) { currentLocale= new Locale(language,country); messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); - System.out.println(messages.getString("ok")); - + LOG.info(messages.getString("ok")); } } Modified: trunk/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/msm-bighashmap/pom.xml 2010-02-08 14:32:24 UTC (rev 64) @@ -144,7 +144,7 @@ <properties> - <!-- main class in jar + <!-- main class in jar <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>--> <jaxx.version>2.0.0-beta-3</jaxx.version> <lutinutil.version>1.1.2</lutinutil.version> @@ -259,3 +259,4 @@ </project> + Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-08 02:47:16 UTC (rev 63) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-08 14:32:24 UTC (rev 64) @@ -21,14 +21,16 @@ * currentTable. * the table which is selected. */ - private Table currentTable; + // Not used + //private Table currentTable; /** * Default constructor. */ public BigHashMap() { this.tables = new HashMap<String, Table>(); - currentTable = null; + // Not used + //currentTable = null; } /** @@ -45,7 +47,8 @@ * {@inheritDoc} */ public void selectTable(String table) { - this.currentTable = tables.get(table); + // Not used + //this.currentTable = tables.get(table); } /** 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-08 02:47:16 UTC (rev 63) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-08 14:32:24 UTC (rev 64) @@ -3,7 +3,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.mapstoragemanager.plugins.bighashmap.Cell; import java.util.NoSuchElementException; import junit.framework.Assert; 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-08 02:47:16 UTC (rev 63) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-08 14:32:24 UTC (rev 64) @@ -1,13 +1,10 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; -import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;