From scm@users.codelutin.com Thu Dec  8 11:25:47 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 01/01: Redimensionnement de l'assistant connexion
	(Fixes #8851)
Date: Thu, 08 Dec 2016 11:25:46 +0100
Message-ID: <20161208102547.94A9D5C24E9@goh.codelutin.com>
In-Reply-To: <20161208102545.15164.99496@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4716593748926147325=="

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

This is an automated email from the git hooks/post-receive script.

New commit to branch develop-5.x in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 86ae55d3f9a1a15a405111cbf41791c425202ecc
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Dec 8 11:17:52 2016 +0100

    Redimensionnement de l'assistant connexion (Fixes #8851)
---
 .../swing/ui/storage/tabs/ConfigUI.jaxx            | 410 ++++++++++---------=
--
 1 file changed, 199 insertions(+), 211 deletions(-)

diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing=
/ui/storage/tabs/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/obser=
ve/application/swing/ui/storage/tabs/ConfigUI.jaxx
index 02cf47f..c5c471f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/sto=
rage/tabs/ConfigUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/sto=
rage/tabs/ConfigUI.jaxx
@@ -57,237 +57,225 @@ public void init() {
   </script>
=20
   <JPanel id=3D'content' layout=3D'{new BorderLayout()}'>
-    <Table fill=3D'both' weightx=3D'1' constraints=3D'BorderLayout.CENTER'>
-      <row>
-        <cell anchor=3D'north'>
-          <JPanel id=3D'configContent'>
+    <JPanel id=3D'configContent' constraints=3D'BorderLayout.CENTER'>
=20
-            <!-- configurer creation base locale a partir d'une sauvegarde -=
->
-            <Table id=3D'IMPORT_EXTERNAL_DUMP'
-                   constraints=3D'"IMPORT_EXTERNAL_DUMP"'>
-              <row>
-                <cell>
-                  <JLabel text=3D'observe.storage.importExternalDump.config'=
/>
-                </cell>
-              </row>
-              <row weighty=3D'1'>
-                <cell weightx=3D'1' fill=3D"horizontal">
-                  <JTextField id=3D"dumpFile"
-                              onKeyReleased=3D'getModel().setDumpFile(new Fi=
le(((JTextField)event.getSource()).getText()))'/>
-                </cell>
-                <cell anchor=3D"east">
-                  <JButton id=3D"fileChooserAction"
-                           onActionPerformed=3D"getHandler().chooseDumpFile(=
this)"/>
-                </cell>
-              </row>
-            </Table>
+      <!-- configurer creation base locale a partir d'une sauvegarde -->
+      <Table id=3D'IMPORT_EXTERNAL_DUMP'
+             constraints=3D'"IMPORT_EXTERNAL_DUMP"'>
+        <row>
+          <cell>
+            <JLabel text=3D'observe.storage.importExternalDump.config'/>
+          </cell>
+        </row>
+        <row weighty=3D'1'>
+          <cell weightx=3D'1' fill=3D"horizontal">
+            <JTextField id=3D"dumpFile"
+                        onKeyReleased=3D'getModel().setDumpFile(new File(((J=
TextField)event.getSource()).getText()))'/>
+          </cell>
+          <cell anchor=3D"east">
+            <JButton id=3D"fileChooserAction"
+                     onActionPerformed=3D"getHandler().chooseDumpFile(this)"=
/>
+          </cell>
+        </row>
+      </Table>
=20
-            <!-- configurer creation base locale et import referentiel depui=
s base distante  -->
-            <!--Table id=3D'IMPORT_LOCAL_STORAGE'
-                   constraints=3D'"IMPORT_LOCAL_STORAGE"'
-                   _description=3D'n("observe.storage.importLocalStorage.des=
cription")'>
-                <row>
-                    <cell>
-                        <JLabel text=3D'observe.storage.importLocalStorage.c=
onfig'/>
-                    </cell>
-                </row>
-                <row weighty=3D'1'>
-                    <cell weightx=3D'1' fill=3D"horizontal">
-                        <JTextField text=3D'{model.getLocalStorageFile()+""}'
-                                    onKeyReleased=3D'getModel().setLocalStor=
ageFile(new File(((JTextField)event.getSource()).getText()))'/>
-                    </cell>
-                    <cell anchor=3D"east">
-                        <JButton actionIcon=3D'fileChooser' onActionPerforme=
d=3D"chooseLocalStorageFile()"/>
-                    </cell>
-                </row>
-            </Table-->
+      <!-- configurer creation base locale et import referentiel depuis base=
 distante  -->
