Author: dlanglais Date: 2010-03-18 15:09:27 +0100 (Thu, 18 Mar 2010) New Revision: 260 Log: Am?\195?\169lioration BootLoaderManager. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 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/engine/ApplicationEngine.java 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/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -66,6 +66,8 @@ LOG.error(ex, ex); } + this.getBootLoaderPanel().removeAll(); + /** * For each Jar file */ @@ -74,7 +76,7 @@ final String propertyValue = properties.getProperty(propertyName); LOG.info(propertyName + " : " + propertyValue); - final JCheckBox checkBox = new JCheckBox(); + final JCheckBox checkBox = new JCheckBox(propertyName); /** If propertyValue equals true, checkBox selected, * else not selected. */ @@ -101,13 +103,7 @@ } }); - final JLabel label = new JLabel(propertyName); - - final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - panel.add(checkBox); - panel.add(label); - - this.getBootLoaderPanel().add(panel); + this.getBootLoaderPanel().add(checkBox); } } @@ -122,13 +118,11 @@ <!-- content --> <JMenuBar> <JMenu id='menuPlugin'> - <JMenuItem id='menuPluginLoad' - onActionPerformed='this.loadAPlugin()' /> <JMenuItem id='refreshJarList' onActionPerformed='this.refreshJarList()' /> </JMenu> </JMenuBar> - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> </JPanel> </Application> \ No newline at end of file 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-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 14:09:27 UTC (rev 260) @@ -95,6 +95,17 @@ mnemonic:O; } +#menuPluginBootLoaderManager { + text:"mapstoragemanager.action.pluginbootloadermanager"; + toolTipText:"mapstoragemanager.action.pluginbootloadermanager.tip"; +} + +#refreshJarList { + text:"bootloadermanager.refreshJarList"; +} + + + #menuHelp { text:"mapstoragemanager.action.menuHelp"; toolTipText:"mapstoragemanager.action.menuHelp.tip"; 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-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -154,9 +154,9 @@ onActionPerformed='engine.loadAPlugin()'/> <JMenuItem id='menuPluginSave' onActionPerformed='engine.savePlugin()'/> - <JSeparator/> <JMenuItem id='menuPluginBootLoaderManager' onActionPerformed='BootLoaderManager.getInstance().setVisible(true)'/> + <JSeparator/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 14:09:27 UTC (rev 260) @@ -14,15 +14,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFileChooser; @@ -43,7 +40,6 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=Load plugins mapstoragemanager.action.pluginsave=Handle plugin save mapstoragemanager.action.pluginsave.tip=Handle plugin save +mapstoragemanager.action.pluginbootloadermanager=Manage plugins jar loaded at startup +mapstoragemanager.action.pluginbootloadermanager.tip=Manage plugins jar loaded at startup +bootLoaderManager.refreshJarList=Refresh plugin list mapstoragemanager.action.preferences=Preferences mapstoragemanager.action.preferences.tip= mapstoragemanager.action.uk=English Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier mapstoragemanager.action.pluginsave=G\u00E9rer sauvegarde mapstoragemanager.action.pluginsave.tip=G\u00E8re la sauvegarde des plugins au relancement de l'application +mapstoragemanager.action.pluginbootloadermanager=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +mapstoragemanager.action.pluginbootloadermanager.tip=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +bootLoaderManager.refreshJarList=Rafraichir la liste des plugins mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences mapstoragemanager.action.preferences.tip=Configurer l'application mapstoragemanager.action.uk=Anglais