- Mapstoragemanager-commits - mailman.cloud.codelutin.com

r189 - in trunk/msm/src: main/java/org/nuiton/mapstoragemanager/core main/java/org/nuiton/mapstoragemanager/ui/gui test/java/org/nuiton/mapstoragemanager/core
by dlanglais＠users.nuiton.org March 5, 2010

March 5, 2010

Author: dlanglais Date: 2010-03-05 03:20:24 +0100 (Fri, 05 Mar 2010) New Revision: 189 Log: Corrections mineures (Refactoring/Qualit?\195?\169). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-04 20:12:10 UTC (rev 188) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-05 02:20:24 UTC (rev 189) @@ -33,9 +33,9 @@ /** * The BigTable Set Loader. */ - private ServiceLoader<BigTable> bigTableSetLoader; - private ServiceLoader<Importer> importerSetLoader; - private ServiceLoader<Exporter> exporterSetLoader; +// private ServiceLoader<BigTable> bigTableSetLoader; +// private ServiceLoader<Importer> importerSetLoader; +// private ServiceLoader<Exporter> exporterSetLoader; /** * Map Identifiant - BigTable implementation. @@ -74,10 +74,19 @@ } } - bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - importerSetLoader = ServiceLoader.load(Importer.class, this); - exporterSetLoader = ServiceLoader.load(Exporter.class, this); + /** + * Load plugins. + */ + ServiceLoader<BigTable> bigTableSetLoader = + ServiceLoader.load(BigTable.class, this); + ServiceLoader<Importer> importerSetLoader = + ServiceLoader.load(Importer.class, this); + ServiceLoader<Exporter> exporterSetLoader = + ServiceLoader.load(Exporter.class, this); + /** + * Add plugin in the plugin's map. + */ for (BigTable bigTable : bigTableSetLoader) { plugins.put(bigTable.getPluginName(), bigTable); } @@ -90,39 +99,38 @@ } /** - * Returns a string displaying all the available BigTable implementations. - * @return a string displaying all the available BigTable implementations + * Returns a string displaying all the available Plugin implementations. + * @return a string displaying all the available Plugin implementations */ - public final String getBigTable() { + public final String getPluginsToString() { String s = "Available Plugins :\n"; - s += "\t* "; - if (!bigTableSetLoader.iterator().hasNext()) { - s += "No plugin."; + if (plugins.isEmpty()) { + s += "\t* No plugin."; } else { - for (BigTable bt : bigTableSetLoader) { - s += bt.getPluginName(); + for (Plugin plugin : plugins.values()) { + s += "\t* " + plugin.getPluginName(); } } return s; } - /** - * Returns the BigTable Set Loader. - * @return the BigTable Set Loader - * @deprecated Use {@link #getAllBigTable()} - */ - public final ServiceLoader<BigTable> getBigTableSetLoader() { - return bigTableSetLoader; - } +// /** +// * Returns the BigTable Set Loader. +// * @return the BigTable Set Loader +// * @deprecated Use {@link #getAllBigTable()} +// */ +// public final ServiceLoader<BigTable> getBigTableSetLoader() { +// return bigTableSetLoader; +// } /** - * Returns a BigTable implementation according to an identifiant. - * @param id the identifiant - * @return the BigTable + * Returns a plugin implementation according to an identifiant. + * @param id the identifiant - typically the plugins name -. + * @return the plugin corresponding to the given identifiant. */ - public final Plugin getBigTable(final String id) { + public final Plugin getPlugin(final String id) { return plugins.get(id); } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 20:12:10 UTC (rev 188) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-05 02:20:24 UTC (rev 189) @@ -24,7 +24,7 @@ try { PluginLoader p = new PluginLoader("plugins", this.getClass().getClassLoader()); - LOG.info(p.getBigTable()); + LOG.info(p.getPluginsToString()); } catch (MalformedURLException e) { //Auto-generated catch block //e.printStackTrace(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 20:12:10 UTC (rev 188) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-05 02:20:24 UTC (rev 189) @@ -64,7 +64,7 @@ /** * msmBasedir. */ - private static final File msmBasedir = + private static final File MSM_BASEDIR = new File(new File("").getAbsolutePath()).getParentFile();; /** @@ -74,13 +74,14 @@ // String basedir = new File("").getAbsolutePath(); // msmBasedir = new File(basedir).getParentFile(); - lastPath = msmBasedir.toString(); + lastPath = MSM_BASEDIR.toString(); try { String toPlugin = "plugins/"; - String pluginsFolderPath = new File(msmBasedir, toPlugin).getPath(); + String pluginsFolderPath = + new File(MSM_BASEDIR, toPlugin).getPath(); - LOG.info("msmBasedir : " + msmBasedir + '\n' + LOG.info("msmBasedir : " + MSM_BASEDIR + '\n' + "pluginsFolderPath : " + pluginsFolderPath); pluginLoader = new PluginLoader(pluginsFolderPath, @@ -100,7 +101,7 @@ * do nothing. */ public void loadAPlugin() { - JFileChooser jfc = new javax.swing.JFileChooser(msmBasedir); + JFileChooser jfc = new javax.swing.JFileChooser(MSM_BASEDIR); jfc.getSelectedFiles(); int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); @@ -112,7 +113,7 @@ File pluginPath = jfc.getSelectedFile(); - LOG.info("msmBasedir : " + msmBasedir + '\n' + LOG.info("msmBasedir : " + MSM_BASEDIR + '\n' + "pluginPath : " + pluginPath.getAbsolutePath()); pluginLoader.loadPlugin(pluginPath); @@ -228,7 +229,7 @@ if ("OurHashMap".equals(nameBase)) { bigTable = new OurHashMap2(); } else { - bigTable = (BigTable) pluginLoader.getBigTable(nameBase); + bigTable = (BigTable) pluginLoader.getPlugin(nameBase); } { @@ -415,7 +416,7 @@ Item selectedItem = ui.getImporter().getSelectedJaxxItem(); String importerName = selectedItem.getValue().toString(); - importer = (Importer) pluginLoader.getBigTable(importerName); + importer = (Importer) pluginLoader.getPlugin(importerName); importer.importFrom(bigTable, importFile); @@ -443,7 +444,7 @@ Item selectedItem = ui.getExporter().getSelectedJaxxItem(); String exporterName = selectedItem.getValue().toString(); - exporter = (Exporter) pluginLoader.getBigTable(exporterName); + exporter = (Exporter) pluginLoader.getPlugin(exporterName); exporter.exportTo(bigTable, importFile); } Modified: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 20:12:10 UTC (rev 188) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-05 02:20:24 UTC (rev 189) @@ -3,7 +3,6 @@ import java.net.MalformedURLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.mapstoragemanager.core.PluginLoader; /** * @author fdesbois @@ -21,7 +20,7 @@ try { PluginLoader p = new PluginLoader("plugins", this.getClass().getClassLoader()); - LOG.info(p.getBigTable()); + LOG.info(p.getPluginsToString()); } catch (MalformedURLException e) { // TODO Auto-generated catch block //e.printStackTrace();

1 0