+      <!--Table id=3D'IMPORT_LOCAL_STORAGE'
+             constraints=3D'"IMPORT_LOCAL_STORAGE"'
+             _description=3D'n("observe.storage.importLocalStorage.descripti=
on")'>
+          <row>
+              <cell>
+                  <JLabel text=3D'observe.storage.importLocalStorage.config'=
/>
+              </cell>
+          </row>
+          <row weighty=3D'1'>
+              <cell weightx=3D'1' fill=3D"horizontal">
+                  <JTextField text=3D'{model.getLocalStorageFile()+""}'
+                              onKeyReleased=3D'getModel().setLocalStorageFil=
e(new File(((JTextField)event.getSource()).getText()))'/>
+              </cell>
+              <cell anchor=3D"east">
+                  <JButton actionIcon=3D'fileChooser' onActionPerformed=3D"c=
hooseLocalStorageFile()"/>
+              </cell>
+          </row>
+      </Table-->
=20
-            <!-- configurer creation base locale et import referentiel depui=
s base distante  -->
-            <Table id=3D'IMPORT_REMOTE_STORAGE'
-                   fill=3D"both"
-                   constraints=3D'"IMPORT_REMOTE_STORAGE"'>
-              <row>
-                <cell>
-                  <JLabel text=3D'observe.storage.importRemoteStorage.config=
'/>
-                </cell>
-              </row>
-              <row>
-                <cell weighty=3D'1' weightx=3D'1'>
-                  <JPanel id=3D'IMPORT_REMOTE_STORAGE_content'/>
-                </cell>
-              </row>
+      <!-- configurer creation base locale et import referentiel depuis base=
 distante  -->
