Author: dlanglais Date: 2010-03-03 19:24:21 +0100 (Wed, 03 Mar 2010) New Revision: 177 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: J'arrive ?\195?\160 loader des plugin s'ils ont un META-INF (c'est temporaire mais pour le moment il faut donner le jar du plugin au lancement de l'appli). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-03 17:57:28 UTC (rev 176) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-03 18:24:21 UTC (rev 177) @@ -40,7 +40,7 @@ */ private Main(final String... args) { try { - I18n.setUniqueBundleName("mapstoragemanager-i18n"); + I18n.setUniqueBundleName("msm-i18n"); I18n.init(locale); 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-03 17:57:28 UTC (rev 176) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 18:24:21 UTC (rev 177) @@ -8,6 +8,7 @@ import java.util.Locale; import java.util.Properties; import java.util.Set; +import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; @@ -21,8 +22,8 @@ import org.nuiton.mapstoragemanager.MsmConfig; import org.nuiton.mapstoragemanager.core.BigTableLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; +//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; -//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -54,8 +55,13 @@ String basedir = new File("").getAbsolutePath(); File msnBasedir = new File(basedir).getParentFile(); - String toPlugin = "msm-bighashmapV2/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmapv2"; - File pluginPath = new File(msnBasedir, toPlugin); + JFileChooser jfc = new javax.swing.JFileChooser(); + String toPlugin = "msm-bighashmapV2/target/"; + jfc.getSelectedFiles(); +// File pluginPath = new File(msnBasedir, toPlugin); + jfc.showOpenDialog(MainUI.getFrames()[0]); + + File pluginPath = jfc.getSelectedFile().getParentFile(); BigTableLoader btl = null; @@ -65,7 +71,8 @@ try { btl = - new BigTableLoader(pluginPath.getPath(), this.getClass().getClassLoader()); + new BigTableLoader(pluginPath.getPath(), + this.getClass().getClassLoader()); } catch (MalformedURLException ex) { LOG.fatal(ex, ex); } @@ -73,7 +80,8 @@ LOG.info("getBigtable() : " + btl.getBigTable()); - bigTable = new OurHashMap2(); + bigTable = btl.getBigTable("BigHashMapV2"); +// bigTable = new OurHashMap2(); bigTable.createTable("table1"); bigTable.createTable("table2"); bigTable.createColumn("table1", "column1");