r188 - in trunk/msm-fromtoXML: . src/main/java/org/nuiton/mapstoragemanager/plugins/exporter src/main/java/org/nuiton/mapstoragemanager/plugins/importer src/test/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 21:12:10 +0100 (Thu, 04 Mar 2010) New Revision: 188 Log: G?\195?\169n?\195?\169rateur de fichier xml (afin de tester le chargement de fichier plus ou moins volumineux). -> test?\195?\169 avec un fichier de ~100 Mo (1000000 de lignes et 5 colonnes) l'actuel plugin de chargement ne tient pas la charge (freeze de l'appli). Surement du ?\195?\160 SaxBuilder. -> l'?\195?\169criture du fichier est par contre tr?\195?\168s rapide (~10 secondes). Added: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java Modified: trunk/msm-fromtoXML/pom.xml trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java Modified: trunk/msm-fromtoXML/pom.xml =================================================================== --- trunk/msm-fromtoXML/pom.xml 2010-03-04 18:27:07 UTC (rev 187) +++ trunk/msm-fromtoXML/pom.xml 2010-03-04 20:12:10 UTC (rev 188) @@ -209,6 +209,26 @@ </plugins> </pluginManagement> <plugins> + +  + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -219,6 +239,7 @@ <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -227,6 +248,7 @@ <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> + </plugins> </build> <properties> Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-04 18:27:07 UTC (rev 187) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-04 20:12:10 UTC (rev 188) @@ -162,11 +162,16 @@ * @param file the file in which we save the database. */ private static void save(final File file) { + long t1 = System.currentTimeMillis(); try { XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); FileOutputStream fos = new FileOutputStream(file); +// GZIPOutputStream gzos = new GZIPOutputStream(fos); +// output.output(document, gzos); output.output(document, fos); fos.close(); + long t2 = System.currentTimeMillis(); + LOG.info("temps d'enregistrement : " + (t2 - t1) + " ms."); } catch (IOException ex) { LOG.error(ex, ex); } Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-04 18:27:07 UTC (rev 187) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-04 20:12:10 UTC (rev 188) @@ -138,11 +138,14 @@ * @throws IOException IOException */ private static void open(final File file) throws IOException { + long t1 = System.currentTimeMillis(); //On crée une instance de SAXBuilder SAXBuilder saxBuilder = new SAXBuilder(); try { // we construct the jdom document from the file. document = saxBuilder.build(file); + long t2 = System.currentTimeMillis(); + LOG.info("temps de chargement : " + (t2 - t1) + " ms."); } catch (JDOMException ex) { LOG.error(ex, ex); } Added: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java (rev 0) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java 2010-03-04 20:12:10 UTC (rev 188) @@ -0,0 +1,75 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.plugins.exporter; + +import java.io.File; +import java.util.ArrayList; +import java.util.Random; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; +import org.nuiton.mapstoragemanager.plugins.getFile; + +/** + * + * @author Dorian Langlais + */ +public class Generator { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(Generator.class); + + public static void main(String[] args) { + + BigTable bt = new BigHashMapV2(); + String btName = "Random"; + ArrayList<String> columnsNames = new ArrayList<String>(); + columnsNames.add(0,"1er Quart"); + columnsNames.add(1,"2nd Quart"); + columnsNames.add(2,"3eme Quart"); + columnsNames.add(3,"4eme Quart"); + + bt.createTable(btName); + bt.createColumn(btName, "Iteration"); + bt.createColumn(btName, columnsNames.get(0)); + bt.createColumn(btName, columnsNames.get(1)); + bt.createColumn(btName, columnsNames.get(2)); + bt.createColumn(btName, columnsNames.get(3)); + + Set<String> columns = bt.getColumnsNames(btName); + Integer nbIteration = 100000; + Random random = new java.util.Random(); + Double currentRandom; + int nbColumns = columns.size() - 1; + + while (nbIteration-->0) { + currentRandom = random.nextDouble(); + + bt.put( + btName, + "Iteration", + nbIteration.toString(), + nbIteration.toString()); + + bt.put( + btName, + columnsNames.get((int) (currentRandom * nbColumns)), + nbIteration.toString(), + currentRandom.toString()); + } + + Exporter exporter = new ToXML(); + File exportTest = + getFile.getTestFile("/src/test/resources/generator.xml"); + exporter.exportTo(bt,exportTest); +// exportTest.delete(); + } +}

1 0