+      <Table id=3D'IMPORT_REMOTE_STORAGE'
+             fill=3D"both"
+             constraints=3D'"IMPORT_REMOTE_STORAGE"'>
+        <row>
+          <cell>
+            <JLabel text=3D'observe.storage.importRemoteStorage.config'/>
+          </cell>
+        </row>
+        <row>
+          <cell weighty=3D'1' weightx=3D'1'>
+            <JPanel id=3D'IMPORT_REMOTE_STORAGE_content'/>
+          </cell>
+        </row>
=20
-            </Table>
+      </Table>
=20
-            <!-- configurer creation base locale et import referentiel depui=
s un server distant  -->
-            <Table id=3D'IMPORT_SERVER_STORAGE'
-                   fill=3D"both"
-                   constraints=3D'"IMPORT_SERVER_STORAGE"'>
-              <row>
-                <cell>
-                  <JLabel text=3D'observe.storage.importServerStorage.config=
'/>
-                </cell>
-              </row>
-              <row>
-                <cell weighty=3D'1' weightx=3D'1'>
-                  <JPanel id=3D'IMPORT_SERVER_STORAGE_content'/>
-                </cell>
-              </row>
+      <!-- configurer creation base locale et import referentiel depuis un s=
erver distant  -->
+      <Table id=3D'IMPORT_SERVER_STORAGE'
+             fill=3D"both"
+             constraints=3D'"IMPORT_SERVER_STORAGE"'>
+        <row>
+          <cell>
+            <JLabel text=3D'observe.storage.importServerStorage.config'/>
+          </cell>
+        </row>
+        <row>
+          <cell weighty=3D'1' weightx=3D'1'>
+            <JPanel id=3D'IMPORT_SERVER_STORAGE_content'/>
+          </cell>
+        </row>
=20
-            </Table>
+      </Table>
=20
-            <!-- configurer connexion a base distante  -->
-            <Table id=3D'USE_REMOTE'
-                   constraints=3D'"USE_REMOTE"' fill=3D'both'>
-              <row>
-                <cell>
-                  <JLabel text=3D'observe.storage.useRemoteStorage.config'/>
-                </cell>
-              </row>
-              <row>
-                <cell weighty=3D'1' weightx=3D'1'>
-                  <JPanel id=3D'USE_REMOTE_content'
-                          minimumSize=3D'{new Dimension(20,300)}'/>
-                </cell>
-              </row>
-            </Table>
+      <!-- configurer connexion a base distante  -->
+      <Table id=3D'USE_REMOTE'
+             constraints=3D'"USE_REMOTE"' fill=3D'both'>
+        <row>
+          <cell>
+            <JLabel text=3D'observe.storage.useRemoteStorage.config'/>
+          </cell>
+        </row>
+        <row>
+          <cell weighty=3D'1' weightx=3D'1'>
+            <JPanel id=3D'USE_REMOTE_content'
+                    minimumSize=3D'{new Dimension(20,300)}'/>
+          </cell>
+        </row>
+      </Table>
=20
-            <!-- configurer connexion au server base distante  -->
-            <Table id=3D'USE_SERVER'
-                   constraints=3D'"USE_SERVER"' fill=3D'both'>
-              <row>
-                <cell>
-                  <JLabel text=3D'observe.storage.useServerStorage.config'/>
-                </cell>
-              </row>
-              <row>
-                <cell weighty=3D'1' weightx=3D'1'>
-                  <JPanel id=3D'USE_SERVER_content'
-                          minimumSize=3D'{new Dimension(20,300)}'/>
-                </cell>
-              </row>
-            </Table>
+      <!-- configurer connexion au server base distante  -->
+      <Table id=3D'USE_SERVER'
+             constraints=3D'"USE_SERVER"' fill=3D'both'>
+        <row>
+          <cell>
+            <JLabel text=3D'observe.storage.useServerStorage.config'/>
+          </cell>
+        </row>
+        <row>
+          <cell weighty=3D'1' weightx=3D'1'>
+            <JPanel id=3D'USE_SERVER_content'
+                    minimumSize=3D'{new Dimension(20,300)}'/>
+          </cell>
+        </row>
+      </Table>
=20
-            <JPanel constraints=3D'"$$hideme$$"' visible=3D'false'>
-              <JPanel id=3D'remoteConfig'>
-                <Table constraints=3D'BorderLayout.CENTER'
-                       fill=3D"both">
-                  <row>
-                    <cell anchor=3D'west'>
-                      <JLabel text=3D'observe.storage.remote.url'/>
-                    </cell>
-                    <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
-                      <JTextField id=3D"remoteUrl"
-                                  onKeyReleased=3D'getModel().setRemoteUrl((=
(JTextField)event.getSource()).getText())'/>
-                    </cell>
-                  </row>
+      <JPanel constraints=3D'"$$hideme$$"' visible=3D'false'>
+        <JPanel id=3D'remoteConfig'>
+          <Table constraints=3D'BorderLayout.NORTH' fill=3D"both">
+            <row>
+              <cell anchor=3D'west'>
+                <JLabel text=3D'observe.storage.remote.url'/>
+              </cell>
+              <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
+                <JTextField id=3D"remoteUrl"
+                            onKeyReleased=3D'getModel().setRemoteUrl(((JText=
Field)event.getSource()).getText())'/>
+              </cell>
+            </row>
+            <row>
+              <cell anchor=3D'west'>
+                <JLabel text=3D'observe.storage.remote.login'/>
+              </cell>
+              <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
+                <JTextField id=3D"remoteLogin"
+                            onKeyReleased=3D'getModel().setRemoteLogin(((JTe=
xtField)event.getSource()).getText())'/>
+              </cell>
+            </row>
+            <row>
+              <cell anchor=3D'west'>
+                <JLabel text=3D'observe.storage.remote.password'/>
+              </cell>
+              <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
+                <JPasswordField id=3D"remotePassword"
+                                onKeyReleased=3D'getModel().setRemotePasswor=
d(((JPasswordField)event.getSource()).getPassword())'/>
+              </cell>
+            </row>
+            <row>
+              <cell anchor=3D'west'>
+                <JLabel id=3D"serverDataBaseLabel"
+                        text=3D'observe.storage.server.dataBase'/>
+              </cell>
+              <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
+                <JTextField id=3D"serverDataBase"
+                            onKeyReleased=3D'getModel().setServerDatabase(((=
JTextField)event.getSource()).getText())'/>
+              </cell>
+            </row>
+            <row>
+              <cell columns=3D'2'>
+                <JCheckBox id=3D"remoteUseSsl"
+                           onActionPerformed=3D'getModel().setUseSsl(((JChec=
kBox)event.getSource()).isSelected())'/>
+              </cell>
+            </row>
+            <!--row weighty=3D'1'-->
+            <!--row>
+              <cell columns=3D'2'>
+                <Table insets=3D'0'>
                   <row>
