September 2010 - Lima-commits - mailman.cloud.codelutin.com

r3036 - trunk
by tchemit＠users.chorem.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:12:35 +0200 (Wed, 29 Sep 2010) New Revision: 3036 Url: http://chorem.org/repositories/revision/lima/3036 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-21 12:50:19 UTC (rev 3035) +++ trunk/pom.xml 2010-09-29 08:12:35 UTC (rev 3036) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r3035 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima/ui/home
by ymartel＠users.chorem.org 21 Sep '10

21 Sep '10

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") - + " " + entryBooks.get(0) + + " " + entryBooks.get(0).getLabel() + " <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>" + "<a href='#entrybookschart'>" + _("lima.home.entrybooks.modify") + "</a>";

1 0

r3034 - trunk/lima-swing/src/main/resources
by ymartel＠users.chorem.org 20 Sep '10

20 Sep '10

Author: ymartel Date: 2010-09-20 17:53:53 +0200 (Mon, 20 Sep 2010) New Revision: 3034 Url: http://chorem.org/repositories/revision/lima/3034 Log: [lima-swing] Change l'emplacement des logs dans le home du user /.lima/lima.log Modified: trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2010-09-20 09:14:06 UTC (rev 3033) +++ trunk/lima-swing/src/main/resources/log4j.properties 2010-09-20 15:53:53 UTC (rev 3034) @@ -6,9 +6,9 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -#�File ouptut +# File ouptut log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=lima.log +log4j.appender.file.file=${user.home}/.lima/lima.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n

1 0

r3033 - trunk
by ymartel＠users.chorem.org 20 Sep '10

20 Sep '10

Author: ymartel Date: 2010-09-20 11:14:06 +0200 (Mon, 20 Sep 2010) New Revision: 3033 Url: http://chorem.org/repositories/revision/lima/3033 Log: [lima] Fix du README: lima-main chang?\195?\169 en lima-swing + ajout du lien vers le site Modified: trunk/README.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2010-09-09 09:34:23 UTC (rev 3032) +++ trunk/README.txt 2010-09-20 09:14:06 UTC (rev 3033) @@ -1,3 +1,6 @@ pour lancer lima:: - cd lima-main ; mvn -Prun + cd lima-swing; mvn -Prun + +Site de documentation: + http://maven-site.chorem.org/lima/

1 0

r3032 - trunk
by tchemit＠users.chorem.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:34:23 +0200 (Thu, 09 Sep 2010) New Revision: 3032 Url: http://chorem.org/repositories/revision/lima/3032 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:23:03 UTC (rev 3031) +++ trunk/pom.xml 2010-09-09 09:34:23 UTC (rev 3032) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <groupId>org.chorem</groupId>

1 0