r187 - in trunk/msm/src: main/java/org/nuiton/mapstoragemanager/core main/java/org/nuiton/mapstoragemanager/ui main/java/org/nuiton/mapstoragemanager/ui/gui main/resources/i18n test/java/org/nuiton/mapstoragemanager/core
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 19:27:07 +0100 (Thu, 04 Mar 2010) New Revision: 187 Log: BigTableLoader -> PluginLoader -> impl?\195?\169mentation crade (mais il en fallait une). L'import marche, mais j'ai un doute sur l'impl?\195?\169mentation (si on importe dans un table qui existe d?\195?\169j?\195?\160, on risque d'?\195?\169craser le contenu d?\195?\169j?\195?\160 pr?\195?\169sent, d'en perdre une partie....). L'export marche parfaitement. L'impl?\195?\169mentation graphique des fonctionnalit?\195?\169s d'import/export : -> deux JInternalFrames, peut-?\195?\170tre ?\195?\160 revoir en ce qui concerne l'ergonomie, ?\195?\160 coller dans le menu peut-?\195?\170tre... C-a-d sur le sujet, le gros oeuvre est fait, reste la finition. Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java Removed: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 18:27:07 UTC (rev 187) @@ -1,139 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.nuiton.mapstoragemanager.plugins.BigTable; - -/** - * @author Crieloue Gilles. - * This class loads the BigTable implementations. - */ -public class BigTableLoader extends URLClassLoader { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(BigTableLoader.class); - - /** - * The BigTable Set Loader. - */ - private ServiceLoader<BigTable> bigTableSetLoader; - - /** - * Map Identifiant - BigTable implementation. - */ - private Map<String, BigTable> plugins = new HashMap<String, BigTable>(); - - /** - * Class constructor. - * @param pluginsFolderPath the plugins folder path - * @param classLoader the parent classloader - * @throws MalformedURLException if the plugin folder is not found - */ - public BigTableLoader(final String pluginsFolderPath, - final ClassLoader classLoader) throws MalformedURLException { - - super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, - classLoader); - - for (File file : new File(pluginsFolderPath).listFiles()) { - loadPlugin(file); - } - - bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - - for (BigTable bigTableImpl : bigTableSetLoader) { - plugins.put(bigTableImpl.getPluginName(), bigTableImpl); - } - } - - /** - * Loads a plugin from a jar file. - * @param file the plugin file. - */ - public final void loadPlugin(final File file) { - LOG.info("Load plugin : " + file.getAbsolutePath()); - if (file.getAbsolutePath().endsWith(".jar")) { - try { - this.addURL(file.toURI().toURL()); - } catch (MalformedURLException e) { - LOG.error(e.toString(), e); - } - } - bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - for (BigTable bigTableImpl : bigTableSetLoader) { - plugins.put(bigTableImpl.getPluginName(), bigTableImpl); - } - } - - /** - * Returns a string displaying all the available BigTable implementations. - * @return a string displaying all the available BigTable implementations - */ - public final String getBigTable() { - - String s = "Available Plugins :\n"; - - s += "\t* "; - if (!bigTableSetLoader.iterator().hasNext()) { - s += "No plugin."; - } else { - for (BigTable bt : bigTableSetLoader) { - s += bt.getClass().getName(); -// bt.put("key", "value"); -// if (bt.get("key").equals("value")) { -// s += " (working)" + "\n"; -// } else { -// s += " (not working)" + "\n"; -// } - } - } - return s; - } - - /** - * Returns the BigTable Set Loader. - * @return the BigTable Set Loader - * @deprecated Use {@link #getAllBigTable()} - */ - public final ServiceLoader<BigTable> getBigTableSetLoader() { - return bigTableSetLoader; - } - - /** - * Returns a BigTable implementation according to an identifiant. - * @param id the identifiant - * @return the BigTable - */ - public final BigTable getBigTable(final String id) { - return plugins.get(id); - } - - /** - * Returns all the BigTable implementations loaded. - * @return all the BigTable implementations loaded - */ - public final Collection<BigTable> getAllBigTable() { - return plugins.values(); - } - - /** - * Returns all the BigTable implementations names. - * @return all the BigTable implementations names - */ - public final Set<String> getAllBigTableNames() { - return plugins.keySet(); - } -} Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-04 18:27:07 UTC (rev 187) @@ -0,0 +1,160 @@ +package org.nuiton.mapstoragemanager.core; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; + +/** + * @author Crieloue Gilles. + * This class loads the BigTable implementations. + */ +public class PluginLoader extends URLClassLoader { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(PluginLoader.class); + + /** + * The BigTable Set Loader. + */ + private ServiceLoader<BigTable> bigTableSetLoader; + private ServiceLoader<Importer> importerSetLoader; + private ServiceLoader<Exporter> exporterSetLoader; + + /** + * Map Identifiant - BigTable implementation. + */ + private Map<String, Plugin> plugins = new HashMap<String, Plugin>(); + + /** + * Class constructor. + * @param pluginsFolderPath the plugins folder path + * @param classLoader the parent classloader + * @throws MalformedURLException if the plugin folder is not found + */ + public PluginLoader(final String pluginsFolderPath, + final ClassLoader classLoader) throws MalformedURLException { + + super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, + classLoader); + + for (File file : new File(pluginsFolderPath).listFiles()) { + loadPlugin(file); + } + } + + /** + * Loads a plugin from a jar file. + * Loads Plugin classes from this jar file into the correct ServiceLoader. + * @param file the plugin file. + */ + public final void loadPlugin(final File file) { + LOG.info("Load plugin : " + file.getAbsolutePath()); + if (file.getAbsolutePath().endsWith(".jar")) { + try { + this.addURL(file.toURI().toURL()); + } catch (MalformedURLException e) { + LOG.error(e.toString(), e); + } + } + + bigTableSetLoader = ServiceLoader.load(BigTable.class, this); + importerSetLoader = ServiceLoader.load(Importer.class, this); + exporterSetLoader = ServiceLoader.load(Exporter.class, this); + + for (BigTable bigTable : bigTableSetLoader) { + plugins.put(bigTable.getPluginName(), bigTable); + } + for (Importer importer : importerSetLoader) { + plugins.put(importer.getPluginName(), importer); + } + for (Exporter exporter : exporterSetLoader) { + plugins.put(exporter.getPluginName(), exporter); + } + } + + /** + * Returns a string displaying all the available BigTable implementations. + * @return a string displaying all the available BigTable implementations + */ + public final String getBigTable() { + + String s = "Available Plugins :\n"; + + s += "\t* "; + if (!bigTableSetLoader.iterator().hasNext()) { + s += "No plugin."; + } else { + for (BigTable bt : bigTableSetLoader) { + s += bt.getPluginName(); + } + } + return s; + } + + /** + * Returns the BigTable Set Loader. + * @return the BigTable Set Loader + * @deprecated Use {@link #getAllBigTable()} + */ + public final ServiceLoader<BigTable> getBigTableSetLoader() { + return bigTableSetLoader; + } + + /** + * Returns a BigTable implementation according to an identifiant. + * @param id the identifiant + * @return the BigTable + */ + public final Plugin getBigTable(final String id) { + return plugins.get(id); + } + + /** + * Returns all the loaded plugins which implements pluginClass. + * @param pluginClass the plugin class that we want to get, null if we want + * to get all the plugin. + * @return returns all the loaded plugins which implements pluginClass or + * all the plugin if pluginClass is null. + */ + public final Collection<Plugin> getAllPlugin(Class pluginClass) { + + Collection<Plugin> pluginsWanted = new HashSet<Plugin>(); + + if(pluginClass != null) { + for (Plugin plugin : plugins.values()) { + if (pluginClass.isInstance(plugin)) { + pluginsWanted.add(plugin); + } + } + } else { + pluginsWanted = plugins.values(); + } + + return pluginsWanted; + } + + /** + * Returns all the Plugin implementations names. + * @return all the BigTable implementations names + */ + public final Set<String> getAllPluginNames() { + return plugins.keySet(); + } +} Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 18:27:07 UTC (rev 187) @@ -22,8 +22,8 @@ */ private TestServiceLoader() { try { - BigTableLoader p = - new BigTableLoader("plugins", this.getClass().getClassLoader()); + PluginLoader p = + new PluginLoader("plugins", this.getClass().getClassLoader()); LOG.info(p.getBigTable()); } catch (MalformedURLException e) { //Auto-generated catch block Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 18:27:07 UTC (rev 187) @@ -4,106 +4,104 @@  <script> <![CDATA[ - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - import org.nuiton.mapstoragemanager.core.BigTableLoader; - import javax.swing.tree.*; - import static org.nuiton.i18n.I18n.n_; - import static org.nuiton.i18n.I18n._; - import javax.swing.JLabel; - import org.nuiton.mapstoragemanager.MsmConfig; - import org.nuiton.mapstoragemanager.plugins.BigTable; - import org.nuiton.mapstoragemanager.ui.gui.MessageThread; +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.core.PluginLoader; +import javax.swing.tree.*; +import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import javax.swing.JLabel; +import org.nuiton.mapstoragemanager.MsmConfig; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Plugin; +import org.nuiton.mapstoragemanager.ui.gui.MessageThread; - ApplicationEngine engine = ApplicationEngine.getInstance(); +ApplicationEngine engine = ApplicationEngine.getInstance(); - /** - * classe instance (singleton pattern). - */ - private static MainUI instance = null; +/** + * classe instance (singleton pattern). + */ +private static MainUI instance = null; - /** - * getInstance method (singleton pattern). - * @return instance of the class - */ - public static MainUI getInstance() { - if (instance == null){ - instance = new MainUI(); - for (BigTable btPlugin : instance.getEngine().getBigTableLoader().getAllBigTable()) { - String btName = btPlugin.getPluginName(); - jaxx.runtime.swing.Item bigTableItem = - new jaxx.runtime.swing.Item(btName, null, btName, true); - instance.getNameBase().addItem(bigTableItem); - } - } - return instance; +/** + * getInstance method (singleton pattern). + * @return instance of the class + */ +public static MainUI getInstance() { + if (instance == null){ + instance = new MainUI(); + for (Plugin btPlugin : instance.getEngine().getBigTableLoader().getAllPlugin(BigTable.class)) { + String btName = btPlugin.getPluginName(); + jaxx.runtime.swing.Item bigTableItem = + new jaxx.runtime.swing.Item(btName, null, btName, true); + instance.getNameBase().addItem(bigTableItem); } + } + return instance; +} - /** - * Access to the engine. - * @return instance of the class - */ - public ApplicationEngine getEngine(){ - return engine; - } +/** +* Access to the engine. +* @return instance of the class +*/ +public ApplicationEngine getEngine(){ + return engine; +} - /** - * Access to the config. - * @return instance of the class - */ - public MsmConfig getConfig() { - return getContextValue(MsmConfig.class); - } +/** +* Access to the config. +* @return instance of the class +*/ +public MsmConfig getConfig() { + return getContextValue(MsmConfig.class); +} - /** - * Dispose UI. - */ - public void dispose(){ - instance = null; - engine.dispose(); - this.setVisible(false); - } +/** +* Dispose UI. +*/ +public void dispose(){ + instance = null; + engine.dispose(); + this.setVisible(false); +} - /** - * Display the appropriate message. - * @param message the message to display. - * @param code code error (for images). - */ - public void displayMessage(String message, int code){ +/** +* Display the appropriate message. +* @param message the message to display. +* @param code code error (for images). +*/ +public void displayMessage(String message, int code){ - //clear the message panel - this.getMessagesPanel().removeAll(); + //clear the message panel + this.getMessagesPanel().removeAll(); - //display message - if (code==0){ - String icon ="ok_16"; - }else if (code==1){ - String icon ="warning_16.png"; - }else if (code==2){ - String icon ="cancel_16.png"; - } + //display message + if (code==0){ + String icon ="ok_16"; + }else if (code==1){ + String icon ="warning_16.png"; + }else if (code==2){ + String icon ="cancel_16.png"; + } - JLabel label = new JLabel(message); - label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); - this.getMessagesPanel().add(label); - this.getMessagesPanel().repaint(); - this.getMessagesPanel().revalidate(); + JLabel label = new JLabel(message); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); + this.getMessagesPanel().add(label); + this.getMessagesPanel().repaint(); + this.getMessagesPanel().revalidate(); - //remove message after a short time - MessageThread m = new MessageThread(); - m.start(); + //remove message after a short time + MessageThread m = new MessageThread(); + m.start(); +} - } - - /** - * Test. - */ - public DefaultTreeModel getModelTree(){ - n_("Empty"); - return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"))); - } - - +/** +* Test. +*/ +public DefaultTreeModel getModelTree(){ + n_("Empty"); + return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"))); +} ]]> </script> @@ -188,10 +186,6 @@ <JLabel text="Exporter :" actionIcon='database_16' styleClass='boldUnderline' /> <JAXXComboBox id='exporter' onActionPerformed='engine.doSomething()' > <item value=' ' selected='true'/> - <item value='A' selected='false'/> - <item value='B' selected='false'/> - <item value='C' selected='false'/> - <item value='D' selected='false'/> </JAXXComboBox> <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.exportBase()'/> </JPanel> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 18:27:07 UTC (rev 187) @@ -4,10 +4,8 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.util.Iterator; import java.util.Locale; import java.util.Properties; -import java.util.Set; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -20,9 +18,12 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.MsmConfig; -import org.nuiton.mapstoragemanager.core.BigTableLoader; +import org.nuiton.mapstoragemanager.core.PluginLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -41,29 +42,48 @@ */ private BigTable bigTable; /** + * Importer. + */ + private Importer importer; + /** + * Exporter. + */ + private Exporter exporter; + /** * classe instance (singleton pattern). */ private static ApplicationEngine instance = null; /** - * BigtableLoader. + * PluginLoader. */ - private static BigTableLoader btl; + private static PluginLoader pluginLoader; + /** + * LastPath. + */ + private static String lastPath; + /** + * msmBasedir. + */ + private static final File msmBasedir = + new File(new File("").getAbsolutePath()).getParentFile();; /** * Constructor. */ private ApplicationEngine() { + +// String basedir = new File("").getAbsolutePath(); +// msmBasedir = new File(basedir).getParentFile(); + lastPath = msmBasedir.toString(); + try { - String basedir = new File("").getAbsolutePath(); - File msnBasedir = new File(basedir).getParentFile(); String toPlugin = "plugins/"; - String pluginsFolderPath = new File(msnBasedir, toPlugin).getPath(); + String pluginsFolderPath = new File(msmBasedir, toPlugin).getPath(); - LOG.info("basedir : " + basedir + '\n' - + "msnBasedir : " + msnBasedir + '\n' + LOG.info("msmBasedir : " + msmBasedir + '\n' + "pluginsFolderPath : " + pluginsFolderPath); - btl = new BigTableLoader(pluginsFolderPath, + pluginLoader = new PluginLoader(pluginsFolderPath, this.getClass().getClassLoader()); } catch (MalformedURLException ex) { LOG.error(ex, ex); @@ -80,74 +100,48 @@ * do nothing. */ public void loadAPlugin() { - - String basedir = new File("").getAbsolutePath(); - File msnBasedir = new File(basedir).getParentFile(); -// String toPlugin = "msm-bighashmapV2/target/"; - JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); + JFileChooser jfc = new javax.swing.JFileChooser(msmBasedir); jfc.getSelectedFiles(); -// File pluginPath = new File(msnBasedir, toPlugin); - switch (jfc.showOpenDialog(MainUI.getFrames()[0])) { - case JFileChooser.CANCEL_OPTION: - return; - case JFileChooser.ERROR_OPTION: - return; - case JFileChooser.APPROVE_OPTION: - break; - default: - break; - } - File pluginPath = jfc.getSelectedFile(); + int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); -// BigTableLoader btl = null; + if( JFileChooser.APPROVE_OPTION == jfcReturn ) { +// case JFileChooser.CANCEL_OPTION: +// case JFileChooser.ERROR_OPTION: +// case JFileChooser.APPROVE_OPTION: - LOG.info("basedir : " + basedir + '\n' - + "msnBasedir : " + msnBasedir + '\n' - + "pluginPath : " + pluginPath.getAbsolutePath()); + File pluginPath = jfc.getSelectedFile(); -// try { - btl.loadPlugin(pluginPath); -// bigTableLoader = -// new BigTableLoader(pluginPath.getPath(), -// this.getClass().getClassLoader()); -// } catch (MalformedURLException ex) { -// LOG.fatal(ex, ex); -// } + LOG.info("msmBasedir : " + msmBasedir + '\n' + + "pluginPath : " + pluginPath.getAbsolutePath()); - LOG.info("getBigtable() : " + btl.getBigTable()); + pluginLoader.loadPlugin(pluginPath); - MainUI ui = MainUI.getInstance(); - for (BigTable btPlugin : btl.getAllBigTable()) { - String btName = btPlugin.getPluginName(); - jaxx.runtime.swing.Item bigTableItem = - new jaxx.runtime.swing.Item(btName, null, btName, true); - ui.getNameBase().addItem(bigTableItem); - ui.getNameBase().setSelectedItem(bigTableItem); + LOG.info("getAllPluginNames : " + pluginLoader.getAllPluginNames()); + + MainUI ui = MainUI.getInstance(); + for (Plugin btPlugin : pluginLoader.getAllPlugin(BigTable.class)) { + String btName = btPlugin.getPluginName(); + jaxx.runtime.swing.Item bigTableItem = + new jaxx.runtime.swing.Item(btName, null, btName, true); + ui.getNameBase().addItem(bigTableItem); + ui.getNameBase().setSelectedItem(bigTableItem); + } + for (Plugin imPlugin : pluginLoader.getAllPlugin(Importer.class)) { + String imName = imPlugin.getPluginName(); + jaxx.runtime.swing.Item importerItem = + new jaxx.runtime.swing.Item(imName, null, imName, true); + ui.getImporter().addItem(importerItem); + ui.getImporter().setSelectedItem(importerItem); + } + for (Plugin exPlugin : pluginLoader.getAllPlugin(Exporter.class)) { + String exName = exPlugin.getPluginName(); + jaxx.runtime.swing.Item exporterItem = + new jaxx.runtime.swing.Item(exName, null, exName, true); + ui.getExporter().addItem(exporterItem); + ui.getExporter().setSelectedItem(exporterItem); + } } -// ui.getNameBase().re - -// bigTable = btl.getBigTable("BigHashMapV2"); -// bigTable = new OurHashMap2(); -// bigTable.createTable("table1"); -// bigTable.createTable("table2"); -// bigTable.createColumn("table1", "column1"); -// bigTable.createColumn("table1", "column2"); -// bigTable.createColumn("table2", "column3"); -// bigTable.createColumn("table2", "column4"); -// bigTable.createColumn("table2", "column5"); -// -// bigTable.put("table1", "column1", "1", "content1"); -// bigTable.put("table1", "column1", "2", "content2"); -// bigTable.put("table1", "column2", "3", "content3"); -// bigTable.put("table1", "column2", "4", "content4"); -// -// bigTable.put("table2", "column3", "5", "content5"); -// bigTable.put("table2", "column3", "6", "content6"); -// bigTable.put("table2", "column4", "7", "content7"); -// bigTable.put("table2", "column4", "8", "content8"); -// bigTable.put("table2", "column5", "9", "content9"); -// bigTable.put("table2", "column5", "10", "content10"); } /** @@ -183,7 +177,6 @@ MainUI ui = MainUI.getInstance(); boolean visible = ui.getImportFrame().isVisible(); ui.getImportFrame().setVisible(!visible); - clean(ui); } /** @@ -194,7 +187,6 @@ MainUI ui = MainUI.getInstance(); boolean visible = ui.getExportFrame().isVisible(); ui.getExportFrame().setVisible(!visible); - clean(ui); } /** @@ -236,7 +228,7 @@ if ("OurHashMap".equals(nameBase)) { bigTable = new OurHashMap2(); } else { - bigTable = btl.getBigTable(nameBase); + bigTable = (BigTable) pluginLoader.getBigTable(nameBase); } { @@ -269,30 +261,7 @@ //update tree uptableNavigationTree(ui.getNavigation(), nameBase); -// JTree tree = ui.getNavigation(); -// tree.setModel(new MSMModel(nameBase)); -// tree.addTreeSelectionListener(new MSMNavigationListener()); -// -// TreeModel model = tree.getModel(); -// DefaultMutableTreeNode root; -// root = (DefaultMutableTreeNode) model.getRoot(); -// DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); -// -// //display the node table -// for (String tableName : bigTable.getTablesNames()) { -// DefaultMutableTreeNode tableNameInsert; -// tableNameInsert = new DefaultMutableTreeNode(tableName); -// dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); -// -// //display the node column -// for (String columnName : bigTable.getColumnsNames(tableName)) { -// DefaultMutableTreeNode columnNameToInsert; -// columnNameToInsert = new DefaultMutableTreeNode(columnName); -// dtm.insertNodeInto(columnNameToInsert, tableNameInsert, -// tableNameInsert.getChildCount()); -// } -// -// } + String connexionOk = _("connectionValid"); ui.displayMessage(connexionOk, 0); ui.getNavigation().repaint(); @@ -393,8 +362,8 @@ * Get the bigTableLoader. * @return return the bigTableLoader. */ - public BigTableLoader getBigTableLoader() { - return btl; + public PluginLoader getBigTableLoader() { + return pluginLoader; } /** @@ -428,24 +397,55 @@ } } + /** + * Import database from a file. + */ public void importBase() { - JFileChooser jfc = new JFileChooser(); - jfc.showOpenDialog(jfc); - File exportFile = jfc.getSelectedFile(); - LOG.info("chosen file for import : " + exportFile.getPath()); + JFileChooser jfc = new JFileChooser(lastPath); + int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getImporter().getSelectedJaxxItem(); - String importerName = selectedItem.getValue().toString(); + if( JFileChooser.APPROVE_OPTION == jfcReturn ) { + + lastPath = jfc.getSelectedFile().getAbsolutePath(); + + File importFile = jfc.getSelectedFile(); + LOG.info("chosen file for import : " + importFile.getPath()); + + MainUI ui = MainUI.getInstance(); + Item selectedItem = ui.getImporter().getSelectedJaxxItem(); + String importerName = selectedItem.getValue().toString(); + + importer = (Importer) pluginLoader.getBigTable(importerName); + + + importer.importFrom(bigTable, importFile); + clean(ui); + uptableNavigationTree(ui.getNavigation(), importFile.getName()); + } } + + /** + * Export the database into a file. + */ public void exportBase() { - JFileChooser jfc = new JFileChooser(); - jfc.showSaveDialog(jfc); - File exportFile = jfc.getSelectedFile(); - LOG.info("chosen file for export : " + exportFile.getPath()); - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getExporter().getSelectedJaxxItem(); - String exporterName = selectedItem.getValue().toString(); + JFileChooser jfc = new JFileChooser(lastPath); + int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); + + if( JFileChooser.APPROVE_OPTION == jfcReturn ) { + + lastPath = jfc.getSelectedFile().getAbsolutePath(); + + File importFile = jfc.getSelectedFile(); + LOG.info("chosen file for export : " + importFile.getPath()); + + MainUI ui = MainUI.getInstance(); + Item selectedItem = ui.getExporter().getSelectedJaxxItem(); + String exporterName = selectedItem.getValue().toString(); + + exporter = (Exporter) pluginLoader.getBigTable(exporterName); + + exporter.exportTo(bigTable, importFile); + } } } Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 18:27:07 UTC (rev 187) @@ -1,54 +1,54 @@ -Empty=Empty -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.export= -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import= -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=Load -mapstoragemanager.action.pluginload.tip=Load plugins -mapstoragemanager.action.pluginshow=Show -mapstoragemanager.action.pluginshow.tip=Show plugins -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=Load +mapstoragemanager.action.pluginload.tip=Load plugins +mapstoragemanager.action.pluginshow=Show +mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 18:27:07 UTC (rev 187) @@ -1,54 +1,54 @@ -Empty=Vide -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.export= -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import= -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer -mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier -mapstoragemanager.action.pluginshow=Lister -mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer +mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier +mapstoragemanager.action.pluginshow=Lister +mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager Modified: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 14:40:08 UTC (rev 186) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-04 18:27:07 UTC (rev 187) @@ -3,7 +3,7 @@ import java.net.MalformedURLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.mapstoragemanager.core.BigTableLoader; +import org.nuiton.mapstoragemanager.core.PluginLoader; /** * @author fdesbois @@ -19,8 +19,8 @@ private TestServiceLoader() { try { - BigTableLoader p = - new BigTableLoader("plugins", this.getClass().getClassLoader()); + PluginLoader p = + new PluginLoader("plugins", this.getClass().getClassLoader()); LOG.info(p.getBigTable()); } catch (MalformedURLException e) { // TODO Auto-generated catch block

1 0

r186 - in trunk: msm/src/main/resources/i18n msm-bighashmap msm-bighashmapV2 msm-bighashmapV2/src/main msm-bighashmapV2/src/main/resources msm-bighashmapV2/src/main/resources/META-INF msm-bighashmapV2/src/main/resources/META-INF/services msm-fromtoXML msm-fromtoXML/src/main/resources msm-fromtoXML/src/main/resources/META-INF msm-fromtoXML/src/main/resources/META-INF/services msm-hbase msm-hbase/src/main/resources msm-hbase/src/main/resources/META-INF msm-hbase/src/main/resources/
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 15:40:08 +0100 (Thu, 04 Mar 2010) New Revision: 186 Log: D?\195?\169placement des dossiers META-INF dans le dossier src/main/resources/ de chaque plugin. Added: trunk/msm-bighashmapV2/src/main/resources/ trunk/msm-bighashmapV2/src/main/resources/META-INF/ trunk/msm-bighashmapV2/src/main/resources/META-INF/services/ trunk/msm-bighashmapV2/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable trunk/msm-fromtoXML/src/main/resources/META-INF/ trunk/msm-fromtoXML/src/main/resources/META-INF/services/ trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer trunk/msm-hbase/src/main/resources/META-INF/ trunk/msm-hbase/src/main/resources/META-INF/services/ trunk/msm-hbase/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable Removed: trunk/msm-bighashmap/META-INF/ trunk/msm-bighashmapV2/META-INF/ trunk/msm-fromtoXML/META-INF/ trunk/msm-hbase/META-INF/ Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 12:30:49 UTC (rev 185) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 14:40:08 UTC (rev 186) @@ -1,54 +1,54 @@ -Empty=Empty -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.export= -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import= -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=Load -mapstoragemanager.action.pluginload.tip=Load plugins -mapstoragemanager.action.pluginshow=Show -mapstoragemanager.action.pluginshow.tip=Show plugins -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=Load +mapstoragemanager.action.pluginload.tip=Load plugins +mapstoragemanager.action.pluginshow=Show +mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 12:30:49 UTC (rev 185) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 14:40:08 UTC (rev 186) @@ -1,54 +1,54 @@ -Empty=Vide -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.export= -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import= -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer -mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier -mapstoragemanager.action.pluginshow=Lister -mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer +mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier +mapstoragemanager.action.pluginshow=Lister +mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager Copied: trunk/msm-bighashmapV2/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (from rev 185, trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable) =================================================================== --- trunk/msm-bighashmapV2/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (rev 0) +++ trunk/msm-bighashmapV2/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable 2010-03-04 14:40:08 UTC (rev 186) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2 \ No newline at end of file Property changes on: trunk/msm-bighashmapV2/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter (from rev 185, trunk/msm-fromtoXML/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter) =================================================================== --- trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter (rev 0) +++ trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter 2010-03-04 14:40:08 UTC (rev 186) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.exporter.ToXML \ No newline at end of file Property changes on: trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Exporter ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer (from rev 185, trunk/msm-fromtoXML/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer) =================================================================== --- trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer (rev 0) +++ trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer 2010-03-04 14:40:08 UTC (rev 186) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.importer.FromXML \ No newline at end of file Property changes on: trunk/msm-fromtoXML/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Importer ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/msm-hbase/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable (from rev 185, trunk/msm-hbase/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable) =================================================================== --- trunk/msm-hbase/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable (rev 0) +++ trunk/msm-hbase/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-03-04 14:40:08 UTC (rev 186) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.hbase.HBaseNewBigTable \ No newline at end of file Property changes on: trunk/msm-hbase/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r185 - trunk/src/site/reports
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 13:30:49 +0100 (Thu, 04 Mar 2010) New Revision: 185 Modified: trunk/src/site/reports/CompteRendu_02-03-2010.rst Log: RAF : Ajout Database Import/Export ic?\195?\180ne ?\195?\160 trouver. Modified: trunk/src/site/reports/CompteRendu_02-03-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_02-03-2010.rst 2010-03-04 12:29:29 UTC (rev 184) +++ trunk/src/site/reports/CompteRendu_02-03-2010.rst 2010-03-04 12:30:49 UTC (rev 185) @@ -50,6 +50,8 @@ -Refactoring. (Tout le monde) +-Faire/trouver des logos pour database import/export. +

1 0

r184 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources resources/i18n resources/icons
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 13:29:29 +0100 (Thu, 04 Mar 2010) New Revision: 184 Added: trunk/msm/src/main/resources/icons/Database.png trunk/msm/src/main/resources/icons/databaseExport_16.png trunk/msm/src/main/resources/icons/databaseExport_32.png trunk/msm/src/main/resources/icons/databaseImport_16.png trunk/msm/src/main/resources/icons/databaseImport_32.png trunk/msm/src/main/resources/icons/fleche.png Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/msm/src/main/resources/msm.properties Log: Int?\195?\169gration de frame pour l'import/export de base de donn?\195?\169e. Ic?\195?\180nes provisoires (droits ?). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-04 12:29:29 UTC (rev 184) @@ -49,6 +49,18 @@ mnemonic:D; } +#menuImport { + text:"mapstoragemanager.action.import"; + toolTipText:"mapstoragemanager.action.import.tip"; + actionIcon:"databaseImport_16"; +} + +#menuExport { + text:"mapstoragemanager.action.export"; + toolTipText:"mapstoragemanager.action.export.tip"; + actionIcon:"databaseExport_16"; +} + #menuExit { text:"mapstoragemanager.action.exit"; toolTipText:"mapstoragemanager.action.exit.tip"; @@ -135,7 +147,17 @@ visible:false; } +#importFrame { + visible:false; + /*actionIcon:"databaseImport_16";*/ +} +#exportFrame { + visible:false; + /*actionIcon:"databaseExport_16";*/ +} + + JLabel.boldUnderline { font-weight: bold; } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 12:29:29 UTC (rev 184) @@ -119,6 +119,11 @@ <JMenuItem id='menuDisconnect' enabled='false' onActionPerformed='engine.disposeToolBar()'/> <JSeparator/> + <JMenuItem id='menuImport' + onActionPerformed='engine.showImportFrame()'/> + <JMenuItem id='menuExport' + onActionPerformed='engine.showExportFrame()'/> + <JSeparator/> <JMenuItem id='menuExit' onActionPerformed='engine.close()'/> </JMenu> @@ -160,9 +165,6 @@ <JLabel text="name base :" actionIcon='database_16' styleClass='boldUnderline' /> <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > <item value='OurHashMap' selected='true'/> -  </JAXXComboBox> <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/> <JTextField id='login'/> @@ -171,6 +173,30 @@ <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/> </JToolBar> + <JInternalFrame id='importFrame' title="Import Database" width='275' height='60' resizable='false' visible='false' opaque='true' > + <JPanel id='importPanel'> + <JLabel text="Importer :" actionIcon='database_16' styleClass='boldUnderline' /> + <JAXXComboBox id='importer' onActionPerformed='engine.doSomething()' > + <item value=' ' selected='true'/> + </JAXXComboBox> + <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.importBase()'/> + </JPanel> + </JInternalFrame> + + <JInternalFrame id='exportFrame' title="Export Database" width='275' height='60' resizable='false' visible='false' opaque='true' > + <JPanel id='exportPanel'> + <JLabel text="Exporter :" actionIcon='database_16' styleClass='boldUnderline' /> + <JAXXComboBox id='exporter' onActionPerformed='engine.doSomething()' > + <item value=' ' selected='true'/> + <item value='A' selected='false'/> + <item value='B' selected='false'/> + <item value='C' selected='false'/> + <item value='D' selected='false'/> + </JAXXComboBox> + <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.exportBase()'/> + </JPanel> + </JInternalFrame> + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 12:29:29 UTC (rev 184) @@ -176,6 +176,28 @@ } /** + * Show importBar in order to connect. + */ + public void showImportFrame() { + LOG.info("showImportFrame"); + MainUI ui = MainUI.getInstance(); + boolean visible = ui.getImportFrame().isVisible(); + ui.getImportFrame().setVisible(!visible); + clean(ui); + } + + /** + * Show exportBar in order to connect. + */ + public void showExportFrame() { + LOG.info("showExportBar"); + MainUI ui = MainUI.getInstance(); + boolean visible = ui.getExportFrame().isVisible(); + ui.getExportFrame().setVisible(!visible); + clean(ui); + } + + /** * Hide toolBar in order to disconnect. */ public void disposeToolBar() { @@ -405,4 +427,25 @@ } } + + public void importBase() { + JFileChooser jfc = new JFileChooser(); + jfc.showOpenDialog(jfc); + File exportFile = jfc.getSelectedFile(); + LOG.info("chosen file for import : " + exportFile.getPath()); + + MainUI ui = MainUI.getInstance(); + Item selectedItem = ui.getImporter().getSelectedJaxxItem(); + String importerName = selectedItem.getValue().toString(); + } + public void exportBase() { + JFileChooser jfc = new JFileChooser(); + jfc.showSaveDialog(jfc); + File exportFile = jfc.getSelectedFile(); + LOG.info("chosen file for export : " + exportFile.getPath()); + + MainUI ui = MainUI.getInstance(); + Item selectedItem = ui.getExporter().getSelectedJaxxItem(); + String exporterName = selectedItem.getValue().toString(); + } } Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 12:29:29 UTC (rev 184) @@ -1,46 +1,54 @@ -Empty=Empty -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=Load -mapstoragemanager.action.pluginload.tip=Load plugins -mapstoragemanager.action.pluginshow=Show -mapstoragemanager.action.pluginshow.tip=Show plugins -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=Load +mapstoragemanager.action.pluginload.tip=Load plugins +mapstoragemanager.action.pluginshow=Show +mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 12:29:29 UTC (rev 184) @@ -1,46 +1,54 @@ -Empty=Vide -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer -mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier -mapstoragemanager.action.pluginshow=Lister -mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.export= +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import= +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer +mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier +mapstoragemanager.action.pluginshow=Lister +mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager Added: trunk/msm/src/main/resources/icons/Database.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/Database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/databaseExport_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/databaseExport_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/databaseExport_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/databaseExport_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/databaseImport_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/databaseImport_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/databaseImport_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/databaseImport_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/fleche.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/fleche.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties 2010-03-04 09:47:31 UTC (rev 183) +++ trunk/msm/src/main/resources/msm.properties 2010-03-04 12:29:29 UTC (rev 184) @@ -14,4 +14,8 @@ icon.action.i18n-uk=action-i18n-uk.png icon.action.connect=action-connect.png icon.action.disconnect=action-disconnect.png +icon.action.databaseImport_16=databaseImport_16.png +icon.action.databaseExport_16=databaseExport_16.png +icon.action.databaseImport_32=databaseImport_32.png +icon.action.databaseExport_32=databaseExport_32.png application.site.url=http://www.nuiton.org/projects/show/mapstoragemanager \ No newline at end of file

1 0

r183 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/core src/site/reports
by gcrieloue＠users.nuiton.org March 4, 2010

March 4, 2010

Author: gcrieloue Date: 2010-03-04 10:47:31 +0100 (Thu, 04 Mar 2010) New Revision: 183 Added: trunk/src/site/reports/CompteRenduReunion_04-03-2010.rst trunk/src/site/reports/CompteRendu_02-03-2010.rst Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java Log: CompteRendu 'vacances' et r?\195?\169union du 4 Mars. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 09:32:29 UTC (rev 182) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 09:47:31 UTC (rev 183) @@ -60,7 +60,7 @@ } /** - * Load a plugin. + * Loads a plugin from a jar file. * @param file the plugin file. */ public final void loadPlugin(final File file) { Added: trunk/src/site/reports/CompteRenduReunion_04-03-2010.rst =================================================================== --- trunk/src/site/reports/CompteRenduReunion_04-03-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRenduReunion_04-03-2010.rst 2010-03-04 09:47:31 UTC (rev 183) @@ -0,0 +1,24 @@ +Discussion avec Benjamin Poussin sur l'avancée du projet. +========================================================= + +Déroulement +------------ + + -Analyse (planning, cas d'utilisation, ). + -Démonstration. + -Discussion sur l'interface graphique et l'intégration des plugins dans celle ci. + -Discussion sur le fichier XML (import/export). + -Présentation des diagrammes UML (échec lors de l'ouverture d'argoUML...) + +Remarques : +----------- + +-Idée : Fichier de properties dans le jar du plugin décrivant les widgets graphiques dont il a besoin. +-Import-export : + -Un fichier XML peut être trop lourd à traiter étant donné le volume de données. + -GZipInputStream peut être utilisé pour la compression. +-Plugin de surveillance: + -Montrer l'espace occupé / espace restant. + +Mise en place de la prochaine réunion le jeudi 11 mars, à 11h. +(/!\ Dernière réunion avant la soutenance) \ No newline at end of file Added: trunk/src/site/reports/CompteRendu_02-03-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_02-03-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRendu_02-03-2010.rst 2010-03-04 09:47:31 UTC (rev 183) @@ -0,0 +1,55 @@ +semaine du 1 mars 2010 +====================== + +Analyse +------- + +-Planning prévisionnel fait. +-Cas d'utilisation fait par description textuelle. +-Diagramme de classe. + +Architecture à plugins +---------------------- + +-Possibilité d'ajouter un plugin à partir de son jar. +-Ajout d'une map nom du plugin - plugin. + +Plugins +------- + +-Création d'un plugin d'import/export au format XML. +-Avancement plugin BigHashMap / BigHashMapV2. +-Commencement (tentative de création) d'un plugin HBase. + +JAXX +---- + +-Internationalisation fonctionelle à 100%. +-Message d'erreur dynamique. +-Ajouts d'images. +-Visualisation du contenu d'une table. +-Chargment de plugins. +-CheckStyle respecté. + +Objectifs de le la semaine prochaine +------------------------------------ + +Voir RAF + +RAF (Reste à faire) +------------------- + +-H/J sur le planning. (Amaury) +-Estimation avec JTimer sur le temps passé sur les taches. (Amaury) +-Rendre plus générique le loader de plugin (BigTableLoader -> PluginLoader). (Gilles) +-Le plugin (exemple : import/export) doit pouvoir rajouter des entrées dans le menu. (Dorian) +-Adapter l'affichage de la table à la largeur de la fenêtre. (Florent) +-Developpement et test d'un plugin HBase. (Gilles) +-Developpement et test d'un plugin de monitoring (espace occupé / espace restant). (Florent) +-Rapport globale et diaporama soutenance. (Amaury) +-Refactoring. (Tout le monde) + + + + +

