Author: dlanglais Date: 2010-03-25 14:33:31 +0100 (Thu, 25 Mar 2010) New Revision: 275 Log: Finition du BootLoaderManager (gestion de chargement des plugins au d?\195?\169marrage). Added: trunk/VCardsXPP3.xml Modified: trunk/msm-fromtoXPP3/src/test/resources/sixCells.xml 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/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Added: trunk/VCardsXPP3.xml =================================================================== --- trunk/VCardsXPP3.xml (rev 0) +++ trunk/VCardsXPP3.xml 2010-03-25 13:33:31 UTC (rev 275) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<database> + + <describe> + <table tableName="Members"> + <column columnName="name"/> + <column columnName="firstname"/> + <column columnName="birthdate"/> + <column columnName="addressID"/> + </table> + <table tableName="Addresses"> + <column columnName="number"/> + <column columnName="street"/> + <column columnName="postalcode"/> + <column columnName="city"/> + </table> + </describe> + + <insert> + + <!-- Members --> + + <element table="Members" column="name" key="1" version="1" value="Crieloue" /> + <element table="Members" column="name" key="2" version="1" value="Fages" /> + <element table="Members" column="name" key="3" version="1" value="Gilet" /> + <element table="Members" column="name" key="4" version="1" value="Langlais" /> + + <element table="Members" column="firstname" key="1" version="1" value="Gilles" /> + <element table="Members" column="firstname" key="2" version="1" value="Amaury" /> + <element table="Members" column="firstname" key="3" version="1" value="Florent" /> + <element table="Members" column="firstname" key="4" version="1" value="Dorian" /> + + <!--element table="Members" column="birthdate" key="1" version="1" value="" /--> + <!--element table="Members" column="birthdate" key="2" version="1" value="Amaury" /--> + <element table="Members" column="birthdate" key="3" version="1" value="07/09/1986" /> + <element table="Members" column="birthdate" key="4" version="1" value="07/08/1987" /> + + <element table="Members" column="addressID" key="1" version="1" value="1" /> + <element table="Members" column="addressID" key="2" version="1" value="2" /> + <element table="Members" column="addressID" key="3" version="1" value="3" /> + <element table="Members" column="addressID" key="4" version="1" value="4" /> + + <!-- Addresses --> + + <element table="Addresses" column="number" key="1" version="1" value="1" /> + <element table="Addresses" column="number" key="1" version="1" value="2" /> + <element table="Addresses" column="number" key="1" version="1" value="3" /> + <element table="Addresses" column="number" key="1" version="1" value="4" /> + + <element table="Addresses" column="street" key="2" version="1" value="rue de la Paix" /> + <element table="Addresses" column="street" key="2" version="1" value="avenue des Champs Élysées" /> + <element table="Addresses" column="street" key="2" version="1" value="place de la Bourse" /> + <element table="Addresses" column="street" key="2" version="1" value="boulevard Michelet" /> + + <element table="Addresses" column="postalcode" key="3" version="1" value="44300" /> + <element table="Addresses" column="postalcode" key="3" version="1" value="44800" /> + <element table="Addresses" column="postalcode" key="3" version="1" value="44230" /> + <element table="Addresses" column="postalcode" key="3" version="1" value="44000" /> + + <element table="Addresses" column="city" key="4" version="1" value="Nantes" /> + <element table="Addresses" column="city" key="4" version="1" value="Saint Herblain" /> + <element table="Addresses" column="city" key="4" version="1" value="Saint Sebastien" /> + <element table="Addresses" column="city" key="4" version="1" value="Nantes" /> + </insert> + +</database> + 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-25 12:15:59 UTC (rev 274) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-25 13:33:31 UTC (rev 275) @@ -1,4 +1,4 @@ -<Application id='bootLoaderManager' width='640' height='480' onWindowClosing='getInstance().setVisible(false)'> +<Application id='bootLoaderManager' onWindowClosing='quit()'> <!-- include java files for treatment --> <script> @@ -11,6 +11,11 @@ private static final Log LOG = LogFactory.getLog(BootLoaderManager.class); /** + * Map beetween name shown and propertyName. + */ +private static final Map<String, String> mapPlugins = new HashMap<String, String>(); + +/** * classe instance (singleton pattern). */ private static BootLoaderManager instance = null; @@ -25,6 +30,7 @@ } instance.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); instance.refreshJarList(); + instance.pack(); return instance; } @@ -72,12 +78,17 @@ * For each Jar file */ for (final String propertyName : properties.stringPropertyNames()) { - if(propertyName.endsWith(".jar")) { - final String propertyValue = properties.getProperty(propertyName); - LOG.info(propertyName + " : " + propertyValue); +// if(propertyName.endsWith(".jar")) { - final JCheckBox checkBox = new JCheckBox(propertyName); + final int lastIndex = propertyName.lastIndexOf('/') + 1; + final String shortCut = propertyName.substring(lastIndex); + mapPlugins.put(shortCut, propertyName); + final String propertyValue = properties.getProperty(mapPlugins.get(shortCut)); + LOG.info(mapPlugins.get(shortCut) + " : " + propertyValue); + + final JCheckBox checkBox = new JCheckBox(shortCut); + /** If propertyValue equals true, checkBox selected, * else not selected. */ final boolean selected = "true".equals(propertyValue); @@ -89,7 +100,7 @@ /** Invert selected State */ selectedState = !selectedState; /** Modify properties */ - properties.put(propertyName, Boolean.toString(selectedState)); + properties.put(mapPlugins.get(shortCut), Boolean.toString(selectedState)); try { FileOutputStream fos = new FileOutputStream(propertiesFile); /** Store modified properties */ @@ -104,16 +115,25 @@ }); this.getBootLoaderPanel().add(checkBox); - } +// } } this.getBootLoaderPanel().updateUI(); } + +/** + * Quit the BootLoaderManager. + * Close the frame. + */ +public void quit() { + getInstance().setVisible(false); +} + ]]> </script> <!-- style definition --> - <style source='MainUI.css'/> + <style source='BootLoaderManager.css'/> <!-- content --> <JMenuBar> @@ -123,6 +143,7 @@ </JMenu> </JMenuBar> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> + <VBox id='bootLoaderPanel' /> + <JButton id='quit' constraints='BorderLayout.SOUTH' onActionPerformed='this.quit()'/> </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-25 12:15:59 UTC (rev 274) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-25 13:33:31 UTC (rev 275) @@ -35,7 +35,7 @@ mnemonic:E; } -#menuConnect, #menuConnectBis { +#menuConnect { text:"mapstoragemanager.action.connect"; toolTipText:"mapstoragemanager.action.connect.tip"; actionIcon:"connect"; @@ -49,14 +49,14 @@ mnemonic:D; } -#menuImport, #menuImportBis { +#menuImport { text:"mapstoragemanager.action.import"; toolTipText:"mapstoragemanager.action.import.tip"; actionIcon:"databaseImport_16"; mnemonic:I; } -#menuExport, #menuExportBis { +#menuExport { text:"mapstoragemanager.action.export"; toolTipText:"mapstoragemanager.action.export.tip"; actionIcon:"databaseExport_16"; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-25 12:15:59 UTC (rev 274) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-25 13:33:31 UTC (rev 275) @@ -71,4 +71,6 @@ exportUnsuccessfull.JOptionPaneMessage=An exception occured while export database. jFileChooser.exportBase.dialogTitle=Export the base to ... jFileChooser.importBase.dialogTitle=Import the base from ... -jFileChooser.loadAPlugin.dialogTitle=Load a plugin ... \ No newline at end of file +jFileChooser.loadAPlugin.dialogTitle=Load a plugin ... +bootLoaderManager.quit=Quit +bootLoaderManager.title=BootLoaderManager \ No newline at end of file Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-25 12:15:59 UTC (rev 274) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-25 13:33:31 UTC (rev 275) @@ -71,4 +71,6 @@ exportUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'export de la base. jFileChooser.exportBase.dialogTitle=Exporter la base dans ... jFileChooser.importBase.dialogTitle=Importer la base de ... -jFileChooser.loadAPlugin.dialogTitle=Charger un plugin ... \ No newline at end of file +jFileChooser.loadAPlugin.dialogTitle=Charger un plugin ... +bootLoaderManager.quit=Quitter +bootLoaderManager.title=Gestionnaire de d\u00E9marrage \ No newline at end of file Modified: trunk/msm-fromtoXPP3/src/test/resources/sixCells.xml =================================================================== --- trunk/msm-fromtoXPP3/src/test/resources/sixCells.xml 2010-03-25 12:15:59 UTC (rev 274) +++ trunk/msm-fromtoXPP3/src/test/resources/sixCells.xml 2010-03-25 13:33:31 UTC (rev 275) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<database> +<database> + <describe> <table tableName="table1"> <column columnName="column1"/> @@ -8,7 +9,8 @@ <column columnName="column2"/> <column columnName="column3"/> </table> - </describe> + </describe> + <insert> <element table="table1" column="column1" key="111" version="1" value="111" /> <element table="table2" column="column2" key="221" version="1" value="221" /> @@ -16,6 +18,7 @@ <element table="table2" column="column3" key="231" version="1" value="231" /> <element table="table2" column="column3" key="232" version="1" value="232" /> <element table="table2" column="column3" key="233" version="1" value="233" /> - </insert> + </insert> + </database>