From tchemit@users.labs.libre-entreprise.org Mon Jun 15 08:44:45 2026
From: tchemit@users.labs.libre-entreprise.org
To: simexplorer-si-commits@list.forge.codelutin.com
Subject: [Simexplorer-si-commits] r867 - in	=?utf-8?q?trunk/simexplorer-is/s?=
 =?utf-8?q?imexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swi?=
 =?utf-8?q?ng=3A?=	. util
Date: Tue, 12 Feb 2008 18:12:01 +0100
Message-ID: <20080212171201.8A57646192C@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1038071392958359027=="

--===============1038071392958359027==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/simexplo=
rer/is/ui/swing/JDetailTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/JListTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/JSynchronizeTab.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/SimExplorerUI.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/util/ChooseFile.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/util/ChooseFilePanel.jaxx
   trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplo=
rer/is/ui/swing/util/ErrorDialog.jaxx
Log:
jaxx supporte i18n, suppression de tous les appels I18n._ + suppression des i=
mports statiques desormais inutiles

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/s=
imexplorer/is/ui/swing/JDetailTab.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexpl=
orer/is/ui/swing/JDetailTab.jaxx	2008-02-12 13:59:02 UTC (rev 866)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexpl=
orer/is/ui/swing/JDetailTab.jaxx	2008-02-12 17:11:54 UTC (rev 867)
@@ -6,7 +6,7 @@
                 <row>
                     <cell weightx=3D"1" fill=3D'horizontal'>
                         <JPanel opaque=3D'false' >
-                            <JLabel id=3D'navigationHeader' text=3D'{_("sime=
xplorer.node.navigation")}'/>
+                            <JLabel id=3D'navigationHeader' text=3D'simexplo=
rer.node.navigation'/>
                         </JPanel>
                     </cell>
                     <cell anchor=3D"east">
@@ -50,7 +50,7 @@
                     <Table id=3D'detail' insets=3D'2,2,2,1'>
                         <row fill=3D'vertical'>
                             <cell anchor=3D'west'>
-                                <JLabel text=3D'{_("simexplorer.common.name"=
)}'/>
+                                <JLabel text=3D'simexplorer.common.name'/>
                             </cell>
                             <cell weightx=3D"1" anchor=3D'west'>
                                 <JLabel id=3D'detailName'/>
@@ -58,7 +58,7 @@
                         </row>
                         <row fill=3D'vertical'>
                             <cell anchor=3D'west'>
-                                <JLabel text=3D'{_("simexplorer.common.type"=
)}'/>
+                                <JLabel text=3D'simexplorer.common.type'/>
                             </cell>
                             <cell weightx=3D"1" anchor=3D'west'>
                                 <JLabel id=3D'detailType'/>
@@ -66,7 +66,7 @@
                         </row>
                         <row>
                             <cell anchor=3D'west'>
-                                <JLabel text=3D'{_("simexplorer.common.versi=
on")}'/>
+                                <JLabel text=3D'simexplorer.common.version'/>
                             </cell>
                             <cell weightx=3D"1" anchor=3D'west'>
                                 <JComboBox id=3D'detailVersions' model=3D'{n=
ew DefaultComboBoxModel()}'/>
@@ -74,7 +74,7 @@
                         </row>
                         <row fill=3D'vertical'>
                             <cell anchor=3D'west'>
-                                <JLabel text=3D'{_("simexplorer.common.descr=
iption")}'/>
+                                <JLabel text=3D'simexplorer.common.descripti=
on'/>
                             </cell>
                             <cell fill=3D'horizontal' weightx=3D"2" anchor=
=3D'west'>
                                 <JLabel id=3D'detailDescription'/>
@@ -82,7 +82,7 @@
                         </row>
                         <row fill=3D'vertical'>
                             <cell anchor=3D'west'>
-                                <JLabel text=3D'{_("simexplorer.common.creat=
ionDate")}'/>
+                                <JLabel text=3D'simexplorer.common.creationD=
ate'/>
                             </cell>
                             <cell anchor=3D'west'>
                                 <JLabel id=3D'detailCreationDate'/>

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

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

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

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

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/s=
imexplorer/is/ui/swing/util/ChooseFilePanel.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexpl=
orer/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/simexpl=
orer/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=3D org.codelutin.util.FileUtil.getDirectory();
     if (dir!=3Dnull) {

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


--===============1038071392958359027==--