From ymartel@users.chorem.org Tue Sep 21 14:50:20 2010
From: ymartel@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3035 - in trunk:
	lima-business/src/main/java/org/chorem/lima/business
	lima-swing/src/main/java/org/chorem/lima/ui/home
Date: Tue, 21 Sep 2010 14:50:20 +0200
Message-ID: <20100921125020.0D52C1591C@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5621243736257811058=="

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

Author: ymartel
Date: 2010-09-21 14:50:19 +0200 (Tue, 21 Sep 2010)
New Revision: 3035

Url: http://chorem.org/repositories/revision/lima/3035

Log:
- Fix de l'affichage du nom des journaux a l'ecran principal
- Reduction du nom de journaux affich?\195?\169s ?\195?\160 l'ecran principal=
 ?\195?\160 3.



Modified:
   trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConf=
ig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.jav=
a	2010-09-20 15:53:53 UTC (rev 3034)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.jav=
a	2010-09-21 12:50:19 UTC (rev 3035)
@@ -31,7 +31,7 @@
 /**
  * Configuration pour le business.
  *=20
- * A voir comment le lier avec celui de lima main.
+ * A voir comment le lier avec celui de lima swing.
  *=20
  * @author chatellier
  * @version $Revision$
@@ -89,22 +89,22 @@
 =20
         return accountingRules;
     }
-   =20
-   =20
-    /**
-     *=20
-     * @param configFileName
-     */
+
+
     public String getReportsDir(){
-    	return getOption(Option.REPORTS_DIR.getKey());
+        String reportsDir =3D getOption(Option.REPORTS_DIR.getKey());
+        return reportsDir;
     }
-   =20
+
     public String getAddressServer(){
-    	return getOption(Option.SERVER_ADRESS.getKey());
+        String serverAddress =3D getOption(Option.SERVER_ADRESS.getKey());
+        return serverAddress;
     }
    =20
     public int getHttpPort(){
-    	return Integer.valueOf(getOption(Option.HTTP_PORT.getKey()));
+        String httpPort =3D getOption(Option.HTTP_PORT.getKey());
+        Integer port =3D Integer.valueOf(httpPort);
+        return port;
     }
    =20
    =20

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPa=
ne.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.jav=
a	2010-09-20 15:53:53 UTC (rev 3034)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.jav=
a	2010-09-21 12:50:19 UTC (rev 3035)
@@ -95,7 +95,7 @@
 				String entryBooksString=3D"";
 				if (ebSize =3D=3D 1){
 					entryBooksString =3D _("lima.home.entrybooks.state.single")
-					+ "<br/>" + entryBooks.get(0)
+					+ "<br/>" + entryBooks.get(0).getLabel()
 					+ "<br/><br/><a href=3D'#entrybookschart'>"
 					+ _("lima.home.entrybooks.modify") + "</a>";
 				=09
@@ -104,10 +104,15 @@
 			    	entryBooksString =3D _("lima.home.entrybooks.state1_2.plural")
 			    	+ " " + entryBooks.size() + " "
 			    	+ _("lima.home.entrybooks.state2_2.plural") + "<ul>";
-			    	for (EntryBook entryBook : entryBooks) {
-						entryBooksString +=3D "<li>"+entryBook.getCode() +
+                    for (int i =3D 0; i < ebSize && i < 3; i++) {
+//			    	for (EntryBook entryBook : entryBooks) {
+                        EntryBook entryBook =3D entryBooks.get(i);
+                        entryBooksString +=3D "<li>"+entryBook.getCode() +
 						" - "+entryBook.getLabel()+"</li>";
 					}
+                    if (ebSize > 3) {
+                        entryBooksString +=3D "<li> ... </li>";
+                    }
 			    	entryBooksString +=3D "</ul></p><p horizontal-align:'center'>"
 			    		+ "<a href=3D'#entrybookschart'>"
 			    		+ _("lima.home.entrybooks.modify") + "</a>";


--===============5621243736257811058==--