r867 - in trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing: . util - Simexplorer-si-commits

12 Feb 2008

Author: tchemit
Date: 2008-02-12 17:11:54 +0000 (Tue, 12 Feb 2008)
New Revision: 867

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ErrorDialog.jaxx
Log:
jaxx supporte i18n, suppression de tous les appels I18n._ + suppression des imports statiques desormais inutiles

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx
===================================================================

--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -6,7 +6,7 @@
                 <row>
                     <cell weightx="1" fill='horizontal'>
                         <JPanel opaque='false' >
-                            <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/>
+                            <JLabel id='navigationHeader' text='simexplorer.node.navigation'/>
                         </JPanel>
                     </cell>
                     <cell anchor="east">
@@ -50,7 +50,7 @@
                     <Table id='detail' insets='2,2,2,1'>
                         <row fill='vertical'>
                             <cell anchor='west'>
-                                <JLabel text='{_("simexplorer.common.name")}'/>
+                                <JLabel text='simexplorer.common.name'/>
                             </cell>
                             <cell weightx="1" anchor='west'>
                                 <JLabel id='detailName'/>
@@ -58,7 +58,7 @@
                         </row>
                         <row fill='vertical'>
                             <cell anchor='west'>
-                                <JLabel text='{_("simexplorer.common.type")}'/>
+                                <JLabel text='simexplorer.common.type'/>
                             </cell>
                             <cell weightx="1" anchor='west'>
                                 <JLabel id='detailType'/>
@@ -66,7 +66,7 @@
                         </row>
                         <row>
                             <cell anchor='west'>
-                                <JLabel text='{_("simexplorer.common.version")}'/>
+                                <JLabel text='simexplorer.common.version'/>
                             </cell>
                             <cell weightx="1" anchor='west'>
                                 <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/>
@@ -74,7 +74,7 @@
                         </row>
                         <row fill='vertical'>
                             <cell anchor='west'>
-                                <JLabel text='{_("simexplorer.common.description")}'/>
+                                <JLabel text='simexplorer.common.description'/>
                             </cell>
                             <cell fill='horizontal' weightx="2" anchor='west'>
                                 <JLabel id='detailDescription'/>
@@ -82,7 +82,7 @@
                         </row>
                         <row fill='vertical'>
                             <cell anchor='west'>
-                                <JLabel text='{_("simexplorer.common.creationDate")}'/>
+                                <JLabel text='simexplorer.common.creationDate'/>
                             </cell>
                             <cell anchor='west'>
                                 <JLabel id='detailCreationDate'/>

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -11,7 +11,7 @@
             </JPopupMenu>
             <JToolBar>                
                 <JButton id='importElement'/>                
-                <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/>
+                <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/>
                 <JButton id='search'/>
                 <JButton id='resetSearch'/>
                 <JButton id='advancedSearch'/>
@@ -41,7 +41,7 @@
                 <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/>
                 <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/>
                 <JPanel layout='{new GridLayout(0, 2, 0, 0)}'>
-                    <JLabel id='currentPage' text='{_("simexplorer.action.currentPage")}' labelFor="{goPage}" font-size='9'/>
+                    <JLabel id='currentPage' text='simexplorer.action.currentPage' labelFor="{goPage}" font-size='9'/>
                     <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/>
                 </JPanel>
                 <JButton id='goNextPage'/>

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -8,7 +8,7 @@
                         <JPanel>
                             <JLabel id='navigationHeaderLocal'
                                     icon='{createImageIcon("action/local.png")}'
-                                    text='{_("simexplorer.node.navigation.local")}'/>
+                                    text='simexplorer.node.navigation.local'/>
                         </JPanel>
                     </cell>
                     <cell anchor="east">
@@ -29,7 +29,7 @@
                         <JPanel>
                             <JLabel id='navigationHeaderRemote'
                                     icon='{createImageIcon("action/remote.png")}'
-                                    text='{_("simexplorer.node.navigation.remote")}'/>
+                                    text='simexplorer.node.navigation.remote'/>
                         </JPanel>
                     </cell>
                     <cell anchor="east">

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -1,9 +1,9 @@
-<JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}'
+<JFrame name="mainFrame" title='simexplorer.main.ui.title'
         defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='536'>