1 0

r182 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm/src/main/resources/i18n src/site/doc/analyse
by fgilet＠users.nuiton.org March 4, 2010

March 4, 2010

Author: fgilet Date: 2010-03-04 10:32:29 +0100 (Thu, 04 Mar 2010) New Revision: 182 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/src/site/doc/analyse/usecase.rst Log: Modif diverses suite ?\195?\160 la r?\195?\169union Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-04 09:32:29 UTC (rev 182) @@ -71,13 +71,11 @@ #menuPluginLoad { text:"mapstoragemanager.action.pluginload"; toolTipText:"mapstoragemanager.action.pluginload.tip"; - actionIcon:"config"; } #menuPluginShow { text:"mapstoragemanager.action.pluginshow"; toolTipText:"mapstoragemanager.action.pluginshow.tip"; - actionIcon:"config"; } #menuHelp { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-04 09:32:29 UTC (rev 182) @@ -142,7 +142,6 @@ <JSeparator/> <JMenuItem id='menuPluginShow' onActionPerformed='engine.doSomething()'/> - <JSeparator/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 09:32:29 UTC (rev 182) @@ -128,7 +128,7 @@ // ui.getNameBase().re // bigTable = btl.getBigTable("BigHashMapV2"); -//// bigTable = new OurHashMap2(); +// bigTable = new OurHashMap2(); // bigTable.createTable("table1"); // bigTable.createTable("table2"); // bigTable.createColumn("table1", "column1"); Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-04 09:32:29 UTC (rev 182) @@ -1,46 +1,46 @@ -Empty=Empty -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.plugin= -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload= -mapstoragemanager.action.pluginload.tip= -mapstoragemanager.action.pluginshow= -mapstoragemanager.action.pluginshow.tip= -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=Load +mapstoragemanager.action.pluginload.tip=Load plugins +mapstoragemanager.action.pluginshow=Show +mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-04 09:32:29 UTC (rev 182) @@ -1,46 +1,46 @@ -Empty=Vide -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.plugin= -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload= -mapstoragemanager.action.pluginload.tip= -mapstoragemanager.action.pluginshow= -mapstoragemanager.action.pluginshow.tip= -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Permet de configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer +mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier +mapstoragemanager.action.pluginshow=Lister +mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager Modified: trunk/src/site/doc/analyse/usecase.rst =================================================================== --- trunk/src/site/doc/analyse/usecase.rst 2010-03-04 02:19:58 UTC (rev 181) +++ trunk/src/site/doc/analyse/usecase.rst 2010-03-04 09:32:29 UTC (rev 182) @@ -93,7 +93,7 @@ ------- - Use case : 3.Monitor -- Goal in context : +- Goal in context : surveiller la base de sorte à vérifier l'activité des noeuds (charge, espace disque...) - Scope : MSM - GUI/IHM - Level : fonctionnalité - Primary actor : utilisateur de MSM @@ -118,6 +118,7 @@ Import ------ +(XPP3, DOM4J) - Use case : 4.Import - Goal in context : importer des données dans une base de données @@ -144,11 +145,11 @@ 6) MSM renvoie le résultat de l'importation à l'utilisateur 7) L'utilisateur traite les données de la base - Extensions : -- Performance : la rapidité d'exécution n'est pas primordiale. On priviligie -la qualité avec une fiabilité haute. +- Performance : la rapidité d'exécution est primordiale (le volume de données étant assez élevé). +On priviligie la qualité avec une fiabilité haute. - Open issues : Que faire si erreur lors du traitement du fichier ? +=> Reporter l'erreur à l'utilisateur. - Importer des données dans une base via des fichiers XML. -> Nécéssite la création d'un XSD ou DTD. @@ -177,8 +178,8 @@ 5) MSM crée le fichier 6) MSM réalise l'exportation dans le fichier - Extensions : -- Performance : la rapidité d'exécution n'est pas primordiale. On priviligie -la qualité avec une fiabilité haute. +- Performance : la rapidité d'exécution est primordiale (le volume de données étant assez élevé). +On priviligie la qualité avec une fiabilité haute. - Open issues : Que faire si erreur lors de transmission des données dans le fichier ? @@ -229,7 +230,7 @@ - Trigger : le développeur veut ajouter une nouvelle base dans MSM - Frequency : peu souvent 1/semaine - Pre-conditions : - PRE1 : le développeur dispose des interfaces MSM + PRE1 : le développeur dispose des API MSM - Post-conditions : POST1 : la base de données développée est utilisable dans MSM - Main success scenario :

