Author: dlanglais Date: 2010-01-26 14:39:59 +0100 (Tue, 26 Jan 2010) New Revision: 14 Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx Modified: 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: Tony Chemit n'avait pas commit, so j'ai refait les modifs (en plus ?\195?\167a m'a permit de mieux comprendre ce que l'on a fait). J'ai supprim?\195?\169 les fichiers .jaxx "useless". Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -5,22 +5,81 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> + <script><![CDATA[ +import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +ApplicationEngine engine = new ApplicationEngine(); +ApplicationConstants constants = new ApplicationConstants(); +]]> + </script> + <!-- definition of style --> <style source='MainUI.css'/> <!-- include java files for treatment --> -<gui.ApplicationConstants id='constants'/> -<gui.ApplicationEngine id='engine'/> <!-- content --> - <menu/> + <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> <java.awt.BorderLayout id='BorderLayout'/> - <JPanel layout='{BorderLayout}'> - <connexionBar constraints='BorderLayout.NORTH'/> + <JPanel layout='{BorderLayout}'> + <JToolBar constraints='BorderLayout.NORTH' opaque='true'> + + <!-- include java files for treatment --> + + <!-- content --> + + <JLabel text='name base :' styleClass='boldUnderline' /> + <JAXXComboBox> + <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' > - <tree/> - <tableview/> + <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> + + <!-- include java files for treatment --> + + <!-- content --> + + <VBox horizontalAlignment='center'> + <JPanel> + </JPanel> + <JLabel text="TABLE NAME : TODO"/> + </VBox> + + </JScrollPane> </JSplitPane> </JPanel> </Application> Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,19 +0,0 @@ -<JToolBar opaque='true'> - -<!-- include java files for treatment --> - -<!-- content --> - - <JLabel text='name base :' styleClass='boldUnderline' /> - <JComboBox> - <item value='{null}' label='Select a base name' /> - <item value='HBase'/> - <item value='Cassandra'/> - <item value='Other'/> - </JComboBox> - <JLabel text='login :' styleClass='boldUnderline' /> - <JTextField/> - <JLabel text='password :' styleClass='boldUnderline' /> - <JPasswordField/> - <JButton text='OK'/> -</JToolBar> \ No newline at end of file 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-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-26 13:39:59 UTC (rev 14) @@ -13,7 +13,7 @@ * Show the developers. * // TO MODIFY */ - protected final void showGreeting() { + public final void showGreeting() { JOptionPane.showMessageDialog(null, this, "Developers:\n" + "===========\n" @@ -28,12 +28,12 @@ /** * Method to close the application. */ - protected final void close() { + public final void close() { System.exit(0); } /** * do nothing (for instance). */ - protected void doSomething() { } + public void doSomething() { } } Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,19 +0,0 @@ -<JMenuBar> - -<!-- include java files for treatment --> -<gui.ApplicationEngine id='engine'/> - -<!-- content --> - <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> \ No newline at end of file Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,13 +0,0 @@ -<JScrollPane> - -<!-- include java files for treatment --> - -<!-- content --> - - <VBox horizontalAlignment='center'> - <JPanel> - </JPanel> - <JLabel text="TABLE NAME : TODO"/> - </VBox> - -</JScrollPane> \ No newline at end of file Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,20 +0,0 @@ -<JScrollPane> - -<!-- include java files for treatment --> -<gui.ApplicationEngine id='engine'/> - -<!-- content --> - <JPanel> - - <!-- - <javax.swing.ImageIcon id='databaseIcon' constructorParams='getClass().getResource("images/cylindre32")'/> - <JLabel id='label' icon='{databaseIcon}'/> - --> - - - <JTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > - - <item value='No base schema' /> - </JTree> - </JPanel> -</JScrollPane> \ No newline at end of file Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-26 13:39:59 UTC (rev 14) @@ -1 +1,15 @@ -mapstoragemanager.hello=hello +About\ Us= +Connect= +Disconnect= +Edit= +File= +Hello= +Help= +OK= +Preferences= +Quit= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.hello=hello +name\ base\ \:= +password\ \:= Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-26 13:39:59 UTC (rev 14) @@ -1 +1,15 @@ -mapstoragemanager.hello=bonjour +About\ Us= +Connect= +Disconnect= +Edit= +File= +Hello= +Help= +OK= +Preferences= +Quit= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.hello=bonjour +name\ base\ \:= +password\ \:=