-                    <cell anchor=3D'west'>
-                      <JLabel text=3D'observe.storage.remote.login'/>
-                    </cell>
-                    <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
-                      <JTextField id=3D"remoteLogin"
-                                  onKeyReleased=3D'getModel().setRemoteLogin=
(((JTextField)event.getSource()).getText())'/>
-                    </cell>
-                  </row>
-                  <row>
-                    <cell anchor=3D'west'>
-                      <JLabel text=3D'observe.storage.remote.password'/>
+                    <cell weightx=3D'1'
+                          fill=3D"horizontal">
+                      <JTextField
+                        id=3D"remoteSslCertificatFile"
+                        onKeyReleased=3D'getModel().setSslCertificatFile(new=
 File(((JTextField)event.getSource()).getText()))'/>
                     </cell>
-                    <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
-                      <JPasswordField id=3D"remotePassword"
-                                      onKeyReleased=3D'getModel().setRemoteP=
assword(((JPasswordField)event.getSource()).getPassword())'/>
+                    <cell anchor=3D"east">
+                      <JButton
+                        id=3D"remoteSslCertificatFileChooseaction"
+                        onActionPerformed=3D"getHandler().chooseSslCertifica=
tFile(this)"/>
                     </cell>
                   </row>
+                </Table>
+              </cell>
+            </row-->
+            <!--row>
+              <cell columns=3D'2'>
+                <Table insets=3D'0'>
                   <row>
                     <cell anchor=3D'west'>
-                      <JLabel id=3D"serverDataBaseLabel"
-                              text=3D'observe.storage.server.dataBase'/>
+                      <JLabel text=3D'observe.storage.remote.ssl.password'/>
                     </cell>
                     <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