-    <style source="/common.css"/>    
+    <style source="/common.css"/>
     <JMenuBar>
         <!-- menu principal -->
-        <JMenu text='{_("simexplorer.main.menu")}' mnemonic="{'M'}">
+        <JMenu text='simexplorer.main.menu' mnemonic="{'M'}">
             <JMenuItem id="connect"/>
             <JMenuItem id="unconnect"/>
             <JSeparator/>
@@ -13,8 +13,8 @@
             <JMenuItem id="quit"/>
         </JMenu>
         <!-- menu config -->
-        <JMenu text='{_("simexplorer.config.menu")}' mnemonic="{'C'}">
-            <JMenu text='{_("simexplorer.config.i18n.menu")}' mnemonic="{'L'}"
+        <JMenu text='simexplorer.config.menu' mnemonic="{'C'}">
+            <JMenu text='simexplorer.config.i18n.menu' mnemonic="{'L'}"
                    icon='{createImageIcon("action/translate.png")}'>
                 <JMenuItem id="i18n_fr_FR"/>
                 <JMenuItem id="i18n_en_GB"/>
@@ -22,7 +22,7 @@
             <JMenuItem id="config"/>
         </JMenu>
         <!-- menu aide -->
-        <JMenu text='{_("simexplorer.help.menu")}' mnemonic="{'e'}">
+        <JMenu text='simexplorer.help.menu' mnemonic="{'e'}">
             <JMenuItem id="help"/>
             <JMenuItem id="site"/>
             <JMenuItem id="about"/>
@@ -51,5 +51,4 @@
             </cell>
         </row>
     </Table>
-
 </JFrame>

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -1,7 +1,5 @@
-<JDialog title='{_("simexplorer.error.dialog.title")}'>
+<JDialog title='simexplorer.error.dialog.title'>
     <script>
-        import static org.codelutin.i18n.I18n._;
-        import static jaxx.runtime.UIHelper.createImageIcon;
         JRootPane rootPane = getRootPane();
         rootPane.setDefaultButton(cancel);
         rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "cancel");
@@ -30,8 +28,8 @@
         <row fill='horizontal'>
             <cell>
                 <JPanel layout='{new GridLayout(1, 0, 6, 6)}'>
-                   <JButton id='ok' text='{_("simexplorer.common.ok")}' onActionPerformed='doOk()'/>
-                   <JButton id='cancel' text='{_("simexplorer.common.cancel")}' onActionPerformed='doCancel()'/>                   
+                   <JButton id='ok' text='simexplorer.common.ok' onActionPerformed='doOk()'/>
+                   <JButton id='cancel' text='simexplorer.common.cancel' onActionPerformed='doCancel()'/>                   
                 </JPanel>
             </cell>
         </row>

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -1,8 +1,5 @@
 <Table>
     <script>
-import static org.codelutin.i18n.I18n._;
-import static jaxx.runtime.UIHelper.createImageIcon;
-
 protected void chooseDir() {
     String dir= org.codelutin.util.FileUtil.getDirectory();
     if (dir!=null) {

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ErrorDialog.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ErrorDialog.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ErrorDialog.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -1,6 +1,5 @@
-<JDialog title='{_("simexplorer.error.dialog.title")}'>
+<JDialog title='simexplorer.error.dialog.title'>
     <script>
-        import static org.codelutin.i18n.I18n._;
         JRootPane rootPane = getRootPane();
         rootPane.setDefaultButton(close);
         rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
@@ -10,7 +9,7 @@
         <row fill='both'>
             <cell>
                 <JPanel>
-                    <JLabel text='{_("simexplorer.error.dialog.message")}'/>
+                    <JLabel text='simexplorer.error.dialog.message'/>
                 </JPanel>
             </cell>
         </row>
@@ -28,7 +27,7 @@
         </row>
         <row fill='horizontal'>
             <cell>
-                <JButton id='close' text='{_("simexplorer.common.close")}' onActionPerformed='dispose()'/>
+                <JButton id='close' text='simexplorer.common.close' onActionPerformed='dispose()'/>
             </cell>
         </row>
     </Table>

    

r867 - in trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing: . util

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)