[Mapstoragemanager-commits] r50 - in trunk: . src/main/java/org/nuiton/mapstoragemanager/ui src/main/java/org/nuiton/mapstoragemanager/ui/gui src/main/resources/i18n

Author: fgilet Date: 2010-02-02 15:46:08 +0100 (Tue, 02 Feb 2010) New Revision: 50 Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties Log: Transformation du pom : ajout des developpeurs et de la description du projet Jaxx : transformation du menu, tentative d'internationalisation (a r?\195?\169gler) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/pom.xml 2010-02-02 14:46:08 UTC (rev 50) @@ -65,7 +65,7 @@ <name>MapStorageManager</name> - <description>TODO</description> + <description>Creation of a graphic user interface for Hbase </description> <inceptionYear>2010</inceptionYear> <developers> @@ -89,6 +89,46 @@ <role>Développeur</role> </roles> </developer> + <developer> + <id>fgilet</id> + <name>Florent Gilet</name> + <email>florent.gilet@etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>gcrieloue</id> + <name>Gilles Crieloue</name> + <email>gilles.crieloue@etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>afages</id> + <name>Amaury Fages</name> + <email>amaury.fages@etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>dlanglais</id> + <name>Dorian langlais</name> + <email>dorain.langlais@etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> <!-- ************************************************************* --> Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-02-02 14:46:08 UTC (rev 50) @@ -23,6 +23,86 @@ resizable: true; } +#menuFile { + text:"mapstoragemanager.action.file"; + toolTipText:"mapstoragemanager.action.file.tip"; + mnemonic:F; +} + +#menuEdit { + text:"mapstoragemanager.action.edit"; + toolTipText:"mapstoragemanager.action.edit.tip"; + mnemonic:E; +} + +#menuConnect { + text:"mapstoragemanager.action.connect"; + toolTipText:"mapstoragemanager.action.connect.tip"; + mnemonic:C; +} + +#menuDisconnect { + text:"mapstoragemanager.action.disconnect"; + toolTipText:"mapstoragemanager.action.disconnect.tip"; + mnemonic:D; +} + +#menuExit { + text:"mapstoragemanager.action.exit"; + toolTipText:"mapstoragemanager.action.exit.tip"; + mnemonic:E; +} + +#menuPreferences { + text:"mapstoragemanager.action.preferences"; + toolTipText:"mapstoragemanager.action.preferences.tip"; + mnemonic:P; +} + +#menuHelp { + text:"mapstoragemanager.action.menuHelp"; + toolTipText:"mapstoragemanager.action.menuHelp.tip"; + mnemonic:A; +} + +#menuHelpHelp { + text:"mapstoragemanager.action.help"; + toolTipText:"mapstoragemanager.action.help.tip"; + mnemonic:E; +} + +#menuHelpSite { + text:"mapstoragemanager.action.visitSite"; + toolTipText:"mapstoragemanager.action.visitSite.tip"; + mnemonic:V; +} + +#menuHelpAbout { + text:"mapstoragemanager.action.aboutUs"; + toolTipText:"mapstoragemanager.action.aboutUs.tip"; + mnemonic:A; +} + + +#menuFileLanguageFR { + text:"mapstoragemanager.action.fr"; + toolTipText:"mapstoragemanager.action.fr.tip"; + mnemonic:F; +} + +#menuFileLanguageUK { + text:"mapstoragemanager.action.uk"; + toolTipText:"mapstoragemanager.action.uk.tip"; + mnemonic:U; +} + +#menuLanguage { + text:"mapstoragemanager.action.language"; + toolTipText:"mapstoragemanager.action.language.tip"; + mnemonic:C; +} + + #mainFrame { title:"Map Storage Manager"; } @@ -35,4 +115,4 @@ oneTouchExpandable:true; continuousLayout:true; dividerSize:6; -} \ No newline at end of file +} Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-02 14:46:08 UTC (rev 50) @@ -1,70 +1,101 @@ -<Application id='mainFrame' width='800' height='600' - onWindowClosing='engine.close()'> +<Application id='mainFrame' width='1024' height='800' + onWindowClosing='engine.close()'> - <!-- include java files for treatment --> - <script> + <!-- include java files for treatment --> + <script> <![CDATA[ - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - ApplicationEngine engine = new ApplicationEngine(); + ApplicationEngine engine = new ApplicationEngine(); ]]> - </script> + </script> - <!-- style definition --> - <style source='MainUI.css'/> + <!-- style definition --> + <style source='MainUI.css'/> - <!-- content --> + <!-- content --> - <JMenuBar> - <JMenu text="File"> - <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/> - <JMenuItem text="Disconnect" onActionPerformed='engine.doSomething()'/> - <JSeparator/> - <JMenuItem text="Quit" onActionPerformed='engine.close()'/> - </JMenu> - <JMenu text="Edit"> - <JMenuItem text="Preferences" onActionPerformed='engine.doSomething()'/> - </JMenu> - <JMenu text="Help"> - <JMenuItem text="About Us" onActionPerformed='engine.showGreeting()'/> - </JMenu> - </JMenuBar> + <JMenuBar> + <JMenu id='menuFile'> + <JMenuItem id='menuConnect' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuDisconnect' + onActionPerformed='engine.doSomething()'/> + <JSeparator/> + <JMenuItem id='menuExit' + onActionPerformed='engine.close()'/> + </JMenu> - <JPanel layout='{new BorderLayout()}' id='demoPanel'> - <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - <JLabel text='name base : ' styleClass='boldUnderline' /> - <JAXXComboBox id='nameBase'> - <item value='{null}' label='Select a base name' /> - <item value='HBase'/> - <item value='Cassandra'/> - <item value='Other'/> - </JAXXComboBox> - <JLabel text='login : ' styleClass='boldUnderline'/> - <JTextField/> - <JLabel text='password : ' styleClass='boldUnderline'/> - <JPasswordField/> - <JButton text='OK'/> - </JToolBar> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > - <JScrollPane> - <JPanel> - <!-- - <javax.swing.ImageIcon id='databaseIcon' constructorParams='getClass().getResource("images/cylindre32")'/> - <JLabel id='label' icon='{databaseIcon}'/> - --> - <JAXXTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > - <item value='No base schema' /> - </JAXXTree> - </JPanel> - </JScrollPane> - <JScrollPane> - <VBox horizontalAlignment='center'> - <JPanel> - </JPanel> - <JLabel text="TABLE NAME : TODO"/> - </VBox> - </JScrollPane> - </JSplitPane> - </JPanel> + <JMenu id='menuEdit'> + <JMenuItem id='menuPreferences' + onActionPerformed='engine.doSomething()'/> + + <JSeparator/> + <JMenu id='menuLanguage'> + <JMenuItem id='menuFileLanguageFR' + onActionPerformed='engine.setLocale("en","GB")'/> + <JMenuItem id='menuFileLanguageUK' + onActionPerformed='engine.setLocale("fr","FR")'/> + </JMenu> + </JMenu> + + <JMenu id='menuHelp'> + <JMenuItem id='menuHelpHelp' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpSite' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpAbout' + onActionPerformed='engine.doSomething()'/> + </JMenu> + + </JMenuBar> + + <JPanel layout='{new BorderLayout()}' id='mainPanel'> + <JToolBar constraints='BorderLayout.NORTH' opaque='true'> + <JLabel text="name base :" styleClass='boldUnderline' /> + <JAXXComboBox id='nameBase'> + <item value='{null}' label='Select a base name' /> + <item value='HBase'/> + <item value='Cassandra'/> + <item value='Other'/> + </JAXXComboBox> + <JLabel text="login :" styleClass='boldUnderline'/> + <JTextField/> + <JLabel text="password :" styleClass='boldUnderline'/> + <JPasswordField/> + <JButton text="ok"/> + </JToolBar> + + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JScrollPane> + <JPanel> + <!-- + FUTUR CODE + + <JTree id='navigation' + model='{createMSMTreeModel()}' + selectionModel="{createMSMTreHandler()}"/> + --> + + <JAXXTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > + <item value='No base schema' /> + </JAXXTree> + </JPanel> + </JScrollPane> + <JScrollPane> + <!-- + FUTUR CODE + + <JPanel id='tableContent'/> + --> + + <VBox horizontalAlignment='center'> + <JPanel> + </JPanel> + <JLabel text="TABLE NAME : TODO"/> + </VBox> + </JScrollPane> + </JSplitPane> + </JPanel> </Application> Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-02-02 14:46:08 UTC (rev 50) @@ -1,37 +0,0 @@ -package org.nuiton.mapstoragemanager.ui.gui; - -/** - * Application's constants. - * To configure the swing view. - * @author E054030D - * - */ -public class ApplicationConstants { - - /** - * default width, when the application start. - */ - public static final int DEFAULT_WIDTH = 1024; - /** - * default height, when the application start. - */ - public static final int DEFAULT_HEIGHT = 800; - - /** - * Minimum width. - */ - public static final int MINIMUM_SIZE_WIDTH = 600; - /** - * Minimum height. - */ - public static final int MINIMUM_SIZE_HEIGHT = 480; - - /** - * Maximum width. - */ - public static final int MAXIMUM_SIZE_WIDTH = 1920; - /** - * Maximum height. - */ - public static final int MAXIMUM_SIZE_HEIGHT = 1080; -} Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-02 14:46:08 UTC (rev 50) @@ -1,5 +1,7 @@ package org.nuiton.mapstoragemanager.ui.gui; +import java.util.Locale; +import java.util.ResourceBundle; import javax.swing.JOptionPane; /** @@ -9,20 +11,15 @@ */ public class ApplicationEngine { + Locale currentLocale; + ResourceBundle messages; + /** * Show the developers. * // TODO */ public final void showGreeting() { - JOptionPane.showMessageDialog(null, this, - "Developers:\n" - + "===========\n" - + "Crieloue Gilles\n" - + "Fages Amaury\n" - + "Langlais Dorian\n" - + "Gilet Forent\n" - + "===========\n" - + "Master ALMA", 0); + JOptionPane.showMessageDialog(null, "hi"); } /** @@ -33,7 +30,19 @@ } /** - * do nothing (for instance). + * do nothing (for tests). */ public void doSomething() { } + + /** + * Change language for internationalization. + * @param language the language + * @param country the country + */ + public void setLocale(String language, String country) { + currentLocale= new Locale(language,country); + messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); + System.out.println(messages.getString("ok")); + + } } Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-02-02 14:46:08 UTC (rev 50) @@ -1,15 +1,32 @@ -About\ Us= -Connect= -Disconnect= -Edit= -File= -Hello= -Help= -OK= -Preferences= -Quit= -TABLE\ NAME\ \:\ TODO= -login\ \:= -mapstoragemanager.hello=hello -name\ base\ \:= -password\ \:= +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-02-02 14:46:08 UTC (rev 50) @@ -1,15 +1,32 @@ -About\ Us= -Connect= -Disconnect= -Edit= -File= -Hello= -Help= -OK= -Preferences= -Quit= -TABLE\ NAME\ \:\ TODO= -login\ \:= -mapstoragemanager.hello=bonjour -name\ base\ \:= -password\ \:= +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe