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/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2010-09-20 15:53:53 UTC (rev 3034) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2010-09-21 12:50:19 UTC (rev 3035) @@ -31,7 +31,7 @@ /** * Configuration pour le business. * - * A voir comment le lier avec celui de lima main. + * A voir comment le lier avec celui de lima swing. * * @author chatellier * @version $Revision$ @@ -89,22 +89,22 @@ return accountingRules; } - - - /** - * - * @param configFileName - */ + + public String getReportsDir(){ - return getOption(Option.REPORTS_DIR.getKey()); + String reportsDir = getOption(Option.REPORTS_DIR.getKey()); + return reportsDir; } - + public String getAddressServer(){ - return getOption(Option.SERVER_ADRESS.getKey()); + String serverAddress = getOption(Option.SERVER_ADRESS.getKey()); + return serverAddress; } public int getHttpPort(){ - return Integer.valueOf(getOption(Option.HTTP_PORT.getKey())); + String httpPort = getOption(Option.HTTP_PORT.getKey()); + Integer port = Integer.valueOf(httpPort); + return port; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-09-20 15:53:53 UTC (rev 3034) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-09-21 12:50:19 UTC (rev 3035) @@ -95,7 +95,7 @@ String entryBooksString=""; if (ebSize == 1){ entryBooksString = _("lima.home.entrybooks.state.single") - + "<br/>" + entryBooks.get(0) + + "<br/>" + entryBooks.get(0).getLabel() + "<br/><br/><a href='#entrybookschart'>" + _("lima.home.entrybooks.modify") + "</a>"; @@ -104,10 +104,15 @@ entryBooksString = _("lima.home.entrybooks.state1_2.plural") + " " + entryBooks.size() + " " + _("lima.home.entrybooks.state2_2.plural") + "<ul>"; - for (EntryBook entryBook : entryBooks) { - entryBooksString += "<li>"+entryBook.getCode() + + for (int i = 0; i < ebSize && i < 3; i++) { +// for (EntryBook entryBook : entryBooks) { + EntryBook entryBook = entryBooks.get(i); + entryBooksString += "<li>"+entryBook.getCode() + " - "+entryBook.getLabel()+"</li>"; } + if (ebSize > 3) { + entryBooksString += "<li> ... </li>"; + } entryBooksString += "</ul></p><p horizontal-align:'center'>" + "<a href='#entrybookschart'>" + _("lima.home.entrybooks.modify") + "</a>";