From kmorin@users.forge.codelutin.com Fri May 23 10:39:42 2014
From: kmorin@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r91 - in trunk: .	=?utf-8?q?faxtomail-ui-swing/?=
 =?utf-8?q?src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply?=
	faxtomail-ui-swing/src/main/resources
	faxtomail-ui-swing/src/main/resources/i18n
Date: Fri, 23 May 2014 10:39:42 +0200
Message-ID: <20140523083942.2C55A1811A4@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4118134781078317266=="

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

Author: kmorin
Date: 2014-05-23 10:39:41 +0200 (Fri, 23 May 2014)
New Revision: 91

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/91

Log:
downgrade swingx version

Modified:
   trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/=
content/reply/ReplyFormUI.jaxx
   trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.=
properties
   trunk/faxtomail-ui-swing/src/main/resources/log4j.properties
   trunk/pom.xml

Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui=
/swing/content/reply/ReplyFormUI.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/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing=
/content/reply/ReplyFormUI.jaxx	2014-05-22 16:02:33 UTC (rev 90)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing=
/content/reply/ReplyFormUI.jaxx	2014-05-23 08:39:41 UTC (rev 91)
@@ -28,11 +28,10 @@
=20
     java.awt.CardLayout
     java.awt.Color
+    java.awt.FlowLayout
=20
     jaxx.runtime.swing.CardLayout2Ext
=20
-    org.jdesktop.swingx.WrapLayout
-
     static org.nuiton.i18n.I18n.t
   </import>
=20
@@ -108,7 +107,7 @@
       <JLabel id=3D"attachmentsLabel" constraints=3D'BorderLayout.NORTH'/>
       <JScrollPane id=3D"attachmentsContainer"
                    constraints=3D'BorderLayout.CENTER'>
-        <JPanel id=3D"attachmentsPanel" layout=3D"{new WrapLayout(WrapLayout=
.LEFT)}"/>
+        <JPanel id=3D"attachmentsPanel" layout=3D"{new FlowLayout(FlowLayout=
.LEADING)}"/>
       </JScrollPane>
       <Table fill=3D"both"
              id=3D"addAttachmentForm"

Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing=
_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR=
.properties	2014-05-22 16:02:33 UTC (rev 90)
+++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR=
.properties	2014-05-23 08:39:41 UTC (rev 91)
@@ -198,22 +198,22 @@
 faxtomail.historyList.title=3DHistorique
 faxtomail.i18n.deleteCache.error=3D
 faxtomail.i18n.mkDir.error=3D
-faxtomail.main.action.configuration=3D
+faxtomail.main.action.configuration=3DConfiguration
 faxtomail.main.action.configuration.mnemonic=3D
-faxtomail.main.action.configuration.tip=3D
-faxtomail.main.action.demandeList=3D
-faxtomail.main.action.demandeList.tip=3D
-faxtomail.main.action.exit=3D
-faxtomail.main.action.exit.tip=3D
-faxtomail.main.action.recherche=3D
-faxtomail.main.action.recherche.tip=3D
-faxtomail.main.menu.file=3D
-faxtomail.main.menu.file.tip=3D
+faxtomail.main.action.configuration.tip=3DMenu configuration
+faxtomail.main.action.demandeList=3DGestion des fax
+faxtomail.main.action.demandeList.tip=3DGestion des fax
+faxtomail.main.action.exit=3DQuitter
+faxtomail.main.action.exit.tip=3DQuitter l'application
+faxtomail.main.action.goto.previousScreen.tip=3D
+faxtomail.main.action.recherche=3DRecherche
+faxtomail.main.action.recherche.tip=3DRecherche de demandes archiv=C3=A9es
+faxtomail.main.action.reloadFaxToMail=3D
+faxtomail.main.menu.file=3DFichier
+faxtomail.main.menu.file.tip=3DMenu fichier
 faxtomail.main.title.application=3DFaxToMail
 faxtomail.main.title.applicationName=3DFaxToMail
 faxtomail.main.title.nodb=3D
-faxtomail.menu.file=3DFichier
-faxtomail.menu.file.tip=3DMenu fichier
 faxtomail.pdfEditor.action.cancel=3DAnnuler
 faxtomail.pdfEditor.action.cancel.tip=3DNe pas enregistrer les changements e=
t fermer
 faxtomail.pdfEditor.action.validate=3DEnregistrer

Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/faxtomail-ui-swing/src/main/resources/log4j.properties	2014-05-22 1=
6:02:33 UTC (rev 90)
+++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties	2014-05-23 0=
8:39:41 UTC (rev 91)
@@ -19,7 +19,7 @@
 # <http://www.gnu.org/licenses/gpl-3.0.html>.
 # #L%
 ###
-log4j.rootCategory=3DDEBUG, console
+log4j.rootCategory=3DWARN, console
=20
 log4j.appender.console=3Dorg.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=3Dorg.apache.log4j.PatternLayout

Modified: trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/pom.xml	2014-05-22 16:02:33 UTC (rev 90)
+++ trunk/pom.xml	2014-05-23 08:39:41 UTC (rev 91)
@@ -110,7 +110,8 @@
     <h2Version>1.3.176</h2Version>
=20
     <jaxxVersion>2.8.6-SNAPSHOT</jaxxVersion>
-    <swingXVersion>1.6.5-1</swingXVersion>
+    <!-- do not upgrade to 1.6.5-1 -->
+    <swingXVersion>1.6.4</swingXVersion>
     <xworkVersion>2.3.15.1</xworkVersion>
=20
     <struts2Version>2.3.16.3</struts2Version>


--===============4118134781078317266==--