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();