- Cash-commits - mailman.cloud.codelutin.com

r33 - trunk/src/site
by jcouteau＠users.chorem.org 25 Sep '09

25 Sep '09

Author: jcouteau Date: 2009-09-25 09:55:33 +0200 (Fri, 25 Sep 2009) New Revision: 33 Modified: trunk/src/site/site.xml Log: Download link point on files list on redmine instead of maven repo Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-24 14:22:24 UTC (rev 32) +++ trunk/src/site/site.xml 2009-09-25 07:55:33 UTC (rev 33) @@ -23,8 +23,7 @@ </menu> <menu name="Download"> - <item name="Stable" href="http://maven.chorem.org/release/org/chorem/cash"/> - <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/cash"/> + <item name="Download" href="http://chorem.org/projects/list_files/cash"/> </menu> <menu name="Trackers">

1 0

r32 - trunk/src/site
by jcouteau＠users.chorem.org 24 Sep '09

24 Sep '09

Author: jcouteau Date: 2009-09-24 16:22:24 +0200 (Thu, 24 Sep 2009) New Revision: 32 Modified: trunk/src/site/site.xml Log: Add download links on maven-site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-09 13:16:49 UTC (rev 31) +++ trunk/src/site/site.xml 2009-09-24 14:22:24 UTC (rev 32) @@ -22,7 +22,10 @@ <item name="Accueil" href="index.html"/> </menu> - <menu ref="modules"/> + <menu name="Download"> + <item name="Stable" href="http://maven.chorem.org/release/org/chorem/cash"/> + <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/cash"/> + </menu> <menu name="Trackers"> <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/>

1 0

r31 - in trunk/cash-business/src: . site site/rst
by tchemit＠users.chorem.org 09 Sep '09

09 Sep '09