-                      <JTextField id=3D"serverDataBase"
-                                  onKeyReleased=3D'getModel().setServerDatab=
ase(((JTextField)event.getSource()).getText())'/>
-                    </cell>
-                  </row>
-                  <row>
-                    <cell columns=3D'2'>
-                      <JCheckBox id=3D"remoteUseSsl"
-                                 onActionPerformed=3D'getModel().setUseSsl((=
(JCheckBox)event.getSource()).isSelected())'/>
-                    </cell>
-                  </row>
-                  <!--row weighty=3D'1'-->
-                  <!--row>
-                    <cell columns=3D'2'>
-                      <Table insets=3D'0'>
-                        <row>
-                          <cell weightx=3D'1'
-                                fill=3D"horizontal">
-                            <JTextField
-                              id=3D"remoteSslCertificatFile"
-                              onKeyReleased=3D'getModel().setSslCertificatFi=
le(new File(((JTextField)event.getSource()).getText()))'/>
-                          </cell>
-                          <cell anchor=3D"east">
-                            <JButton
-                              id=3D"remoteSslCertificatFileChooseaction"
-                              onActionPerformed=3D"getHandler().chooseSslCer=
tificatFile(this)"/>
-                          </cell>
-                        </row>
-                      </Table>
-                    </cell>
-                  </row-->
-                  <!--row>
-                    <cell columns=3D'2'>
-                      <Table insets=3D'0'>
-                        <row>
-                          <cell anchor=3D'west'>
-                            <JLabel text=3D'observe.storage.remote.ssl.passw=
ord'/>
-                          </cell>
-                          <cell weightx=3D'1' fill=3D"both" anchor=3D'east'>
-                            <JPasswordField id=3D"remoteSslCertificatPasswor=
d"
-                                            onKeyReleased=3D'getModel().setS=
slCertificatPassword(((JPasswordField)event.getSource()).getPassword())'/>
-                          </cell>
-                        </row>
-                      </Table>
-                    </cell>
-                  </row-->
-
-                  <!-- sauver dans la configuration  -->
-                  <row>
-                    <cell columns=3D'2'>
-                      <JCheckBox id=3D"storeRemoteConfig"
-                                 onActionPerformed=3D'getModel().setStoreRem=
oteConfig(((JCheckBox)event.getSource()).isSelected())'/>
-                    </cell>
-                  </row>
-                  <!-- tester la connexion -->
-                  <row>
-                    <cell columns=3D'2'>
-                      <JButton id=3D"testRemoteAction"
-                               onActionPerformed=3D'getModel().testRemote()'=
/>
-                    </cell>
-                  </row>
-                </Table>
-                <!-- r=C3=A9sum=C3=A9 du test de connexion -->
-                <Table constraints=3D'BorderLayout.SOUTH' fill=3D'both'
-                       insets=3D'0'>
-                  <row>
-                    <cell weightx=3D'1' weighty=3D'1'>
-                      <JScrollPane id=3D"connexionStatusPanel">
-                        <JTextPane id=3D'connexionStatus'/>
-                      </JScrollPane>
-                    </cell>
-                  </row>
-                  <row>
-                    <cell>
-                      <JLabel id=3D"connexionStatusLabel"/>
+                      <JPasswordField id=3D"remoteSslCertificatPassword"
+                                      onKeyReleased=3D'getModel().setSslCert=
ificatPassword(((JPasswordField)event.getSource()).getPassword())'/>
                     </cell>
                   </row>
                 </Table>
-              </JPanel>
-            </JPanel>
-          </JPanel>
-        </cell>
-      </row>
-    </Table>
+              </cell>
+            </row-->
+
+            <!-- sauver dans la configuration  -->
+            <row>
+              <cell columns=3D'2'>
+                <JCheckBox id=3D"storeRemoteConfig"
+                           onActionPerformed=3D'getModel().setStoreRemoteCon=
fig(((JCheckBox)event.getSource()).isSelected())'/>
+              </cell>
+            </row>
+            <!-- tester la connexion -->
+            <row>
+              <cell columns=3D'2'>
+                <JButton id=3D"testRemoteAction"
+                         onActionPerformed=3D'getModel().testRemote()'/>
+              </cell>
+            </row>
+          </Table>
+          <!-- r=C3=A9sum=C3=A9 du test de connexion -->
+          <Table constraints=3D'BorderLayout.CENTER' fill=3D'both' insets=3D=
'0'>
+            <row>
+              <cell weightx=3D'1' weighty=3D'1'>
+                <JScrollPane id=3D"connexionStatusPanel" columnHeaderView=3D=
"{connexionStatusLabel}">
+                  <JTextPane id=3D'connexionStatus'/>
+                  <JLabel id=3D"connexionStatusLabel"/>
+                </JScrollPane>
+              </cell>
+            </row>
+          </Table>
+        </JPanel>
+      </JPanel>
+    </JPanel>
   </JPanel>
=20
 </StorageTabUI>

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4716593748926147325==--