1 0

r181 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 03:19:58 +0100 (Thu, 04 Mar 2010) New Revision: 181 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java Log: Modifications mineures pour la qualit?\195?\169. Cr?\195?\169ation d'une m?\195?\169thode updateNavigationTree(...) pour s?\195?\169parer cette fonctionnalit?\195?\169 de connection() sur ApplicationEngine. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 02:19:58 UTC (rev 181) @@ -63,7 +63,7 @@ * Load a plugin. * @param file the plugin file. */ - public void loadPlugin(final File file) { + public final void loadPlugin(final File file) { LOG.info("Load plugin : " + file.getAbsolutePath()); if (file.getAbsolutePath().endsWith(".jar")) { try { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 02:19:58 UTC (rev 181) @@ -36,22 +36,19 @@ * Logger. */ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); - /** * BigTable. */ private BigTable bigTable; - - /** + /** * classe instance (singleton pattern). */ - private static ApplicationEngine instance = null; - + private static ApplicationEngine instance = null; /** * BigtableLoader. */ private static BigTableLoader btl; - + /** * Constructor. */ @@ -90,11 +87,15 @@ JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); - switch(jfc.showOpenDialog(MainUI.getFrames()[0])) { - case JFileChooser.CANCEL_OPTION : return; - case JFileChooser.ERROR_OPTION : return; - case JFileChooser.APPROVE_OPTION : break; - default : break; + switch (jfc.showOpenDialog(MainUI.getFrames()[0])) { + case JFileChooser.CANCEL_OPTION: + return; + case JFileChooser.ERROR_OPTION: + return; + case JFileChooser.APPROVE_OPTION: + break; + default: + break; } File pluginPath = jfc.getSelectedFile(); @@ -106,7 +107,7 @@ + "pluginPath : " + pluginPath.getAbsolutePath()); // try { - btl.loadPlugin(pluginPath); + btl.loadPlugin(pluginPath); // bigTableLoader = // new BigTableLoader(pluginPath.getPath(), // this.getClass().getClassLoader()); @@ -166,31 +167,31 @@ Main.setLocale(locale); } - /** + /** * Show toolBar in order to connect. */ - public void showToolBar() { + public void showToolBar() { MainUI ui = MainUI.getInstance(); ui.getToolBar().setVisible(true); - } + } - /** + /** * Hide toolBar in order to disconnect. */ - public void disposeToolBar() { - MainUI ui = MainUI.getInstance(); - ui.getToolBar().setVisible(false); - clean(ui); - } + public void disposeToolBar() { + MainUI ui = MainUI.getInstance(); + ui.getToolBar().setVisible(false); + clean(ui); + } - /** - * Clean the application. - * @param ui application's ui - */ - public void clean(final MainUI ui) { + /** + * Clean the application. + * @param ui application's ui + */ + public void clean(final MainUI ui) { ui.getNavigation().removeAll(); ui.getNavigation().setModel(ui.getModelTree()); - } + } /** * Try to connect the user to a database. @@ -203,16 +204,19 @@ ui.getMenuDisconnect().setEnabled(true); Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); - String nameBase = selectedItems.getValue().toString(); - String login = ui.getLogin().getText(); - char[] password = ui.getPassword().getPassword(); + String nameBase = selectedItems.getValue().toString(); + String login = ui.getLogin().getText(); + char[] password = ui.getPassword().getPassword(); - if (nameBase.equals("OurHashMap")) { + LOG.info("nameBase: " + nameBase + + " login: " + login + + " mdp: " + password); + if ("OurHashMap".equals(nameBase)) { bigTable = new OurHashMap2(); } else { bigTable = btl.getBigTable(nameBase); } -// bigTable = new OurHashMap2(); + { bigTable.createTable("table1"); bigTable.createTable("table2"); @@ -240,38 +244,33 @@ goodUse = bigTable.connect(new Properties()); if (goodUse) { + //update tree - JTree tree = ui.getNavigation(); - tree.setModel(new MSMModel(nameBase)); - tree.addTreeSelectionListener(new MSMNavigationListener()); - - TreeModel model = tree.getModel(); - DefaultMutableTreeNode root; - root = (DefaultMutableTreeNode) model.getRoot(); - DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); - Set<String> tableNames = bigTable.getTablesNames(); - Iterator i = tableNames.iterator(); - while (i.hasNext()) { - - //display the node table - String tableName = (String) i.next(); - DefaultMutableTreeNode tableNameInsert; - tableNameInsert = new DefaultMutableTreeNode(tableName); - dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); - - //display the node column - Set<String> columnNames = bigTable.getColumnsNames(tableName); - Iterator i2 = columnNames.iterator(); - while (i2.hasNext()) { - String columnName = (String) i2.next(); - DefaultMutableTreeNode columnNameToInsert; - columnNameToInsert = new DefaultMutableTreeNode(columnName); - dtm.insertNodeInto(columnNameToInsert, tableNameInsert, - tableNameInsert.getChildCount()); - } - - - } + uptableNavigationTree(ui.getNavigation(), nameBase); +// JTree tree = ui.getNavigation(); +// tree.setModel(new MSMModel(nameBase)); +// tree.addTreeSelectionListener(new MSMNavigationListener()); +// +// TreeModel model = tree.getModel(); +// DefaultMutableTreeNode root; +// root = (DefaultMutableTreeNode) model.getRoot(); +// DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); +// +// //display the node table +// for (String tableName : bigTable.getTablesNames()) { +// DefaultMutableTreeNode tableNameInsert; +// tableNameInsert = new DefaultMutableTreeNode(tableName); +// dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); +// +// //display the node column +// for (String columnName : bigTable.getColumnsNames(tableName)) { +// DefaultMutableTreeNode columnNameToInsert; +// columnNameToInsert = new DefaultMutableTreeNode(columnName); +// dtm.insertNodeInto(columnNameToInsert, tableNameInsert, +// tableNameInsert.getChildCount()); +// } +// +// } String connexionOk = _("connectionValid"); ui.displayMessage(connexionOk, 0); ui.getNavigation().repaint(); @@ -297,8 +296,8 @@ } /** - * Dispose engine. - */ + * Dispose engine. + */ public void dispose() { instance = null; } @@ -328,7 +327,7 @@ } if (Desktop.isDesktopSupported() - && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { Desktop.getDesktop().browse(siteURL.toURI()); } catch (Exception ex) { @@ -351,9 +350,7 @@ JOptionPane.showMessageDialog(null, message); } - //GETTERS AND SETTERS - /** * Getter BigTable. * @return the application engine's bigtable. @@ -366,11 +363,46 @@ * Setter BigTable. * @param bigTable the bigtable to use. */ - public void setBigTable(final BigTable bigTable) { + public void setBigTable(final BigTable bigTable) { this.bigTable = bigTable; } - public BigTableLoader getBigTableLoader(){ - return btl; - } + /** + * Get the bigTableLoader. + * @return return the bigTableLoader. + */ + public BigTableLoader getBigTableLoader() { + return btl; + } + + /** + * update the navigationTree. + * @param tree the navigationTree. + * @param nameBase the name of the base. + */ + private void uptableNavigationTree(JTree tree, String nameBase) { + tree.setModel(new MSMModel(nameBase)); + tree.addTreeSelectionListener(new MSMNavigationListener()); + + TreeModel model = tree.getModel(); + DefaultMutableTreeNode root; + root = (DefaultMutableTreeNode) model.getRoot(); + DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); + + //display the node table + for (String tableName : bigTable.getTablesNames()) { + DefaultMutableTreeNode tableNameInsert; + tableNameInsert = new DefaultMutableTreeNode(tableName); + dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); + + //display the node column + for (String columnName : bigTable.getColumnsNames(tableName)) { + DefaultMutableTreeNode columnNameToInsert; + columnNameToInsert = new DefaultMutableTreeNode(columnName); + dtm.insertNodeInto(columnNameToInsert, tableNameInsert, + tableNameInsert.getChildCount()); + } + + } + } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-04 02:19:58 UTC (rev 181) @@ -2,12 +2,11 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package org.nuiton.mapstoragemanager.ui.gui; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.JLabel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.ui.MainUI; /** @@ -16,26 +15,31 @@ */ public class MessageThread extends Thread { - /** - * Constructor. - */ - public MessageThread() { - super(); - } + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(MessageThread.class); - @Override - public void run() { - MainUI ui = MainUI.getInstance(); - try { - this.sleep(5000); - ui.getMessagesPanel().removeAll(); - ui.getMessagesPanel().add(new JLabel(" ")); - ui.getMessagesPanel().repaint(); - ui.getMessagesPanel().revalidate(); - } catch (InterruptedException ex) { - Logger.getLogger(MessageThread.class.getName()).log(Level.SEVERE, null, ex); - } + /** + * Constructor. + */ + public MessageThread() { + super(); + } + @Override + public void run() { + MainUI ui = MainUI.getInstance(); + try { + sleep(5000); + ui.getMessagesPanel().removeAll(); + ui.getMessagesPanel().add(new JLabel(" ")); + ui.getMessagesPanel().repaint(); + ui.getMessagesPanel().revalidate(); + } catch (InterruptedException ex) { + LOG.error(ex, ex); } + + } } 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-03-04 00:33:29 UTC (rev 180) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-04 02:19:58 UTC (rev 181) @@ -112,11 +112,13 @@ @Override public final String get(final String table, final String column, final String key) { + String ret = null; try { - return this.tables.get(table).get(column, key).toString(); + ret = this.tables.get(table).get(column, key).toString(); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** @@ -125,11 +127,13 @@ @Override public final String get(final String table, final String column, final String key, final int version) { + String ret = null; try { - return this.tables.get(table).get(column, key, version).toString(); + ret = this.tables.get(table).get(column, key, version).toString(); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-04 02:19:58 UTC (rev 181) @@ -112,11 +112,13 @@ @Override public final String get(final String table, final String column, final String key) { + String ret = null; try { - return this.tables.get(table).get(column, key); + ret = this.tables.get(table).get(column, key); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** @@ -125,11 +127,13 @@ @Override public final String get(final String table, final String column, final String key, final int version) { + String ret = null; try { - return this.tables.get(table).get(column, key, version); + ret = this.tables.get(table).get(column, key, version); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-04 02:19:58 UTC (rev 181) @@ -7,7 +7,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.NoSuchElementException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r180 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/src/main/resources msm-hbase/src/main/resources
by dlanglais＠users.nuiton.org March 4, 2010

March 4, 2010

Author: dlanglais Date: 2010-03-04 01:33:29 +0100 (Thu, 04 Mar 2010) New Revision: 180 Removed: trunk/msm-bighashmap/src/main/resources/i18n/ trunk/msm-bighashmap/src/main/resources/log4j.properties trunk/msm-hbase/src/main/resources/i18n/ trunk/msm-hbase/src/main/resources/log4j.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Suppression de fichiers inutiles (i18n et log4j.properties dans les modules msm-bighashmap et msm-hbase). BigTableLoader -> lors du chargement d'un plugin par son fichier oubli de l'ajouter au bigTableSetLoader... Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 00:33:29 UTC (rev 180) @@ -72,6 +72,10 @@ LOG.error(e.toString(), e); } } + bigTableSetLoader = ServiceLoader.load(BigTable.class, this); + for (BigTable bigTableImpl : bigTableSetLoader) { + plugins.put(bigTableImpl.getPluginName(), bigTableImpl); + } } /** Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 00:33:29 UTC (rev 180) @@ -90,7 +90,12 @@ JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); - jfc.showOpenDialog(MainUI.getFrames()[0]); + switch(jfc.showOpenDialog(MainUI.getFrames()[0])) { + case JFileChooser.CANCEL_OPTION : return; + case JFileChooser.ERROR_OPTION : return; + case JFileChooser.APPROVE_OPTION : break; + default : break; + } File pluginPath = jfc.getSelectedFile(); Deleted: trunk/msm-bighashmap/src/main/resources/log4j.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/log4j.properties 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm-bighashmap/src/main/resources/log4j.properties 2010-03-04 00:33:29 UTC (rev 180) @@ -1,14 +0,0 @@ -# Global logging configuration -#log4j.rootLogger=ERROR, stdout, file -log4j.rootLogger=INFO, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=mapstoragemanager.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.mapstoragemanager=DEBUG Deleted: trunk/msm-hbase/src/main/resources/log4j.properties =================================================================== --- trunk/msm-hbase/src/main/resources/log4j.properties 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm-hbase/src/main/resources/log4j.properties 2010-03-04 00:33:29 UTC (rev 180) @@ -1,14 +0,0 @@ -# Global logging configuration -#log4j.rootLogger=ERROR, stdout, file -log4j.rootLogger=INFO, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=mapstoragemanager.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.mapstoragemanager=DEBUG

1 0