From dlanglais@users.nuiton.org Thu Mar  4 00:30:52 2010
From: dlanglais@users.nuiton.org
To: mapstoragemanager-commits@list.nuiton.org
Subject: [Mapstoragemanager-commits] r179 - in trunk: .
	msm/src/main/java/org/nuiton/mapstoragemanager/core
	msm/src/main/java/org/nuiton/mapstoragemanager/ui
	msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
Date: Thu, 04 Mar 2010 00:30:52 +0100
Message-ID: <20100303233052.0571C15D33@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0779673980072405052=="

--===============0779673980072405052==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: dlanglais
Date: 2010-03-04 00:30:50 +0100 (Thu, 04 Mar 2010)
New Revision: 179

Added:
   trunk/plugins/
Modified:
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.j=
ava
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEng=
ine.java
Log:
Au d?\195?\169marrage de msm :
 - Chargement des plugins se trouvant dans le dossier "plugins" ?\195?\160 la=
 racine du projet.

En cours d'utilisation :
 - Possibilit?\195?\169 de charger un plugin.

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableL=
oader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.=
java	2010-03-03 22:09:37 UTC (rev 178)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.=
java	2010-03-03 23:30:50 UTC (rev 179)
@@ -49,13 +49,7 @@
             classLoader);
=20
         for (File file : new File(pluginsFolderPath).listFiles()) {
-            if (file.getAbsolutePath().endsWith(".jar")) {
-                try {
-                    this.addURL(file.toURI().toURL());
-                } catch (MalformedURLException e) {
-                    LOG.error(e.toString(), e);
-                }
-            }
+            loadPlugin(file);
         }
=20
         bigTableSetLoader =3D ServiceLoader.load(BigTable.class, this);
@@ -66,6 +60,21 @@
     }