Author: tchemit Date: 2009-09-09 15:16:49 +0200 (Wed, 09 Sep 2009) New Revision: 31 Added: trunk/cash-business/src/site/ trunk/cash-business/src/site/rst/ trunk/cash-business/src/site/rst/index.rst trunk/cash-business/src/site/site.xml Log: [Evolution #47] : faire le site maven, optimisation des dependances, ajout license, bump mavenpom to 1.0.2 Added: trunk/cash-business/src/site/rst/index.rst =================================================================== --- trunk/cash-business/src/site/rst/index.rst (rev 0) +++ trunk/cash-business/src/site/rst/index.rst 2009-09-09 13:16:49 UTC (rev 31) @@ -0,0 +1,4 @@ +Ca$h-business +============= + +A faire :) \ No newline at end of file Added: trunk/cash-business/src/site/site.xml =================================================================== --- trunk/cash-business/src/site/site.xml (rev 0) +++ trunk/cash-business/src/site/site.xml 2009-09-09 13:16:49 UTC (rev 31) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r30 - in trunk: . cash-business cash-ui/src cash-ui/src/site cash-ui/src/site/rst src src/site src/site/rst
by tchemit＠users.chorem.org 09 Sep '09

09 Sep '09

Author: tchemit Date: 2009-09-09 15:13:50 +0200 (Wed, 09 Sep 2009) New Revision: 30 Added: trunk/cash-ui/src/site/ trunk/cash-ui/src/site/rst/ trunk/cash-ui/src/site/rst/index.rst trunk/cash-ui/src/site/site.xml trunk/src/ trunk/src/site/ trunk/src/site/rst/ trunk/src/site/rst/index.rst trunk/src/site/site.xml Modified: trunk/ trunk/cash-business/pom.xml trunk/pom.xml Log: [Evolution #47] : faire le site maven, optimisation des dependances, ajout license, bump mavenpom to 1.0.2 Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/cash-business/pom.xml =================================================================== --- trunk/cash-business/pom.xml 2009-09-02 19:42:34 UTC (rev 29) +++ trunk/cash-business/pom.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   @@ -31,8 +31,8 @@ <artifactId>oasis-ciq-api</artifactId> </dependency> <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> </dependency>  <dependency> @@ -57,6 +57,11 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> </dependencies>   @@ -65,7 +70,8 @@ <name>Ca$h Business</name> <description>Métier de l'application Cash. Implémentation des services et gestion Base de données. - Les entités, services et DTO sont générés par ToPIA</description> + Les entités, services et DTO sont générés par ToPIA + </description>  <developers> Added: trunk/cash-ui/src/site/rst/index.rst =================================================================== --- trunk/cash-ui/src/site/rst/index.rst (rev 0) +++ trunk/cash-ui/src/site/rst/index.rst 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,4 @@ +Ca$h-ui +======= + +A faire :) \ No newline at end of file Added: trunk/cash-ui/src/site/site.xml =================================================================== --- trunk/cash-ui/src/site/site.xml (rev 0) +++ trunk/cash-ui/src/site/site.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-02 19:42:34 UTC (rev 29) +++ trunk/pom.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>org.chorem</groupId> @@ -48,6 +48,39 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-soa</artifactId> <version>${topia.version}</version> + <exclusions> +  + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-aegis</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + </exclusion> + +  + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -55,9 +88,9 @@ <version>${lang.version}</version> </dependency> <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.4.0</version> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -81,10 +114,10 @@ <artifactId>chenillekit-tapestry</artifactId> <version>${chenillekit.version}</version> <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -166,9 +199,13 @@  <tapestry.version>5.1.0.5</tapestry.version> <chenillekit.version>1.0.2</chenillekit.version> + +  + <license.licenseName>gpl_v3</license.licenseName> + </properties> - <build> + <build> <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> @@ -178,7 +215,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> Added: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst (rev 0) +++ trunk/src/site/rst/index.rst 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,4 @@ +Ca$h +==== + +A faire :) \ No newline at end of file Added: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml (rev 0) +++ trunk/src/site/site.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu ref="modules"/> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r29 - in trunk/cash-business/src/main: java/org/chorem/cash/business java/org/chorem/cash/impl xmi
by fdesbois＠users.chorem.org 02 Sep '09

02 Sep '09

Author: fdesbois Date: 2009-09-02 21:42:34 +0200 (Wed, 02 Sep 2009) New Revision: 29 Modified: trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java trunk/cash-business/src/main/xmi/cash.zargo Log: [FIX] http://chorem.org/issues/show/41 Add composite between Categ and Entry for delete Modified: trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java 2009-08-31 16:38:06 UTC (rev 28) +++ trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java 2009-09-02 19:42:34 UTC (rev 29) @@ -184,7 +184,7 @@ public static void addEntryForMonth(EntryEntity entity, Date currentDate, Map<String, List<Entry>> results, String pattern) throws ConvertException { /*if (log.isDebugEnabled() && entity.getEntryFrequencyEntity() != null) { log.debug("PERIODIC ENTRY : beginDate = " + entity.getEntryDate() + " _ current = " + currentDate); - }*/ + }*/ Entry result = EntryHelper.getEntry(entity, currentDate); String month = DateUtils.formatDate(currentDate, pattern); List<Entry> current = results.get(month); Modified: trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-31 16:38:06 UTC (rev 28) +++ trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-09-02 19:42:34 UTC (rev 29) @@ -237,8 +237,13 @@ List<EntryEntity> entries = dao.findAllBetweenDates(period.getFromDate(), period.getThruDate()); + int nbBadEntries = 0; for (EntryEntity entity : entries) { - EntryHelper.addEntryForMonth(entity, entity.getEntryDate(), results, period.getPattern()); + if (entity.getCategoryEntity() != null) { // Temporary FIX for Unbound entries with category + EntryHelper.addEntryForMonth(entity, entity.getEntryDate(), results, period.getPattern()); + } else { + nbBadEntries++; + } } List<EntryEntity> periodicEntries = dao.findUnlimitedPeriodicEntries(); @@ -275,42 +280,47 @@ results = helper.execute(results); }*/ + if (periodicEntry.getCategoryEntity() != null) { // Temporary FIX for Unbound entries with category - Calendar calendar = new GregorianCalendar(); - calendar.setTime(periodicEntry.getEntryDate()); - // Si entryDate est contenu dans la periode, l'entree sera deja dans la liste des entries - calendar.add(Calendar.MONTH, frequency.getInterval()); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(periodicEntry.getEntryDate()); + // Si entryDate est contenu dans la periode, l'entree sera deja dans la liste des entries + calendar.add(Calendar.MONTH, frequency.getInterval()); - Periodicity periodicity = Periodicity.valueOf(frequency.getPeriodicity()); + Periodicity periodicity = Periodicity.valueOf(frequency.getPeriodicity()); - if (frequency.getUnlimited()) { - while (period.beforeEnd(calendar)) { - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + if (frequency.getUnlimited()) { + while (period.beforeEnd(calendar)) { + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } + calendar.add(Calendar.MONTH, frequency.getInterval()); } - calendar.add(Calendar.MONTH, frequency.getInterval()); - } - } else if (frequency.getNbTimes() > 0) { - int count = 0; - while (period.beforeEnd(calendar) && count < frequency.getNbTimes()) { - calendar.add(Calendar.MONTH, frequency.getInterval()); - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } else if (frequency.getNbTimes() > 0) { + int count = 0; + while (period.beforeEnd(calendar) && count < frequency.getNbTimes()) { + calendar.add(Calendar.MONTH, frequency.getInterval()); + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } + count++; } - count++; - } - } else if (frequency.getUntilDate() != null) { - Date untilDate = frequency.getUntilDate(); - while (period.beforeEnd(calendar) && (calendar.getTime().before(untilDate) || untilDate.equals(calendar.getTime()))) { - calendar.add(Calendar.MONTH, frequency.getInterval()); - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } else if (frequency.getUntilDate() != null) { + Date untilDate = frequency.getUntilDate(); + while (period.beforeEnd(calendar) && (calendar.getTime().before(untilDate) || untilDate.equals(calendar.getTime()))) { + calendar.add(Calendar.MONTH, frequency.getInterval()); + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } } } + } else { + nbBadEntries++; } } if (log.isDebugEnabled()) { + log.debug("Bad entries : " + nbBadEntries); log.debug("NbEntries find : " + entries.size()); log.debug("NbPeriodicEntries find : " + periodicEntries.size()); log.debug("Results added : " + results.size() + " _ keys = " + results.keySet()); Modified: trunk/cash-business/src/main/xmi/cash.zargo =================================================================== (Binary files differ)

1 0

r28 - trunk
by fdesbois＠users.chorem.org 31 Aug '09

31 Aug '09

Author: fdesbois Date: 2009-08-31 18:38:06 +0200 (Mon, 31 Aug 2009) New Revision: 28 Modified: trunk/pom.xml Log: Change mavenpom version to snapshot and add license config Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-28 11:39:48 UTC (rev 27) +++ trunk/pom.xml 2009-08-31 16:38:06 UTC (rev 28) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -109,6 +109,14 @@ <description>Gestion de la trésorerie avec vue prévisionnelle</description> <inceptionYear>2009</inceptionYear> + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> +  <developers> <developer> @@ -140,7 +148,6 @@  <topia.version>2.2.0</topia.version> <generator.version>1.0.0</generator.version> - <jrst.version>1.0.0</jrst.version>  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -153,6 +160,9 @@  <junit.version>4.6</junit.version> +  + <license.licenseName>gpl_v3</license.licenseName> +  <tapestry.version>5.1.0.5</tapestry.version> <chenillekit.version>1.0.2</chenillekit.version> @@ -168,7 +178,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>1.0.0</version> </dependency> </dependencies> </plugin>

1 0

r27 - in trunk/cash-ui/src/main: java/org/chorem/cash/ui/components webapp/META-INF
by fdesbois＠users.chorem.org 28 Aug '09

28 Aug '09

Author: fdesbois Date: 2009-08-28 13:39:48 +0200 (Fri, 28 Aug 2009) New Revision: 27 Modified: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java trunk/cash-ui/src/main/webapp/META-INF/context.xml Log: - Resolve issues on messages for EntryForm Modified: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java 2009-08-26 15:30:34 UTC (rev 26) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java 2009-08-28 11:39:48 UTC (rev 27) @@ -120,7 +120,14 @@ return zones;*/ return new MultiZoneUpdate(zoneId, renderer).add(getZoneId(), getZone().getBody()); } + + private boolean noLoading; + public Zone globalZoneWithoutReloading() { + noLoading = true; + return getGlobalZone(); + } + /** * Initialisation des erreurs et warnings. Utiliser avant rendu du composant Warnings. * @param errors liste des messages d'erreurs @@ -163,7 +170,9 @@ */ //@Log public Block getActiveBlock() { - container.loadData(); + if (!noLoading) { + container.loadData(); + } if (hasErrors()) { return errorsBlock; } Modified: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java 2009-08-26 15:30:34 UTC (rev 26) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java 2009-08-28 11:39:48 UTC (rev 27) @@ -261,6 +261,7 @@ */ @Log void onSelectedFromAddEntry() { + clientMessages.clean(); entry = serviceEntry.getNewEntry(); getListEntries().addEntry(entry); if (log.isDebugEnabled()) { @@ -395,7 +396,8 @@ } } //return clientMessages.getGlobalZone().getBody();//clientMessages.zoneManager("entryFormComponent", entryForm); - return clientMessages.zoneManager("entryFormComponent", entryForm); + //return clientMessages.zoneManager("entryFormComponent", entryForm); + return clientMessages.globalZoneWithoutReloading(); } /** Modified: trunk/cash-ui/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/cash-ui/src/main/webapp/META-INF/context.xml 2009-08-26 15:30:34 UTC (rev 26) +++ trunk/cash-ui/src/main/webapp/META-INF/context.xml 2009-08-28 11:39:48 UTC (rev 27) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/cash-branche"/> +<Context antiJARLocking="true" path="/cash"/>

1 0

r26 - in trunk: . cash-business cash-business/src/main/java/org/chorem/cash/impl cash-business/src/main/xmi cash-ui cash-ui/src/main/java/org/chorem/cash/ui/base cash-ui/src/main/java/org/chorem/cash/ui/components cash-ui/src/main/resources/org/chorem/cash/ui/components cash-ui/src/main/webapp cash-ui/src/main/webapp/META-INF cash-ui/src/main/webapp/css cash-ui/src/main/webapp/img cash-ui/src/main/webapp/img/icons cash-ui/src/main/webapp/img/icons/crystal
by fdesbois＠users.chorem.org 26 Aug '09

26 Aug '09

Author: fdesbois Date: 2009-08-26 17:30:34 +0200 (Wed, 26 Aug 2009) New Revision: 26 Added: trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/FrequencyEndCondition.java trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/SubmitContext.java Removed: trunk/cash-ui/src/main/webapp/img/icons/cancel.png trunk/cash-ui/src/main/webapp/img/icons/crystal/address.png trunk/cash-ui/src/main/webapp/img/icons/crystal/address2.png trunk/cash-ui/src/main/webapp/img/icons/crystal/apply.png trunk/cash-ui/src/main/webapp/img/icons/crystal/blabla.png trunk/cash-ui/src/main/webapp/img/icons/crystal/cellphone.png trunk/cash-ui/src/main/webapp/img/icons/crystal/delete.png trunk/cash-ui/src/main/webapp/img/icons/crystal/email.png trunk/cash-ui/src/main/webapp/img/icons/crystal/fax.png trunk/cash-ui/src/main/webapp/img/icons/crystal/internet.png trunk/cash-ui/src/main/webapp/img/icons/crystal/internet2.png trunk/cash-ui/src/main/webapp/img/icons/crystal/phone.png trunk/cash-ui/src/main/webapp/img/icons/crystal/reference.png trunk/cash-ui/src/main/webapp/img/icons/delete.png trunk/cash-ui/src/main/webapp/img/icons/delete_icon.png trunk/cash-ui/src/main/webapp/img/icons/earth.png trunk/cash-ui/src/main/webapp/img/icons/edit_icon.png trunk/cash-ui/src/main/webapp/img/icons/first.png trunk/cash-ui/src/main/webapp/img/icons/iaction.png trunk/cash-ui/src/main/webapp/img/icons/last.png trunk/cash-ui/src/main/webapp/img/icons/maximize.gif trunk/cash-ui/src/main/webapp/img/icons/mini_cross.gif trunk/cash-ui/src/main/webapp/img/icons/mini_tick.gif trunk/cash-ui/src/main/webapp/img/icons/minimize.gif trunk/cash-ui/src/main/webapp/img/icons/movedown.png trunk/cash-ui/src/main/webapp/img/icons/movetobottom.png trunk/cash-ui/src/main/webapp/img/icons/movetotop.png trunk/cash-ui/src/main/webapp/img/icons/moveup.png trunk/cash-ui/src/main/webapp/img/icons/next.png trunk/cash-ui/src/main/webapp/img/icons/previous.png trunk/cash-ui/src/main/webapp/img/icons/tick.png trunk/cash-ui/src/main/webapp/img/pollen.png Modified: trunk/ trunk/cash-business/pom.xml trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java trunk/cash-business/src/main/xmi/cash.zargo trunk/cash-ui/nbactions.xml trunk/cash-ui/pom.xml trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/DataLoader.java trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/ListEntries.java trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/ClientMessages.tml trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.properties trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.tml trunk/cash-ui/src/main/webapp/META-INF/context.xml trunk/cash-ui/src/main/webapp/PreviewTable.tml trunk/cash-ui/src/main/webapp/css/common.css trunk/cash-ui/src/main/webapp/img/icons/crystal/add.png trunk/cash-ui/src/main/webapp/img/icons/crystal/cancel.png trunk/cash-ui/src/main/webapp/img/icons/crystal/clock.png trunk/cash-ui/src/main/webapp/img/icons/crystal/edit.png trunk/cash-ui/src/main/webapp/img/icons/crystal/info.png trunk/cash-ui/src/main/webapp/img/icons/crystal/movedown.png trunk/cash-ui/src/main/webapp/img/icons/crystal/movetobottom.png trunk/cash-ui/src/main/webapp/img/icons/crystal/movetotop.png trunk/cash-ui/src/main/webapp/img/icons/crystal/moveup.png trunk/cash-ui/src/main/webapp/img/icons/crystal/reload.png trunk/cash-ui/src/main/webapp/img/icons/crystal/remove.png trunk/cash-ui/src/main/webapp/img/icons/crystal/save.png trunk/cash-ui/src/main/webapp/img/icons/crystal/showdetails.png trunk/cash-ui/src/main/webapp/img/icons/crystal/stop.png trunk/cash-ui/src/main/webapp/img/icons/crystal/warning.png trunk/pom.xml Log: Merge branche alpha3 and trunk Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/alpha3-periodicity:20-25 Modified: trunk/cash-business/pom.xml =================================================================== --- trunk/cash-business/pom.xml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-business/pom.xml 2009-08-26 15:30:34 UTC (rev 26) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>cash</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> + <version>1.0.0-alpha-3-SNAPSHOT</version> </parent> <groupId>org.chorem.cash</groupId> Modified: trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-26 15:30:34 UTC (rev 26) @@ -17,6 +17,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* */ + package org.chorem.cash.impl; import java.util.ArrayList; @@ -26,30 +27,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.cash.CashException; import org.chorem.cash.CashModelDAOHelper; import org.chorem.cash.ContextUtilCash; import org.chorem.cash.business.EntryHelper; -import org.chorem.cash.business.PeriodicHelper; -import org.chorem.cash.business.PeriodicHelperByMonth; import org.chorem.cash.business.Periodicity; -import org.chorem.cash.business.ReferenceHelper; -import org.chorem.cash.dto.Category; import org.chorem.cash.dto.Entry; import org.chorem.cash.dto.Reference; -import org.chorem.cash.persistence.CategoryEntity; -import org.chorem.cash.persistence.CategoryEntityDAO; import org.chorem.cash.persistence.EntryEntity; import org.chorem.cash.persistence.EntryEntityDAO; import org.chorem.cash.persistence.EntryFrequencyEntity; import org.chorem.cash.services.ServiceEntry; import org.chorem.cash.services.ServiceEntryAbstract; -import org.chorem.exceptions.ConvertException; -import org.chorem.utils.DateUtils; import org.chorem.utils.PeriodDates; import org.chorem.utils.ServiceHelper; import org.nuiton.topia.TopiaContext; @@ -89,9 +80,9 @@ EntryFrequencyEntity frequency = oldEntry.getEntryFrequencyEntity(); - if (frequency != null && (entry.getPeriodicity() == null || "".equals(entry.getPeriodicity()))) { // Entite anciennement periodique mais l'entree courante devient indépendante + if (frequency != null && (entry.getFrequencyId() == null || "".equals(entry.getFrequencyId()))) { // Entite anciennement periodique mais l'entree courante devient indépendante - if (frequency.getUnlimited()) { // Cas illimite : une seule entite en base + if (frequency.getUnlimited()) { // Cas illimite // On recupere l'ancienne version de l'entite (avec sa frequence) Calendar calendar = new GregorianCalendar(); @@ -117,6 +108,9 @@ newAfterEntry.setEntryDate(calendar.getTime()); EntryHelper.createUpdateEntry(newAfterEntry, transaction, log); + + entry.setFrequencyId(""); + entry.setPeriodicity(""); } else if (frequency.getNbTimes() > 0) { } @@ -197,7 +191,42 @@ return result; } + /** + * FIXME clone entry + * @param entry + * @return + */ @Override + public Entry getNewEntry(Entry entry) { + Entry result = new Entry(); + result.setId(entry.getId()); + result.setLibelle(entry.getLibelle()); + result.setCategory(entry.getCategory()); + result.setAmount(entry.getAmount()); + result.setComment(entry.getComment()); + result.setEntryDate(entry.getEntryDate()); + + result.setReferences(new ArrayList<Reference>(entry.getReferences())); // Clone references ? + + // principal for frequency + result.setFrequencyId(entry.getFrequencyId()); + result.setCurrentDate(entry.getCurrentDate()); + + // for frequency + result.setPeriodicity(entry.getPeriodicity()); + result.setInterval(entry.getInterval()); + result.setNbTimes(entry.getNbTimes()); + result.setUnlimited(entry.getUnlimited()); + result.setDay(entry.getDay()); + result.setDayOfWeek(entry.getDayOfWeek()); + + // for ui + result.setShowFrequency(entry.getShowFrequency()); + + return result; + } + + @Override public Map<String, List<Entry>> getEntriesBetweenDates(PeriodDates period) throws CashException { TopiaContext transaction = null; Map<String, List<Entry>> results = new HashMap<String, List<Entry>>(); Modified: trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java 2009-08-26 15:30:34 UTC (rev 26) @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.ListIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.cash.CashException; Modified: trunk/cash-business/src/main/xmi/cash.zargo =================================================================== (Binary files differ) Modified: trunk/cash-ui/nbactions.xml =================================================================== --- trunk/cash-ui/nbactions.xml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/nbactions.xml 2009-08-26 15:30:34 UTC (rev 26) @@ -4,6 +4,8 @@ <actionName>CUSTOM-Tomcat embedded</actionName> <displayName>Tomcat embedded</displayName> <goals> + <goal>clean</goal> + <goal>install</goal> <goal>tomcat:run</goal> <goal>-Dtapestry.compress-whitespace=false</goal> <goal>-Dorg.apache.tapestry.disable-caching=true</goal> Modified: trunk/cash-ui/pom.xml =================================================================== --- trunk/cash-ui/pom.xml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/pom.xml 2009-08-26 15:30:34 UTC (rev 26) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>cash</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> + <version>1.0.0-alpha-3-SNAPSHOT</version> </parent> <groupId>org.chorem.cash</groupId> Property changes on: trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/DataLoader.java ___________________________________________________________________ Deleted: svn:mergeinfo - Copied: trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/FrequencyEndCondition.java (from rev 25, branches/alpha3-periodicity/cash-ui/src/main/java/org/chorem/cash/ui/base/FrequencyEndCondition.java) =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/FrequencyEndCondition.java (rev 0) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/FrequencyEndCondition.java 2009-08-26 15:30:34 UTC (rev 26) @@ -0,0 +1,33 @@ +/** + * *##% Ca$h Web Interface + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* + */ + +package org.chorem.cash.ui.base; + +/** + * FrequencyEndCondition.java + * + * @author fdesbois + * @version $Revision: 3 $ + * + * Last update: $Date: 2009-07-31 16:54:15 +0200 (ven 31 jui 2009) $ + * by : $Author: fdesbois $ + */ +public enum FrequencyEndCondition { + UNLIMITED, UNTIL_DATE, NB_TIMES +} Modified: trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/ListEntries.java =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/ListEntries.java 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/base/ListEntries.java 2009-08-26 15:30:34 UTC (rev 26) @@ -25,6 +25,7 @@ import java.util.List; import org.chorem.cash.dto.Category; import org.chorem.cash.dto.Entry; +import org.chorem.cash.services.ServiceEntry; import org.chorem.utils.DateUtils; /** @@ -42,7 +43,7 @@ * Last update: $Date: 2009-08-13 09:14:50 +0200 (Thu, 13 Aug 2009) $ * by : $Author: fdesbois $ */ -public class ListEntries implements Serializable { +public class ListEntries implements Serializable, Cloneable { private Category category; @@ -62,6 +63,18 @@ this.libelle = ""; } + public ListEntries(ListEntries listEntries, ServiceEntry service) { + this.category = listEntries.getCategory(); + this.month = listEntries.getMonth(); + this.amount = listEntries.getAmount(); + this.libelle = listEntries.getLibelle(); + this.entries = new ArrayList<Entry>(); + for (Entry entry : listEntries.getEntries()) { + Entry newEntry = service.getNewEntry(entry); + this.entries.add(newEntry); + } + } + /** * Total calcule au moment de son acces pour permettre les mises a jour depuis formulaires. * @return le montant total de toutes les entrees de la liste @@ -114,12 +127,12 @@ * Suppression d'une entree * @param entryId identifiant de l'entree a supprimer */ - public void removeEntry(String entryId) { + /*public void removeEntry(String entryId) { Entry entry = getEntry(entryId); if (entry != null) { entries.remove(entry); } - } + }*/ /** * Accesseur pour recuperer une seule entree identifier par le parametre donne. Property changes on: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/ClientMessages.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/EntryForm.java 2009-08-26 15:30:34 UTC (rev 26) @@ -21,6 +21,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.InjectContainer; @@ -33,12 +34,15 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.PageRenderLinkSource; import org.chorem.cash.CashException; +import org.chorem.cash.business.Periodicity; import org.chorem.cash.dto.Entry; import org.chorem.cash.services.ServiceEntry; import org.chorem.cash.ui.base.DataLoader; +import org.chorem.cash.ui.base.FrequencyEndCondition; import org.chorem.cash.ui.base.ListEntries; import org.chorem.cash.ui.pages.PreviewTable; import org.chorem.cash.ui.utils.ErrorHelper; +import org.chorem.utils.DateUtils; import org.slf4j.Logger; /** @@ -68,12 +72,6 @@ private ClientMessages clientMessages; /** - * Page dans laquelle est utiliser le composant EntryForm. Il s'agit du tableau previsionnel afficher par mois. - */ - @InjectContainer - private PreviewTable previewTable; - - /** * PageRender pour garder l'identifiant de la liste entries, utiliser comme contexte de la page PreviewTable. */ @Inject @@ -89,8 +87,8 @@ * Parametre d'entree du composant. List des entrees fournie (et persister) par la page PreviewTable. * Le cache est desactive pour recuperer la ListEntries depuis PreviewTable a chaque demande du composant. */ - @Parameter(cache = false) - private ListEntries listEntries; + @Parameter(cache = false, required = true) + private ListEntries listEntriesParameter; /** * Entree courante pour affichage des lignes du formulaire @@ -99,20 +97,23 @@ private Entry entry; /** - * Liste des entrees (recuperer depuis la ListEntries passe en parametre) + * Liste des entrees persistante pour modifications (copier de la ListEntries passe en parametre) */ - private List<Entry> entries; + @Persist + private ListEntries listEntries; /** * Flag pour detecter l'activation du bouton d'ajout d'une ligne de formulaire */ - private boolean addEntrySelected; + private boolean editSelected; /** * Flag pour detecter l'activation du bouton de retour en arriere (rechargement de la page PreviewTable) */ private boolean cancelFormSelected; + //private boolean clockFormSelected; + /** * Formulaire pour l'ajout/modification des entrees */ @@ -125,6 +126,9 @@ @InjectComponent private Zone entryFormComponent; + @Property + private int indexEntry; + /** * Liste des identifiants des entrees a supprimer une fois le formulaire soumis. (sauvegarde) */ @@ -132,16 +136,104 @@ private List<String> entriesDeleted; public ListEntries getListEntries() { - return this.listEntries; + if (listEntries == null) { + if (log.isDebugEnabled()) { + log.debug("GET ENTRIES FROM CONTAINER"); + } + listEntries = new ListEntries(listEntriesParameter, serviceEntry); + } + return listEntries; } public List<Entry> getEntries() { - if (entries == null) { - entries = getListEntries().getEntries(); + return getListEntries().getEntries(); + } + + + public double getEntryAmount() { + return entry.getAmount(); + } + + @Log + public void setEntryAmount(double amount) { + if (!listEntries.getCategory().getCredit() && amount > 0) { + amount = -amount; } - return entries; + entry.setAmount(amount); } + public Date getEntryDate() { + if (getPeriodic()) { + return entry.getCurrentDate(); + } + return entry.getEntryDate(); + } + + public void setEntryDate(Date date) { + if (getPeriodic()) { + entry.setCurrentDate(date); + } else { + entry.setEntryDate(date); + } + } + + public FrequencyEndCondition getFrequencyEndCondition() { + if (entry.getUnlimited()) { + return FrequencyEndCondition.UNLIMITED; + } else if (entry.getNbTimes() > 0) { + return FrequencyEndCondition.NB_TIMES; + } else if (entry.getUntilDate() != null) { + return FrequencyEndCondition.UNTIL_DATE; + } + return FrequencyEndCondition.UNLIMITED; + } + + @Log + public void setFrequencyEndCondition(FrequencyEndCondition frequencyEnd) { + switch (frequencyEnd) { + case UNLIMITED: + entry.setUnlimited(true); + entry.setUntilDate(null); + entry.setNbTimes(0); + break; + case NB_TIMES: + entry.setUnlimited(false); + entry.setUntilDate(null); + break; + case UNTIL_DATE: + entry.setUnlimited(false); + entry.setNbTimes(0); + break; + } + if (log.isDebugEnabled()) { + log.debug("FREQUENCY_END : " + frequencyEnd); + log.debug("ENTRY : " + entry); + log.debug("ENTRY : unlimited=" + entry.getUnlimited() + ", untilDate=" + entry.getUntilDate() + ", nbTimes=" + entry.getNbTimes()); + } + } + + public FrequencyEndCondition getFrequencyUnlimited() { + return FrequencyEndCondition.UNLIMITED; + } + + public FrequencyEndCondition getFrequencyUntilDate() { + return FrequencyEndCondition.UNTIL_DATE; + } + + public FrequencyEndCondition getFrequencyNbTimes() { + return FrequencyEndCondition.NB_TIMES; + } + + public boolean getPeriodic() { + return entry.getPeriodicity() != null && !entry.getPeriodicity().isEmpty(); + } + + public void setPeriodic(boolean periodic) { + if (!periodic) { + entry.setFrequencyId(""); + } + } + /** * Chargement des donnees du composant. Si la ListEntries provenant de PreviewTable est vide, un message est afficher a l'utilisateur * via le composant ClientMessages. @@ -151,26 +243,17 @@ public void loadData() { clientMessages.clean(); entriesDeleted = new ArrayList<String>(); - if (getListEntries() != null && getEntries().size() == 0) { + + // listEntries persistant different de la listEntries en parametre + if (listEntries != null && !listEntries.getKey().equals(listEntriesParameter.getKey())) { + listEntries = null; + } + + if (getEntries().size() == 0) { clientMessages.addInfo("Aucune entrée existante, clickez sur le + pour en ajouter une nouvelle"); } } - /** - * Suppression d'une ligne de formulaire. Une entree est supprimable si elle a deja ete sauvegarde. - * @param entryId identifiant de l'entree a supprimer. - * @return un MultiZoneUpdate gerer par le composant ClientMessages (rafraichissement du formulaire et de la zone de messages) - */ - @Log - Object onActionFromRemoveEntry(String entryId) { - clientMessages.clean(); - if (entryId != null) { - clientMessages.addInfo("La suppression sera effective uniquement après sauvegarde"); - getListEntries().removeEntry(entryId); - entriesDeleted.add(entryId); - } - return clientMessages.zoneManager("entryFormComponent", entryFormComponent.getBody()); - } /** * Action sur le bouton d'ajout d'une entree au formulaire. Une nouvelle entree vide est ajouter a la ListEntries. @@ -183,36 +266,108 @@ if (log.isDebugEnabled()) { log.debug("DATE : " + entry.getEntryDate()); } - addEntrySelected = true; + editSelected = true; } + @Log + void onSelectedFromShowPeriodicity(int index) { + entry = getEntries().get(index); + + if (entry.getShowFrequency()) { + entry.setShowFrequency(false); + } else { + entry.setShowFrequency(true); + if (!getPeriodic()) { + entry.setPeriodicity(Periodicity.MONTHLY.toString()); + entry.setCurrentDate(entry.getEntryDate()); + } + } + + getEntries().set(index, entry); + editSelected = true; + } + + + @Log + Object onChangeFromAddPeriodicity(int index, String value) { // Checkbox + entry = getEntries().get(index); + + String periodicity = entry.getPeriodicity(); + if (log.isDebugEnabled()) { + log.debug("PERIODICITY : " + periodicity); + } + + if (entry.getShowFrequency()) { + entry.setShowFrequency(false); + } else if (!entry.getShowFrequency() && !getPeriodic()) { + entry.setShowFrequency(true); + } + + if (getPeriodic()) { + entry.setPeriodicity(null); + } else { + entry.setPeriodicity(Periodicity.MONTHLY.toString()); + entry.setCurrentDate(entry.getEntryDate()); + } + + getEntries().set(index, entry); + return clientMessages.getGlobalZone(); + } + /** + * Suppression d'une ligne de formulaire. Une entree est supprimable si elle a deja ete sauvegarde. + * @param entryId identifiant de l'entree a supprimer. + * @return un MultiZoneUpdate gerer par le composant ClientMessages (rafraichissement du formulaire et de la zone de messages) + */ + @Log + void onSelectedFromDeleteEntry(int index) { + String entryId = getEntries().get(index).getId(); + clientMessages.addInfo("La suppression sera effective uniquement après sauvegarde"); + getEntries().remove(index); + entriesDeleted.add(entryId); + editSelected = true; + } + + @Log + void onSelectedFromRemoveEntry(int index) { + getEntries().remove(index); + editSelected = true; + } + + /** * Action sur le bouton d'annulation qui activera le rechargement de la page. Les actions en cours (suppression/ajout/modification) ne * seront pas pris en compte. */ + @Log void onSelectedFromCancelForm() { - cancelFormSelected = true; + listEntries = null; + clientMessages.addInfo("Rechargement des données depuis la dernière sauvegarde"); + editSelected = true; } /** - * Succes du formulaire (les champs libelle et amount doivent etre valides). - * Trois cas de soumissions : - * - Cancel : Rechargement de la page PreviewTable ; - * - AddEntry : Ajout d'une ligne pour une nouvelle entree dans le formulaire ; - * - Save : Sauvegarde des ajouts/modifications/suppressions effectues par l'utilisateur. + * Succes du formulaire. Appele lors d'une action sur le formulaire (addEntry, cancelForm, removeEntry, deleteEntry, showPeriodicity, saveEntries). + * Sauvegarde des données uniquement lors de l'action sur le bouton saveEntries (editSelected = false). * @return la page PreviewTable si annulation ou sauvegarde effectue avec succes. La zone global du composant sinon. * @see org.chorem.cash.ui.components.ClientMessages */ @Log Object onSuccessFromEntryForm() { - clientMessages.clean(); + //clientMessages.clean(); entryForm.clearErrors(); - if (cancelFormSelected) { - return pageRender.createPageRenderLinkWithContext(PreviewTable.class, getListEntries().getKey()); - } - if (!addEntrySelected) { + /*if (cancelFormSelected) { + //return pageRender.createPageRenderLinkWithContext(PreviewTable.class, getListEntries().getKey()); + listEntries = null; + if (log.isDebugEnabled()) { + log.debug("CANCEL FORM"); + } + clientMessages.addInfo("Rechargement des données depuis la dernière sauvegarde"); + return clientMessages.zoneManager("entryFormComponent", entryFormComponent); + }*/ + if (!editSelected) { try { int index = 1; + for (Entry current : getEntries()) { if (current.getEntryDate() != null && current.getLibelle() != null) { serviceEntry.createUpdateEntry(current); @@ -220,7 +375,7 @@ entryForm.recordError("Champs incorrects pour entree " + index); } index++; - } + } for (String entryId : entriesDeleted) { serviceEntry.deleteEntry(entryId); @@ -239,7 +394,8 @@ } } } - return clientMessages.getGlobalZone().getBody();//clientMessages.zoneManager("entryFormComponent", entryForm); + //return clientMessages.getGlobalZone().getBody();//clientMessages.zoneManager("entryFormComponent", entryForm); + return clientMessages.zoneManager("entryFormComponent", entryForm); } /** Copied: trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/SubmitContext.java (from rev 25, branches/alpha3-periodicity/cash-ui/src/main/java/org/chorem/cash/ui/components/SubmitContext.java) =================================================================== --- trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/SubmitContext.java (rev 0) +++ trunk/cash-ui/src/main/java/org/chorem/cash/ui/components/SubmitContext.java 2009-08-26 15:30:34 UTC (rev 26) @@ -0,0 +1,129 @@ +// Copyright 2007 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.chorem.cash.ui.components; + +import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.MarkupWriter; +import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.corelib.base.AbstractField; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.FormSupport; +import org.apache.tapestry5.services.Heartbeat; +import org.apache.tapestry5.services.Request; + +/** + * Corresponds to <input type="submit">, a client-side element that can force the + * enclosing form to submit. The submit responsible for the form submission will post a + * notification that allows the application to know that it was the responsible entity. The + * notification is named "selected" and has a String context. + */ +public final class SubmitContext extends AbstractField +{ + static final String SELECTED_EVENT = "selected"; + + /** + * If true, then any notification sent by the component will be deferred until the end of + * the form submission (this is usually desirable). + */ + @Parameter + private boolean _defer = true; + + @Parameter + private String _context; + + @Environmental + private FormSupport _formSupport; + + @Environmental + private Heartbeat _heartbeat; + + @Inject + private ComponentResources _resources; + + @Inject + private Request _request; + + public SubmitContext() + { + } + + SubmitContext(Request request) + { + _request = request; + } + + void beginRender(MarkupWriter writer) + { + // write a hidden input for the context + //String elementName = getElementName(); + String elementName = getControlName(); //Modified to work with 5.0.12 + writer.element("input", "type", "hidden", "name", elementName + "X", "value", _context); + writer.end(); + + // now the submit + writer.element("input", "type", "submit", "name", elementName, "id", getClientId()); + _resources.renderInformalParameters(writer); + } + + void afterRender(MarkupWriter writer) + { + writer.end(); + } + + //protected void processSubmission(FormSupport formSupport, String elementName) + @Override + protected void processSubmission(String elementName) //Modified to work with 5.0.12 + { + String value = _request.getParameter(elementName); + final String context = _request.getParameter(elementName + "X"); + + if (value == null) + return; + + Runnable sendNotification = new Runnable() + { + public void run() + { + _resources.triggerEvent(SELECTED_EVENT, new Object[] {context}, null); + } + }; + + // When not deferred, don't wait, fire the event now (actually, at the end of the current + // heartbeat). This is most likely because the Submit is inside a Loop and some contextual + // information will change if we defer. Another option might be to wait until the next + // heartbeak? + + if (_defer) + _formSupport.defer(sendNotification); + else + _heartbeat.defer(sendNotification); + + } + + // For testing: + + void setDefer(boolean defer) + { + _defer = defer; + } + + void setup(ComponentResources resources, FormSupport support, Heartbeat heartbeat) + { + _resources = resources; + _formSupport = support; + _heartbeat = heartbeat; + } +} Property changes on: trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/ClientMessages.tml ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.properties =================================================================== --- trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.properties 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.properties 2009-08-26 15:30:34 UTC (rev 26) @@ -0,0 +1,12 @@ + +periodicity=Fr\u00E9quence de r\u00E9p\u00E9tition (P\u00E9riodicit\u00E9) +periodicity-bymonth=Entr\u00E9e r\u00E9p\u00E9t\u00E9e par mois : choisissez tous les combien de mois (intervalle) et la condition de fin (illimit\u00E9, date de fin ou nombre de fois) +frequencyInterval-label=Tous les +addPeriodicity-label=P\u00E9riodique ? + +entry-add-submit=Ajouter une nouvelle entr\u00E9e +entry-remove-submit=Supprimer la nouvelle entr\u00E9e +entry-delete-submit=Supprimer l'entr\u00E9e +entries-save-submit=Sauvegarder les entr\u00E9es +entries-cancel-submit=Annuler toutes les modifications +periodicity-show-submit=Afficher la gestion p\u00E9riodique de l'entr\u00E9e \ No newline at end of file Modified: trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.tml =================================================================== --- trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.tml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/resources/org/chorem/cash/ui/components/EntryForm.tml 2009-08-26 15:30:34 UTC (rev 26) @@ -16,23 +16,56 @@ <form t:type="form" t:id="entryForm" t:zone="${globalZoneId}"> <t:errors /> <t:if test="listEntries"> - <t:loop source="entries" value="entry" volatile="true"> + <t:loop source="entries" value="entry" volatile="true" t:index="indexEntry"> <p> - <t:label for="libelle" /> : <input t:type="textfield" t:id="libelle" t:value="entry.libelle" /> - <t:label for="amount" /> : <input t:type="textfield" t:id="amount" t:value="entry.amount" /> - <t:label for="date" /> : <input t:type="datefield" t:id="date" t:value="entry.entryDate" /> + <t:label for="libelle" /> : <input t:type="textfield" t:id="libelle" t:value="entry.libelle"/> + <t:label for="amount" /> : <input t:type="textfield" t:id="amount" t:value="entryAmount" /> + <t:label for="date" /> : <input t:type="datefield" t:id="date" t:value="entryDate"/> + <t:label for="addPeriodicity" /> + <input t:type="checkbox" t:id="addPeriodicity" value="periodic" + t:mixins="zoneUpdater" t:event="change" t:zone="${globalZoneId}" t:context="indexEntry" /> + + <input t:type="submitContext" class="ico clock" value="ShowPeriodicity" title="${message:periodicity-show-submit}" t:id="showPeriodicity" t:context="indexEntry" /> + <t:if test="entry.id"> - <a t:type="actionlink" class="img" t:id="removeEntry" t:context="entry.id" t:zone="entryFormMessages" title="${message:remove-entry}"> - <img src="${asset:context:/img/icons/crystal/cancel.png}" alt="${message:remove-entry}"/> - </a> + <input t:type="submitContext" class="ico delete" value="DeleteEntry" title="${message:entry-delete-submit}" t:id="deleteEntry" t:context="indexEntry" /> + <p:else> + <input t:type="submitContext" class="ico remove" value="RemoveEntry" title="${message:entry-remove-submit}" t:id="removeEntry" t:context="indexEntry" /> + </p:else> </t:if> </p> + <t:if t:test="entry.showFrequency"> + <fieldset> + <legend>${message:periodicity}</legend> + <p>${message:periodicity-bymonth}</p> + <p> + <t:label for="frequencyInterval" /> + <input t:type="textfield" class="interval" t:id="frequencyInterval" value="entry.interval" /> mois + </p> + <t:radiogroup t:id="frequencyEndCondition" t:value="frequencyEndCondition"> + <p> + <t:radio t:id="frequencyUnlimited" /> + <t:label for="frequencyUnlimited" /> + </p> + <p> + <t:radio t:id="frequencyUntilDate" /> + <t:label for="frequencyUntilDate" /> + <input t:type="datefield" t:id="entryUntilDate" value="entry.untilDate" /> + </p> + <p> + <t:radio t:id="frequencyNbTimes" /> + <t:label for="frequencyNbTimes" /> + <input t:type="textfield" t:id="entryNbTimes" value="entry.nbTimes" /> + </p> + </t:radiogroup> + </fieldset> + </t:if> </t:loop> </t:if> <p class="actions"> - <input t:type="submit" class="cancel" value="${message:cancel-form}" t:id="cancelForm" /> - <input t:type="submit" class="save" value="${message:save-entries}" t:id="saveEntries" /> - <input t:type="submit" class="add" value="${message:add-entry}" t:id="addEntry" /> + <input t:type="submit" class="ico cancel" value="CancelEntries" title="${message:entries-cancel-submit}" t:id="cancelForm" /> + <input t:type="submit" class="ico save" value="SaveEntries" title="${message:entries-save-submit}" t:id="saveEntries" /> + <input t:type="submit" class="ico add" value="AddEntry" title="${message:entry-add-submit}" t:id="addEntry" /> </p> </form> </div> Modified: trunk/cash-ui/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/cash-ui/src/main/webapp/META-INF/context.xml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/webapp/META-INF/context.xml 2009-08-26 15:30:34 UTC (rev 26) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/cash"/> +<Context antiJARLocking="true" path="/cash-branche"/> Modified: trunk/cash-ui/src/main/webapp/PreviewTable.tml =================================================================== --- trunk/cash-ui/src/main/webapp/PreviewTable.tml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/webapp/PreviewTable.tml 2009-08-26 15:30:34 UTC (rev 26) @@ -14,7 +14,7 @@ <t:if test="formFlag"> <fieldset> <legend><strong><em>${entriesEditable.category.name}</em></strong> pour le mois <strong>${entriesEditable.month}</strong></legend> - <t:entryForm t:listEntries="entriesEditable" /> + <t:entryForm t:listEntriesParameter="entriesEditable" /> </fieldset> <p:else> <fieldset> Modified: trunk/cash-ui/src/main/webapp/css/common.css =================================================================== --- trunk/cash-ui/src/main/webapp/css/common.css 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/cash-ui/src/main/webapp/css/common.css 2009-08-26 15:30:34 UTC (rev 26) @@ -74,33 +74,38 @@ } /* Boutons caches par des images */ -input.add { - background: url(../img/icons/crystal/add.png) no-repeat center center; +input.ico { border: 0 none; font-size: 0; - width: 32px; - height: 32px; + width: 24px; + height: 24px; cursor: pointer; } +input.add { + background: url(../img/icons/crystal/add.png) no-repeat center center; +} + input.save { background: url(../img/icons/crystal/save.png) no-repeat center center; - border: 0 none; - font-size: 0; - width: 32px; - height: 32px; - cursor: pointer; } input.cancel { background: url(../img/icons/crystal/reload.png) no-repeat center center; - border: 0 none; - font-size: 0; - width: 32px; - height: 32px; - cursor: pointer; } +input.clock { + background: url(../img/icons/crystal/clock.png) no-repeat center center; +} + +input.remove { + background: url(../img/icons/crystal/remove.png) no-repeat center center; +} + +input.delete { + background: url(../img/icons/crystal/cancel.png) no-repeat center center; +} + /* Configuration du BlockManager */ div.component { border: 2px outset #000000; @@ -194,6 +199,10 @@ margin: 8px; } +#entryFormComponent input.interval { + width: 30px; +} + div.zoneFlash { padding: 10px; border: 1px solid black; Deleted: trunk/cash-ui/src/main/webapp/img/icons/cancel.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/add.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/address.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/address2.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/apply.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/blabla.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/cancel.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/cellphone.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/clock.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/delete.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/edit.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/email.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/fax.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/info.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/internet.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/internet2.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/movedown.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/movetobottom.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/movetotop.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/moveup.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/phone.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/crystal/reference.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/reload.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/remove.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/save.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/showdetails.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/stop.png =================================================================== (Binary files differ) Modified: trunk/cash-ui/src/main/webapp/img/icons/crystal/warning.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/delete.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/delete_icon.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/earth.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/edit_icon.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/first.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/iaction.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/last.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/maximize.gif =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/mini_cross.gif =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/mini_tick.gif =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/minimize.gif =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/movedown.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/movetobottom.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/movetotop.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/moveup.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/next.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/previous.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/icons/tick.png =================================================================== (Binary files differ) Deleted: trunk/cash-ui/src/main/webapp/img/pollen.png =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-26 15:08:05 UTC (rev 25) +++ trunk/pom.xml 2009-08-26 15:30:34 UTC (rev 26) @@ -9,12 +9,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.chorem</groupId> <artifactId>cash</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> + <version>1.0.0-alpha-3-SNAPSHOT</version> <modules> <module>cash-ui</module> @@ -132,11 +132,15 @@ <packaging>pom</packaging> <properties> + +  + <projectId>cash</projectId> + <platform>chorem.org</platform> +  - <topia.version>2.2.0-rc-5-SNAPSHOT</topia.version> - <generator.version>1.0.0-rc-3</generator.version> - <jrst.version>1.0.0-rc-4-SNAPSHOT</jrst.version> - <skin.version>1.0.0-rc-2-SNAPSHOT</skin.version> + <topia.version>2.2.0</topia.version> + <generator.version>1.0.0</generator.version> + <jrst.version>1.0.0</jrst.version>  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -154,6 +158,24 @@ <chenillekit.version>1.0.2</chenillekit.version> </properties> + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +    @@ -164,59 +186,6 @@ <url>http://www.chorem.org/repositories/browse/cash/trunk</url> </scm> - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/cash/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - -  - <mailingLists> - <mailingList> - <name>cash-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-commits</unsubscribe> - <post>cash-commits(a)$list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/cash-commits/</archive> - </mailingList> - - <mailingList> - <name>cash-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-devel</unsubscribe> - <post>cash-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/cash-devel/</archive> - </mailingList> - - <mailingList> - <name>cash-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/cash-users</unsubscribe> - <post>cash-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/cash-users/</archive> - </mailingList> - </mailingLists> - -  - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/cash</url> - </site> - </distributionManagement> - <repositories>  <repository>

1 0

r25 - in tags: . alpha-2
by fdesbois＠users.chorem.org 26 Aug '09

26 Aug '09

Author: fdesbois Date: 2009-08-26 17:08:05 +0200 (Wed, 26 Aug 2009) New Revision: 25 Added: tags/alpha-2/ Log: create tag for alpha-2 before merge branche and trunk Property changes on: tags/alpha-2 ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r24 - branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl
by fdesbois＠users.chorem.org 26 Aug '09

26 Aug '09

Author: fdesbois Date: 2009-08-26 12:26:55 +0200 (Wed, 26 Aug 2009) New Revision: 24 Modified: branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java Log: Change license and unused imports Modified: branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java =================================================================== --- branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-26 10:25:57 UTC (rev 23) +++ branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-26 10:26:55 UTC (rev 24) @@ -3,7 +3,7 @@ * Copyright (C) 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * @@ -12,11 +12,12 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* */ + package org.chorem.cash.impl; import java.util.ArrayList; Modified: branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java =================================================================== --- branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java 2009-08-26 10:25:57 UTC (rev 23) +++ branches/alpha3-periodicity/cash-business/src/main/java/org/chorem/cash/impl/ServiceReferenceImpl.java 2009-08-26 10:26:55 UTC (rev 24) @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.ListIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.cash.CashException;

1 0