=20
     /**
+     * Load a plugin.
+     * @param file the plugin file.
+     */
+    public 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);
+            }
+        }
+    }
+
+    /**
      * Returns a string displaying all the available BigTable implementation=
s.
      * @return a string displaying all the available BigTable implementations
      */

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-=
03-03 22:09:37 UTC (rev 178)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-=
03-03 23:30:50 UTC (rev 179)
@@ -4,98 +4,106 @@
     <!-- include java files for treatment -->
     <script>
 	<![CDATA[
-            import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
-            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.ui.gui.MessageThread;
+        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;
=20
=20
-            ApplicationEngine engine =3D ApplicationEngine.getInstance();
+        ApplicationEngine engine =3D ApplicationEngine.getInstance();
=20
-            /**
-             * classe instance (singleton pattern).
-             */
-            private static MainUI instance =3D null;
+        /**
+         * classe instance (singleton pattern).
+         */
+        private static MainUI instance =3D null;
=20
-            /**
-             * getInstance method (singleton pattern).
-             * @return instance of the class
-             */
-            public static MainUI getInstance() {
-                    if (instance =3D=3D null){
-                            instance =3D new MainUI();
-                    }
-                    return instance;
+        /**
+         * getInstance method (singleton pattern).
+         * @return instance of the class
+         */
+        public static MainUI getInstance() {
+            if (instance =3D=3D null){
+                instance =3D new MainUI();
+                for (BigTable btPlugin : instance.getEngine().getBigTableLoa=
der().getAllBigTable()) {
+                    String btName =3D btPlugin.getPluginName();
+                    jaxx.runtime.swing.Item bigTableItem =3D
+                    new jaxx.runtime.swing.Item(btName, null, btName, true);
+                    instance.getNameBase().addItem(bigTableItem);
+                }
             }
+            return instance;
+        }
=20
-            /**
-            * 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;
+        }
=20
-            /**
-            * 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);
+        }
=20
-            /**
-            * Dispose UI.
-            */
-            public void dispose(){
-                instance =3D null;
-                engine.dispose();
-                this.setVisible(false);
+        /**
+        * Dispose UI.
+        */
+        public void dispose(){
+            instance =3D 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){
+
+            //clear the message panel
+            this.getMessagesPanel().removeAll();
+
+            //display message
+             if (code=3D=3D0){
+                String icon =3D"ok_16";
+            }else if (code=3D=3D1){
+                 String icon =3D"warning_16.png";
+            }else if (code=3D=3D2){
+                 String icon =3D"cancel_16.png";
             }
=20
-            /**
-            * Display the appropriate message.
-            * @param message the message to display.
-            * @param code code error (for images).
-            */
-            public void displayMessage(String message, int code){
-               =20
-                //clear the message panel
-                this.getMessagesPanel().removeAll();
+            JLabel label =3D new JLabel(message);
+            label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_=
16"));
+            this.getMessagesPanel().add(label);
+            this.getMessagesPanel().repaint();
+            this.getMessagesPanel().revalidate();
=20
-                //display message
-                 if (code=3D=3D0){
-                    String icon =3D"ok_16";
-                }else if (code=3D=3D1){
-                     String icon =3D"warning_16.png";
-                }else if (code=3D=3D2){
-                     String icon =3D"cancel_16.png";
-                }
+            //remove message after a short time
+            MessageThread m =3D new MessageThread();
+            m.start();
=20
-                JLabel label =3D new JLabel(message);
-                label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon(=
"ok_16"));
-                this.getMessagesPanel().add(label);
-                this.getMessagesPanel().repaint();
-                this.getMessagesPanel().revalidate();
+        }
=20
-                //remove message after a short time
-                MessageThread m =3D new MessageThread();
-                m.start();
-               =20
-            }
+        /**
+        * Test.
+        */
+        public DefaultTreeModel getModelTree(){
+            n_("Empty");
+            return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"=
)));
+        }
=20
-            /**
-            * Test.
-            */
-            public DefaultTreeModel getModelTree(){
-                n_("Empty");
-                return new DefaultTreeModel(new DefaultMutableTreeNode(_("Em=
pty")));
-            }
=20
-
 	]]>
     </script>
=20

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/Applica=
tionEngine.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEn=
gine.java	2010-03-03 22:09:37 UTC (rev 178)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEn=
gine.java	2010-03-03 23:30:50 UTC (rev 179)
@@ -22,8 +22,6 @@
 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.OurHashMap2;
 import org.nuiton.mapstoragemanager.ui.MainUI;
 import static org.nuiton.i18n.I18n._;
@@ -52,12 +50,27 @@
     /**
      * BigtableLoader.
      */
-    private static BigTableLoader bigTableLoader;
+    private static BigTableLoader btl;
    =20
     /**
      * Constructor.
      */
     private ApplicationEngine() {
+        try {
+            String basedir =3D new File("").getAbsolutePath();
+            File msnBasedir =3D new File(basedir).getParentFile();
+            String toPlugin =3D "plugins/";
+            String pluginsFolderPath =3D new File(msnBasedir, toPlugin).getP=
ath();
+
+            LOG.info("basedir : " + basedir + '\n'
+                + "msnBasedir : " + msnBasedir + '\n'
+                + "pluginsFolderPath : " + pluginsFolderPath);
+
+            btl =3D new BigTableLoader(pluginsFolderPath,
+                this.getClass().getClassLoader());
+        } catch (MalformedURLException ex) {
+            LOG.error(ex, ex);
+        }
     }
=20
     /**
@@ -73,38 +86,38 @@
=20
         String basedir =3D new File("").getAbsolutePath();
         File msnBasedir =3D new File(basedir).getParentFile();
+//        String toPlugin =3D "msm-bighashmapV2/target/";
         JFileChooser jfc =3D new javax.swing.JFileChooser(msnBasedir);
-        String toPlugin =3D "msm-bighashmapV2/target/";
         jfc.getSelectedFiles();
 //        File pluginPath =3D new File(msnBasedir, toPlugin);
         jfc.showOpenDialog(MainUI.getFrames()[0]);
=20
-        File pluginPath =3D jfc.getSelectedFile().getParentFile();
+        File pluginPath =3D jfc.getSelectedFile();
=20
 //        BigTableLoader btl =3D null;
=20
         LOG.info("basedir : " + basedir + '\n'
-            + "msnBbasedir : " + msnBasedir + '\n'
-            + "pluginPath : " + pluginPath.getPath());
+            + "msnBasedir : " + msnBasedir + '\n'
+            + "pluginPath : " + pluginPath.getAbsolutePath());
=20
-        try {
-            bigTableLoader =3D
-                new BigTableLoader(pluginPath.getPath(),
-                this.getClass().getClassLoader());
-        } catch (MalformedURLException ex) {
-            LOG.fatal(ex, ex);
-        }
+//        try {
+            btl.loadPlugin(pluginPath);
+//            bigTableLoader =3D
+//                new BigTableLoader(pluginPath.getPath(),
+//                this.getClass().getClassLoader());
+//        } catch (MalformedURLException ex) {
+//            LOG.fatal(ex, ex);
+//        }
=20
-        LOG.info("getBigtable() : " + bigTableLoader.getBigTable());
+        LOG.info("getBigtable() : " + btl.getBigTable());
=20
         MainUI ui =3D MainUI.getInstance();
-        for (BigTable btPlugin : bigTableLoader.getAllBigTable()) {
+        for (BigTable btPlugin : btl.getAllBigTable()) {
             String btName =3D btPlugin.getPluginName();
             jaxx.runtime.swing.Item bigTableItem =3D
                 new jaxx.runtime.swing.Item(btName, null, btName, true);
             ui.getNameBase().addItem(bigTableItem);
             ui.getNameBase().setSelectedItem(bigTableItem);
-               =20
         }
 //        ui.getNameBase().re
=20
@@ -192,7 +205,7 @@
         if (nameBase.equals("OurHashMap")) {
             bigTable =3D new OurHashMap2();
         } else {
-            bigTable =3D bigTableLoader.getBigTable(nameBase);
+            bigTable =3D btl.getBigTable(nameBase);
         }
 //        bigTable =3D new OurHashMap2();
         {
@@ -273,7 +286,7 @@
      */
     public static ApplicationEngine getInstance() {
         if (instance =3D=3D null) {
-                instance =3D new ApplicationEngine();
+            instance =3D new ApplicationEngine();
         }
         return instance;
     }
@@ -352,4 +365,7 @@
         this.bigTable =3D bigTable;
     }
=20
+     public BigTableLoader getBigTableLoader(){
+         return btl;
+     }
 }


--===============0779673980072405052==--