- Coser-commits - mailman.cloud.codelutin.com

r144 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: chatellier Date: 2010-11-02 16:23:50 +0000 (Tue, 02 Nov 2010) New Revision: 144 Log: Fix header license Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-02 16:21:30 UTC (rev 143) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-02 16:23:50 UTC (rev 144) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2010 Codelutin, Chatellier Eric * %% * 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. * * 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. + * GNU General 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>. * #L% */

1 0

r143 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: chatellier Date: 2010-11-02 16:21:30 +0000 (Tue, 02 Nov 2010) New Revision: 143 Log: Remove duplicated lines Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-11-02 16:20:32 UTC (rev 142) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-11-02 16:21:30 UTC (rev 143) @@ -32,7 +32,7 @@ <JLabel text="coser.ui.result.extractDataLabel" /> </cell> <cell weightx="1" fill="horizontal"> - <JTextField id="resultExtractDataField" /> + <JTextField id="resultExtractDataField" editable="false" /> </cell> <cell> <JButton text="coser.ui.common.selectFile" /> @@ -77,14 +77,6 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.result.rsufiVersion" /> - </cell> - <cell fill="horizontal" columns="2"> - <JTextField /> - </cell> - </row> - <row> - <cell anchor="west"> <JLabel text="coser.ui.result.dataFile1" /> </cell> <cell weightx="1" fill="horizontal">

1 0

r142 - in trunk: . coser-business coser-ui coser-ui/src/license coser-ui/src/main/java/fr/ifremer/coser coser-web coser-web/src/license
by chatellier＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: chatellier Date: 2010-11-02 16:20:32 +0000 (Tue, 02 Nov 2010) New Revision: 142 Log: Add java web start config. Fix licenses. Add required compile scope dependencies. Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-ui/src/license/THIRD-PARTY.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/coser-web/LICENSE.txt trunk/coser-web/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-business/pom.xml 2010-11-02 16:20:32 UTC (rev 142) @@ -19,6 +19,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -35,6 +39,10 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-ui/pom.xml 2010-11-02 16:20:32 UTC (rev 142) @@ -74,6 +74,10 @@ <artifactId>rsyntaxtextarea</artifactId> </dependency> <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </dependency> + <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> @@ -158,6 +162,7 @@ <goals> <goal>parserJava</goal> <goal>gen</goal> + <goal>bundle</goal> </goals> </execution> </executions> @@ -181,7 +186,6 @@ </build> <profiles> - <profile> <id>release-profile</id> <activation> @@ -216,7 +220,6 @@ </execution> </executions> </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -229,8 +232,87 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + <j2seVersion>1.6+</j2seVersion> + </jnlp> + +  + <jnlpExtensions> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + + </configuration> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20100511</version> + </plugin> + </plugins> + </reporting> </profile> </profiles> </project> Modified: trunk/coser-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-ui/src/license/THIRD-PARTY.properties 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-ui/src/license/THIRD-PARTY.properties 2010-11-02 16:20:32 UTC (rev 142) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 Ifremer, Codelutin +# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -31,23 +31,24 @@ # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 +# - GNU Lesser General Public Licence # - GNU Lesser General Public License # - General Public License (GPL) v 3.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for JavaMail(TM) API -# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Oct 18 16:27:36 CEST 2010 +#Tue Nov 02 15:19:05 CET 2010 commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.help--javahelp--2.0.02=GNU General Public License - Version 2 javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API -ognl--ognl--2.7.3=The OpenSymphony Software License 1.1 +ognl--ognl--3.0=The OpenSymphony Software License 1.1 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 org.apache.commons--commons-email--1.2=Apache Software License, Version 2.0 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2010-11-02 16:20:32 UTC (rev 142) @@ -32,6 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.ArgumentsParserException; import fr.ifremer.coser.services.ChartService; @@ -100,6 +101,8 @@ */ public static void launch(final CoserConfig coserConfig) { + // to work in java webstart + I18n.setInitializer(new DefaultI18nInitializer("coser-ui-i18n")); I18n.init(coserConfig.getLocale()); // launch UI Modified: trunk/coser-web/LICENSE.txt =================================================================== --- trunk/coser-web/LICENSE.txt 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-web/LICENSE.txt 2010-11-02 16:20:32 UTC (rev 142) @@ -1,166 +1,661 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + Preamble - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. - 0. Additional Definitions. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + The precise terms and conditions for copying, distribution and +modification follow. - 1. Exception to Section 3 of the GNU GPL. + TERMS AND CONDITIONS - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + 0. Definitions. - 2. Conveying Modified Versions. + "This License" refers to version 3 of the GNU Affero General Public License. - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - 3. Object Code Incorporating Material from Library Header Files. + A "covered work" means either the unmodified Program or a work based +on the Program. - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - 4. Combined Works. + 1. Source Code. - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - d) Do one of the following: + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. + The Corresponding Source for a work in source code form is that +same work. - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. + 2. Basic Permissions. - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - 5. Combined Libraries. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. - 6. Revised Versions of the GNU Lesser General Public License. + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. + 4. Conveying Verbatim Copies. - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2010-11-02 16:20:32 UTC (rev 142) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 Ifremer, Codelutin +# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -28,17 +28,17 @@ # - Apache Software License, Version 2.0 # - BSD License # - Common Public License Version 1.0 +# - GNU Lesser General Public Licence # - General Public License (GPL) v 3.0 # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for Java(TM) Servlet API Specification Interface Classes -# - MPL 1.1 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Oct 18 16:31:33 CEST 2010 +#Tue Nov 02 15:27:11 CET 2010 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes -ognl--ognl--2.7.3=The OpenSymphony Software License 1.1 +ognl--ognl--3.0=The OpenSymphony Software License 1.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-02 15:47:10 UTC (rev 141) +++ trunk/pom.xml 2010-11-02 16:20:32 UTC (rev 142) @@ -18,7 +18,7 @@ <modules> <module>coser-business</module> <module>coser-ui</module> - <module>coser-web</module> +  </modules> <dependencyManagement> @@ -51,21 +51,28 @@ <version>2.5</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> <scope>compile</scope> </dependency> - + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.0</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> @@ -154,6 +161,13 @@ </dependency> <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.3</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>2.2.1</version>

1 0

r141 - in trunk/coser-business/src/main/java/fr/ifremer/coser: command services
by chatellier＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: chatellier Date: 2010-11-02 15:47:10 +0000 (Tue, 02 Nov 2010) New Revision: 141 Log: Num?\195?\169rotation des lignes ?\195?\160 partir de 1 (et non 0) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-11-02 14:06:38 UTC (rev 140) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-11-02 15:47:10 UTC (rev 141) @@ -27,9 +27,6 @@ import static org.nuiton.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.AbstractDataContainer; @@ -47,8 +44,6 @@ */ public class DeleteLineCommand extends Command { - private static final Log log = LogFactory.getLog(DeleteLineCommand.class); - /** Category de données sur lequel porte l'action. */ protected Category category; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-11-02 14:06:38 UTC (rev 140) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-11-02 15:47:10 UTC (rev 141) @@ -116,7 +116,8 @@ } // pour alimenter la line index (si non reloading) - int lineIndex = 0; + // dans coser, la numérotation des lignes commence à 1 + int lineIndex = 1; while ((line = csvReader.readNext()) != null) { if (line.length>1) { if (originalLoading && category.isDataCategory()) {

1 0

r140 - trunk/coser-business/src/license
by chatellier＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: chatellier Date: 2010-11-02 14:06:38 +0000 (Tue, 02 Nov 2010) New Revision: 140 Log: Fix third party Modified: trunk/coser-business/src/license/THIRD-PARTY.properties Modified: trunk/coser-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-business/src/license/THIRD-PARTY.properties 2010-10-29 17:14:40 UTC (rev 139) +++ trunk/coser-business/src/license/THIRD-PARTY.properties 2010-11-02 14:06:38 UTC (rev 140) @@ -29,14 +29,14 @@ # - Apache Software License, Version 2.0 # - BSD License # - Common Public License Version 1.0 +# - GNU Lesser General Public Licence # - Lesser General Public License (LGPL) v 3.0 -# - MPL 1.1 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Oct 18 16:26:09 CEST 2010 +#Tue Nov 02 14:24:23 CET 2010 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 -ognl--ognl--2.7.3=The OpenSymphony Software License 1.1 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +ognl--ognl--3.0=The OpenSymphony Software License 1.1

1 0

r139 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/result java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 17:14:40 +0000 (Fri, 29 Oct 2010) New Revision: 139 Log: Add form to add new rsufi result Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-10-29 17:14:40 UTC (rev 139) @@ -50,26 +50,14 @@ header = new ArrayList<String>(); header.add("Nom du r\u00E9sultat :"); header.add("Version RSufi"); - header.add("Fichier data captures"); - header.add("Fichier graph captures"); - header.add("Fichier data taille"); - header.add("Fichier graph taille"); - header.add("Fichier data strates"); - header.add("Fichier graph strates"); - header.add("Fichier data traits"); - header.add("Fichier graph traits"); + header.add("Fichier données 1"); + header.add("Fichier données 2"); data = new ArrayList<String>(); data.add("R\u00E9sultat de test"); data.add("1.0.0"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); + data.add("EstComInd_IBTS.txt"); + data.add("EstPopInd_IBTS.txt"); } /* Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-10-29 17:14:40 UTC (rev 139) @@ -57,8 +57,75 @@ </cell> </row> <row> - <cell> - + <cell weighty="1" fill="both"> + <Table border='{BorderFactory.createTitledBorder(_("coser.ui.result.newDataTitle"))}'> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.resultName" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.rsufiVersion" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.rsufiVersion" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.dataFile1" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JTextField /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.common.selectFile" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.dataFile2" /> + </cell> + <cell fill="horizontal"> + <JTextField /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.common.selectFile" /> + </cell> + </row> + <row> + <cell anchor="west" columns="3"> + <JLabel text="coser.ui.result.otherDataFile" /> + </cell> + </row> + <row> + <cell columns="3" weighty="1" fill="both"> + <JScrollPane> + <JList /> + </JScrollPane> + </cell> + </row> + <row> + <cell weightx="1" columns="2" anchor="east"> + <JButton text="coser.ui.result.addOtherDataFile" /> + </cell> + <cell anchor="east"> + <JButton text="coser.ui.result.addNewResult" /> + </cell> + </row> + </Table> </cell> </row> </Table> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-29 17:14:40 UTC (rev 139) @@ -61,10 +61,18 @@ coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file coser.ui.project.usedReferenceSpeciesFile=Current reference file \: +coser.ui.result.addNewResult=Save result +coser.ui.result.addOtherDataFile=Add file coser.ui.result.availableDataTitle=Available results \: +coser.ui.result.dataFile1=Data file 1 \: +coser.ui.result.dataFile2=Data file 2 \: coser.ui.result.extractDataButton=Extract coser.ui.result.extractDataLabel=Extraction directory coser.ui.result.extractDataTitle=Extract RSufi data +coser.ui.result.newDataTitle=New result +coser.ui.result.otherDataFile=Other files \: +coser.ui.result.resultName=Result name \: +coser.ui.result.rsufiVersion=RSufi version coser.ui.selection.allSpecies=All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-29 17:14:40 UTC (rev 139) @@ -61,10 +61,18 @@ coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 \: +coser.ui.result.addNewResult=Enregistrer le r\u00E9sultat +coser.ui.result.addOtherDataFile=Ajouter un fichier coser.ui.result.availableDataTitle=R\u00E9sultats disponibles \: +coser.ui.result.dataFile1=Fichier r\u00E9sultat 1 \: +coser.ui.result.dataFile2=Fichier r\u00E9sultat 2 \: coser.ui.result.extractDataButton=Extraire coser.ui.result.extractDataLabel=Dossier d'extraction \: coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi +coser.ui.result.newDataTitle=Nouveau r\u00E9sultat +coser.ui.result.otherDataFile=Autre fichiers \: +coser.ui.result.resultName=Nom du r\u00E9sultat \: +coser.ui.result.rsufiVersion=Version de RSufi \: coser.ui.selection.allSpecies=Toutes les esp\u00E8ces coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.details.beginDate=Date de d\u00E9but \:

1 0

r138 - trunk/coser-business/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 16:36:04 +0000 (Fri, 29 Oct 2010) New Revision: 138 Log: Faute Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 16:29:35 UTC (rev 137) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 16:36:04 UTC (rev 138) @@ -33,7 +33,7 @@ coser.business.category.strata=Strates coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint (%s) \: %.2f -coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9s, mais capture non pr\u00E9sente +coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9, mais capture non pr\u00E9sente coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne

1 0

r137 - in trunk/coser-business/src: main/java/fr/ifremer/coser/data main/java/fr/ifremer/coser/services main/resources/fr/ifremer/coser/data main/resources/i18n test/java/fr/ifremer/coser/services test/resources
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 16:29:35 +0000 (Fri, 29 Oct 2010) New Revision: 137 Log: Modification des datas pour pouvoir avoir les meme donn?\195?\169es en String et en double. Deplacement d'une validation dans le fichier xwork Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java trunk/coser-business/src/test/resources/log4j.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java 2010-10-29 16:29:35 UTC (rev 137) @@ -97,23 +97,85 @@ return data[INDEX_SPECIES]; } - public void setNumber(String value) { - String oldValue = data[INDEX_NUMBER]; + public void setNumber(double value) { + double oldValue = getNumber(); data[INDEX_NUMBER] = String.valueOf(value); getPropertyChangeSupport().firePropertyChange("number", oldValue, value); } - public String getNumber() { + public double getNumber() { + double result = Double.parseDouble(data[INDEX_NUMBER]); + return result; + } + + public void setWeight(double value) { + double oldValue = getWeight(); + data[INDEX_WEIGHT] = String.valueOf(value); + getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); + } + + public double getWeight() { + double result = Double.parseDouble(data[INDEX_WEIGHT]); + return result; + } + + public void setSurveyAsString(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("surveyAsString", oldValue, value); + } + + public String getSurveyAsString() { + return data[INDEX_SURVEY]; + } + + public void setYearAsString(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("yearAsString", oldValue, value); + } + + public String getYearAsString() { + return data[INDEX_YEAR]; + } + + public void setHaulAsString(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haulAsString", oldValue, value); + } + + public String getHaulAsString() { + return data[INDEX_HAUL]; + } + + public void setSpeciesAsString(String value) { + String oldValue = data[INDEX_SPECIES]; + data[INDEX_SPECIES] = value; + getPropertyChangeSupport().firePropertyChange("speciesAsString", oldValue, value); + } + + public String getSpeciesAsString() { + return data[INDEX_SPECIES]; + } + + public void setNumberAsString(String value) { + String oldValue = data[INDEX_NUMBER]; + data[INDEX_NUMBER] = value; + getPropertyChangeSupport().firePropertyChange("numberAsString", oldValue, value); + } + + public String getNumberAsString() { return data[INDEX_NUMBER]; } - public void setWeight(String value) { + public void setWeightAsString(String value) { String oldValue = data[INDEX_WEIGHT]; data[INDEX_WEIGHT] = value; - getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); + getPropertyChangeSupport().firePropertyChange("weightAsString", oldValue, value); } - public String getWeight() { + public String getWeightAsString() { return data[INDEX_WEIGHT]; } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java 2010-10-29 16:29:35 UTC (rev 137) @@ -149,4 +149,94 @@ public String getDepth() { return data[INDEX_DEPTH]; } + + public void setSurveyAsString(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("surveyAsString", oldValue, value); + } + + public String getSurveyAsString() { + return data[INDEX_SURVEY]; + } + + public void setYearAsString(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("yearAsString", oldValue, value); + } + + public String getYearAsString() { + return data[INDEX_YEAR]; + } + + public void setHaulAsString(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haulAsString", oldValue, value); + } + + public String getHaulAsString() { + return data[INDEX_HAUL]; + } + + public void setMonthAsString(String value) { + String oldValue = data[INDEX_MONTH]; + data[INDEX_MONTH] = value; + getPropertyChangeSupport().firePropertyChange("monthAsString", oldValue, value); + } + + public String getMonthAsString() { + return data[INDEX_MONTH]; + } + + public void setStratumAsString(String value) { + String oldValue = data[INDEX_STRATUM]; + data[INDEX_STRATUM] = value; + getPropertyChangeSupport().firePropertyChange("stratumAsString", oldValue, value); + } + + public String getStratumAsString() { + return data[INDEX_STRATUM]; + } + + public void setSweptSurfaceAsString(String value) { + String oldValue = data[INDEX_SWEPT_SURFACE]; + data[INDEX_SWEPT_SURFACE] = value; + getPropertyChangeSupport().firePropertyChange("sweptSurfaceAsString", oldValue, value); + } + + public String getSweptSurfaceAsString() { + return data[INDEX_SWEPT_SURFACE]; + } + + public void setLatAsString(String value) { + String oldValue = data[INDEX_LAT]; + data[INDEX_LAT] = value; + getPropertyChangeSupport().firePropertyChange("latAsString", oldValue, value); + } + + public String getLatAsString() { + return data[INDEX_LAT]; + } + + public void setLongAsString(String value) { + String oldValue = data[INDEX_LONG]; + data[INDEX_LONG] = value; + getPropertyChangeSupport().firePropertyChange("longAsString", oldValue, value); + } + + public String getLongAsString() { + return data[INDEX_LONG]; + } + + public void setDepthAsString(String value) { + String oldValue = data[INDEX_DEPTH]; + data[INDEX_DEPTH] = value; + getPropertyChangeSupport().firePropertyChange("depthAsString", oldValue, value); + } + + public String getDepthAsString() { + return data[INDEX_DEPTH]; + } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java 2010-10-29 16:29:35 UTC (rev 137) @@ -170,4 +170,114 @@ public String getAge() { return data[INDEX_AGE]; } + + public void setSurveyAsString(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("surveyAsString", oldValue, value); + } + + public String getSurveyAsString() { + return data[INDEX_SURVEY]; + } + + public void setYearAsString(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("yearAsString", oldValue, value); + } + + public String getYearAsString() { + return data[INDEX_YEAR]; + } + + public void setHaulAsString(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haulAsString", oldValue, value); + } + + public String getHaulAsString() { + return data[INDEX_HAUL]; + } + + public void setSpeciesAsString(String value) { + String oldValue = data[INDEX_SPECIES]; + data[INDEX_SPECIES] = value; + getPropertyChangeSupport().firePropertyChange("speciesAsString", oldValue, value); + } + + public String getSpeciesAsString() { + return data[INDEX_SPECIES]; + } + + public void setSexAsString(String value) { + String oldValue = data[INDEX_SEX]; + data[INDEX_SEX] = value; + getPropertyChangeSupport().firePropertyChange("sexAsString", oldValue, value); + } + + public String getSexAsString() { + return data[INDEX_SEX]; + } + + public void setMaturityAsString(String value) { + String oldValue = data[INDEX_MATURITY]; + data[INDEX_MATURITY] = value; + getPropertyChangeSupport().firePropertyChange("maturityAsString", oldValue, value); + } + + public String getMaturityAsString() { + return data[INDEX_MATURITY]; + } + + public void setLengthAsString(String value) { + String oldValue = data[INDEX_LENGTH]; + data[INDEX_LENGTH] = value; + getPropertyChangeSupport().firePropertyChange("lengthAsString", oldValue, value); + } + + public String getLengthAsString() { + return data[INDEX_LENGTH]; + } + + public void setNumberAsString(String value) { + String oldValue = data[INDEX_NUMBER]; + data[INDEX_NUMBER] = value; + getPropertyChangeSupport().firePropertyChange("numberAsString", oldValue, value); + } + + public String getNumberAsString() { + return data[INDEX_NUMBER]; + } + + public void setWeightAsString(String value) { + String oldValue = data[INDEX_WEIGHT]; + data[INDEX_WEIGHT] = value; + getPropertyChangeSupport().firePropertyChange("weightAsString", oldValue, value); + } + + public String getWeightAsString() { + return data[INDEX_WEIGHT]; + } + + /** + * Age field. + * + * @param value new value to set + */ + public void setAgeAsString(String value) { + String oldValue = data[INDEX_AGE]; + data[INDEX_AGE] = value; + getPropertyChangeSupport().firePropertyChange("ageAsString", oldValue, value); + } + + /** + * Age field. + * + * @return age + */ + public String getAgeAsString() { + return data[INDEX_AGE]; + } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java 2010-10-29 16:29:35 UTC (rev 137) @@ -84,4 +84,34 @@ return data[INDEX_SURFACE]; } + public void setSurveyAsString(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("surveyAsString", oldValue, value); + } + + public String getSurveyAsString() { + return data[INDEX_SURVEY]; + } + + public void setStratumAsString(String value) { + String oldValue = data[INDEX_STRATUM]; + data[INDEX_STRATUM] = value; + getPropertyChangeSupport().firePropertyChange("stratumAsString", oldValue, value); + } + + public String getStratumAsString() { + return data[INDEX_STRATUM]; + } + + public void setSurfaceAsString(String value) { + String oldValue = data[INDEX_SURFACE]; + data[INDEX_SURFACE] = value; + getPropertyChangeSupport().firePropertyChange("surfaceAsString", oldValue, value); + } + + public String getSurfaceAsString() { + return data[INDEX_SURFACE]; + } + } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-29 16:29:35 UTC (rev 137) @@ -409,7 +409,7 @@ // autre validation (rien a voir avec le reste attention) // Vérifier que le nombre d'individus dans CAPT$Nombre n'est pas 0 si le poids dans CAPT$Poids>0. - String poidsValue = tuple[Catch.INDEX_WEIGHT]; + /*String poidsValue = tuple[Catch.INDEX_WEIGHT]; try { Double poids = Double.valueOf(poidsValue); if (poids > 0 && nombre <= 0) { @@ -426,7 +426,7 @@ if (log.isWarnEnabled()) { log.warn("Can't parse '" + poidsValue + "' as double"); } - } + }*/ } catch (NumberFormatException ex) { // par trop grave, normalement les données deviennent Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-10-29 16:29:35 UTC (rev 137) @@ -50,16 +50,20 @@ <message>You must enter a espece name.</message> </field-validator> </field> - <field name="number"> + <field name="numberAsString"> <field-validator type="checkDouble" short-circuit="true"> <param name="notAvailable">NA</param> <message>Number attribute is not a valid double</message> </field-validator> </field> - <field name="weight"> + <field name="weightAsString"> <field-validator type="checkDouble" short-circuit="true"> <param name="notAvailable">NA</param> <message>Weight attribute is not a valid double</message> </field-validator> </field> + <validator type="expression"> + <param name="expression"><![CDATA[ (weight > 0 && number > 0) || weight == 0]]></param> + <message><![CDATA[coser.business.control.error.noCatchNumberWithWeight]]></message> + </validator> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 16:29:35 UTC (rev 137) @@ -26,7 +26,6 @@ You\ must\ enter\ a\ stratum\ name.= You\ must\ enter\ a\ survey\ name.= You\ must\ enter\ a\ trait\ name.= -You\ must\ enter\ a\ year\ name.= coser.business.category.catch=Catch coser.business.category.haul=Haul coser.business.category.length=Length Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 16:29:35 UTC (rev 137) @@ -26,7 +26,6 @@ You\ must\ enter\ a\ stratum\ name.= You\ must\ enter\ a\ survey\ name.= You\ must\ enter\ a\ trait\ name.= -You\ must\ enter\ a\ year\ name.= coser.business.category.catch=Captures coser.business.category.haul=Traits coser.business.category.length=Tailles Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 16:29:35 UTC (rev 137) @@ -82,6 +82,7 @@ Catch myCatch = new Catch(); myCatch.setData(new String[]{"1", "Test survey","1999","Test trait","Test sp","NA","12"}); List<ValidationError> errors = validationService.validate(myCatch); + log.warn(errors); Assert.assertTrue(errors.isEmpty()); } Modified: trunk/coser-business/src/test/resources/log4j.properties =================================================================== --- trunk/coser-business/src/test/resources/log4j.properties 2010-10-29 16:26:32 UTC (rev 136) +++ trunk/coser-business/src/test/resources/log4j.properties 2010-10-29 16:29:35 UTC (rev 137) @@ -33,3 +33,4 @@ # Categories log4j.category.fr.ifremer.coser=DEBUG +#log4j.category.com.opensymphony.xwork2=DEBUG

1 0

r136 - trunk/coser-business/src/main/java/fr/ifremer/coser/validators
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 16:26:32 +0000 (Fri, 29 Oct 2010) New Revision: 136 Log: Ajout d'une classe abstraite pour pouvoir avoir les exceptions de validation Added: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/AbstractFieldValidator.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java Added: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/AbstractFieldValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/AbstractFieldValidator.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/AbstractFieldValidator.java 2010-10-29 16:26:32 UTC (rev 136) @@ -0,0 +1,76 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.validators; + +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; + +/** + * Abstract validator. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public abstract class AbstractFieldValidator extends FieldValidatorSupport { + + private ValueStack localStack; + + public void setValueStack(ValueStack localStack) { + super.setValueStack(localStack); + this.localStack = localStack; + } + + /** + * Return the field value named <code>name</code> from <code>object</code>, + * <code>object</code> should have the appropriate getter/setter. + * + * @param name + * @param object + * @return Object as field value + * @throws ValidationException + */ + protected Object getFieldValue(String name, Object object, boolean throwExceptionOnFailure) throws ValidationException { + + boolean pop = false; + + if (!localStack.getRoot().contains(object)) { + localStack.push(object); + pop = true; + } + + Object retVal = localStack.findValue(name, throwExceptionOnFailure); + + if (pop) { + localStack.pop(); + } + + return retVal; + } +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/AbstractFieldValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2010-10-29 15:43:38 UTC (rev 135) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2010-10-29 16:26:32 UTC (rev 136) @@ -26,7 +26,6 @@ package fr.ifremer.coser.validators; import com.opensymphony.xwork2.validator.ValidationException; -import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; /** * Validateur de double de coser. @@ -37,7 +36,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CoserCheckDoubleValidator extends FieldValidatorSupport { +public class CoserCheckDoubleValidator extends AbstractFieldValidator { protected String notAvailable; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2010-10-29 15:43:38 UTC (rev 135) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2010-10-29 16:26:32 UTC (rev 136) @@ -26,7 +26,6 @@ package fr.ifremer.coser.validators; import com.opensymphony.xwork2.validator.ValidationException; -import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; /** * TODO add comment here. @@ -37,7 +36,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CoserDoubleValidator extends FieldValidatorSupport { +public class CoserDoubleValidator extends AbstractFieldValidator { protected Double max = null; protected Double min = null;

1 0

r135 - in trunk: coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/java/fr/ifremer/coser/storage coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 15:43:38 +0000 (Fri, 29 Oct 2010) New Revision: 135 Log: Amelioration du storage pour acceder rapidement aux donn?\195?\169es en fonction de leur num?\195?\169ro de ligne Added: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Removed: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryListStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-10-29 15:43:38 UTC (rev 135) @@ -27,8 +27,6 @@ import static org.nuiton.i18n.I18n._; -import java.util.Iterator; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,7 +34,6 @@ import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.storage.DataStorage; /** @@ -101,24 +98,13 @@ } // parcourt des lignes - boolean dataLineFound = false; - Iterator<String[]> itDataStorage = dataStorage.iterator(); - itDataStorage.next(); // skip header - while (itDataStorage.hasNext()) { - String[] dataLine = itDataStorage.next(); - String dataLineIndex = dataLine[AbstractDataEntity.INDEX_LINE]; - if (dataLineIndex.equals(lineNumber)) { - if (log.isDebugEnabled()) { - log.debug("Removing line " + dataLineIndex); - } - dataLineFound = true; - deletedDataStorage.add(dataLine); - itDataStorage.remove(); - } + int index = dataStorage.indexOf(lineNumber); + if (index >= 0) { + String[] data = dataStorage.remove(index); + deletedDataStorage.add(data); } - - // if not found, throw business exception - if (!dataLineFound) { + else { + // if not found, throw business exception throw new CoserBusinessException(_("Can't find line %s for deletion", lineNumber)); } } @@ -149,45 +135,38 @@ break; } - // parcourt des lignes - boolean dataLineFound = false; - Iterator<String[]> itDeletedDataStorage = deletedDataStorage.iterator(); - itDeletedDataStorage.next(); //skip header - while (itDeletedDataStorage.hasNext()) { - String[] deletedDataLine = itDeletedDataStorage.next(); - String deletedDataLineIndex = deletedDataLine[AbstractDataEntity.INDEX_LINE]; - if (deletedDataLineIndex.equals(lineNumber)) { - dataLineFound = true; - itDeletedDataStorage.remove(); + int indexDeletedData = deletedDataStorage.indexOf(lineNumber); + + if (indexDeletedData != -1) { + String[] deletedDataLine = deletedDataStorage.get(indexDeletedData); + + // search for new insert point + int lineNumberInt = Integer.parseInt(lineNumber); - // search new insert point - int originalDataLine = Integer.parseInt(deletedDataLineIndex); - Iterator<String[]> itDataStorage = dataStorage.iterator(); - itDataStorage.next(); //skip header - int index = 1; // due to header - while (itDataStorage.hasNext()) { - String[] dataLine = itDataStorage.next(); - String dataLineIndex = dataLine[AbstractDataEntity.INDEX_LINE]; - int dataLineInt = Integer.parseInt(dataLineIndex); - if (dataLineInt == originalDataLine) { - throw new CoserBusinessException(_("Original line already exists!")); - } - else if (dataLineInt > originalDataLine) { - break; - } - index++; - } - - // insert line at specified index - dataStorage.add(index, deletedDataLine); - if (log.isDebugEnabled()) { - log.debug("Restore line " + index); - } + // check que la ligne a restaurer n'existe pas deja + int indexData = dataStorage.indexOf(String.valueOf(lineNumberInt)); + if (indexData != -1) { + throw new CoserBusinessException("Original line already exists !"); } + + do { + lineNumberInt--; + indexData = dataStorage.indexOf(String.valueOf(lineNumberInt)); + } while (indexData < 0 && lineNumberInt > 0); + + // re add deleted data + if (indexData >= 0) { + // +1 car on l'insert apres la ligne qu'on a trouvé + dataStorage.add(indexData + 1, deletedDataLine); + } + else { + dataStorage.add(0, deletedDataLine); + } + deletedDataStorage.remove(indexDeletedData); } // if not found, throw business exception - if (!dataLineFound) { + else { throw new CoserBusinessException(_("Can't find line %s for undeletion", lineNumber)); } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-10-29 15:43:38 UTC (rev 135) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import java.lang.reflect.InvocationTargetException; import java.util.Iterator; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-10-29 15:43:38 UTC (rev 135) @@ -58,7 +58,7 @@ import fr.ifremer.coser.data.Length; import fr.ifremer.coser.data.Strata; import fr.ifremer.coser.storage.DataStorage; -import fr.ifremer.coser.storage.MemoryListStorage; +import fr.ifremer.coser.storage.MemoryDataStorage; /** * File import/export service. @@ -90,7 +90,7 @@ */ public DataStorage loadCSVFile(Project project, Category category, File file, boolean originalLoading) throws CoserBusinessException { - DataStorage content = new MemoryListStorage(); + DataStorage content = new MemoryDataStorage(); Reader reader = null; CSVReader csvReader = null; @@ -200,7 +200,7 @@ */ public DataStorage getEmptyStorage(Project project, Category category) { - DataStorage dataStorage = new MemoryListStorage(); + DataStorage dataStorage = new MemoryDataStorage(); switch (category) { case CATCH: dataStorage.add(Catch.EN_HEADERS); Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java 2010-10-29 15:43:38 UTC (rev 135) @@ -69,4 +69,6 @@ String[] set(int index, String[] data); String[] remove(int index); + + public int indexOf(String lineNumber); } Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java (from rev 103, trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryListStorage.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2010-10-29 15:43:38 UTC (rev 135) @@ -0,0 +1,197 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.storage; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import au.com.bytecode.opencsv.CSVReader; +import au.com.bytecode.opencsv.CSVWriter; + +/** + * Stockage mémoire des String[] sous forme de String simple. + * + * Beaucoup moins couteux en mémoire que les String[] sans pour antant + * que le temps de parcours soit augmenté. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MemoryDataStorage implements DataStorage { + + public List<String> listStorage; + public List<String> lineIndexStorage; + + public MemoryDataStorage() { + listStorage = new ArrayList<String>(); + lineIndexStorage = new ArrayList<String>(); + } + + public class StringListIterator implements Iterator<String[]> { + + protected Iterator<String> listIterator; + protected Iterator<String> lineIndexIterator; + + public StringListIterator(Iterator<String> internalIterator, Iterator<String> lineIndexIterator) { + this.listIterator = internalIterator; + this.lineIndexIterator = lineIndexIterator; + } + + /* + * @see java.util.Iterator#hasNext() + */ + @Override + public boolean hasNext() { + return listIterator.hasNext(); + } + + /* + * @see java.util.Iterator#next() + */ + @Override + public String[] next() { + + String nextString = listIterator.next(); + String[] nextArray = stringToArray(nextString); + + lineIndexIterator.next(); + + return nextArray; + } + + /* + * @see java.util.Iterator#remove() + */ + @Override + public void remove() { + listIterator.remove(); + lineIndexIterator.remove(); + } + } + + /* + * @see java.lang.Iterable#iterator() + */ + @Override + public Iterator<String[]> iterator() { + return new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); + } + + /* + * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) + */ + @Override + public void add(String[] data) { + + String stringData = arrayToString(data); + listStorage.add(stringData); + lineIndexStorage.add(data[0]); + } + + /* + * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) + */ + @Override + public void add(int index, String[] data) { + + String stringData = arrayToString(data); + listStorage.add(index, stringData); + lineIndexStorage.add(index, data[0]); + } + + protected String arrayToString(String[] data) { + StringWriter writer = new StringWriter(); + CSVWriter csvWriter = new CSVWriter(writer); + csvWriter.writeNext(data); + //TODO echatellier 20101022 replace with custom parsing code + try { + csvWriter.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return writer.toString(); + } + + protected String[] stringToArray(String data) { + StringReader reader = new StringReader(data); + CSVReader csvReader = new CSVReader(reader); + String[] dataArray = null; + //TODO echatellier 20101022 replace with custom parsing code + try { + dataArray = csvReader.readNext(); + csvReader.close(); + } catch (IOException e) { + e.printStackTrace(); + } + return dataArray; + } + + /* + * @see fr.ifremer.coser.storage.DataStorage#getData(int) + */ + @Override + public String[] get(int index) { + String stringData = listStorage.get(index); + String[] dataArray = stringToArray(stringData); + return dataArray; + } + + public int indexOf(String lineNumber) { + return lineIndexStorage.indexOf(lineNumber); + } + + public int size() { + return listStorage.size(); + } + + public String[] set(int index, String[] element) { + String data = arrayToString(element); + String old = listStorage.set(index, data); + String[] oldArray = stringToArray(old); + lineIndexStorage.set(index, element[0]); + return oldArray; + } + + public String[] remove(int index) { + String old = listStorage.remove(index); + String[] oldArray = stringToArray(old); + lineIndexStorage.remove(index); + return oldArray; + } + + @Override + public String toString() { + return listStorage.toString(); + } +} Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryListStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryListStorage.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryListStorage.java 2010-10-29 15:43:38 UTC (rev 135) @@ -1,182 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.storage; - -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import au.com.bytecode.opencsv.CSVReader; -import au.com.bytecode.opencsv.CSVWriter; - -/** - * Stockage mémoire des String[] sous forme de String simple. - * - * Beaucoup moins couteux en mémoire que les String[] sans pour antant - * que le temps de parcours soit augmenté. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class MemoryListStorage implements DataStorage { - - public List<String> internalStorage; - - public MemoryListStorage() { - internalStorage = new ArrayList<String>(); - } - - public class StringListIterator implements Iterator<String[]> { - - protected Iterator<String> internalIterator; - - public StringListIterator(Iterator<String> internalIterator) { - this.internalIterator = internalIterator; - } - - /* - * @see java.util.Iterator#hasNext() - */ - @Override - public boolean hasNext() { - return internalIterator.hasNext(); - } - - /* - * @see java.util.Iterator#next() - */ - @Override - public String[] next() { - - String nextString = internalIterator.next(); - String[] nextArray = stringToArray(nextString); - - return nextArray; - } - - /* - * @see java.util.Iterator#remove() - */ - @Override - public void remove() { - internalIterator.remove(); - } - } - - /* - * @see java.lang.Iterable#iterator() - */ - @Override - public Iterator<String[]> iterator() { - return new StringListIterator(internalStorage.iterator()); - } - - /* - * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) - */ - @Override - public void add(String[] data) { - - String stringData = arrayToString(data); - internalStorage.add(stringData); - } - - /* - * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) - */ - @Override - public void add(int index, String[] data) { - - String stringData = arrayToString(data); - internalStorage.add(index, stringData); - } - - protected String arrayToString(String[] data) { - StringWriter writer = new StringWriter(); - CSVWriter csvWriter = new CSVWriter(writer); - csvWriter.writeNext(data); - //TODO echatellier 20101022 replace with custom parsing code - try { - csvWriter.close(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return writer.toString(); - } - - protected String[] stringToArray(String data) { - StringReader reader = new StringReader(data); - CSVReader csvReader = new CSVReader(reader); - String[] dataArray = null; - //TODO echatellier 20101022 replace with custom parsing code - try { - dataArray = csvReader.readNext(); - csvReader.close(); - } catch (IOException e) { - e.printStackTrace(); - } - return dataArray; - } - - /* - * @see fr.ifremer.coser.storage.DataStorage#getData(int) - */ - @Override - public String[] get(int index) { - String stringData = internalStorage.get(index); - String[] dataArray = stringToArray(stringData); - return dataArray; - } - - public int size() { - return internalStorage.size(); - } - - public String[] set(int index, String[] element) { - String data = arrayToString(element); - String old = internalStorage.set(index, data); - String[] oldArray = stringToArray(old); - return oldArray; - } - - public String[] remove(int index) { - String old = internalStorage.remove(index); - String[] oldArray = stringToArray(old); - return oldArray; - } - - @Override - public String toString() { - return internalStorage.toString(); - } -} Modified: trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 15:43:38 UTC (rev 135) @@ -8,7 +8,6 @@ Maturity\ attribute\ is\ required= Missing\ file\ %s= Number\ attribute\ is\ not\ a\ valid\ double= -Original\ line\ already\ exists\!= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= Project\ name\ is\ required= @@ -53,3 +52,4 @@ long\ must\ contains\ at\ least\ 5\ decimal= number\ attribute\ is\ not\ a\ valid\ double= sweptSurface\ attribute\ is\ not\ a\ valid\ double= +year\ is\ not\ valid= Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 15:43:38 UTC (rev 135) @@ -8,7 +8,6 @@ Maturity\ attribute\ is\ required= Missing\ file\ %s=Fichier manquant \: %s Number\ attribute\ is\ not\ a\ valid\ double= -Original\ line\ already\ exists\!= Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! Project\ name\ is\ required= @@ -53,3 +52,4 @@ long\ must\ contains\ at\ least\ 5\ decimal= number\ attribute\ is\ not\ a\ valid\ double= sweptSurface\ attribute\ is\ not\ a\ valid\ double= +year\ is\ not\ valid= Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-10-29 15:43:38 UTC (rev 135) @@ -108,6 +108,24 @@ Assert.assertEquals("4", project.getControl().getLength().get(4)[Length.INDEX_LINE]); commandService.undoAction(project, project.getControl()); Assert.assertEquals("3", project.getControl().getLength().get(4)[Length.INDEX_LINE]); - } + + /** + * Test que la double annulation d'un retablissement de ligne + * lance une exception. + * + * @throws CoserBusinessException + */ + @Test(expected=CoserBusinessException.class) + public void testDeleteLineUndoAlreadyExists() throws CoserBusinessException { + Project project = createTestProject(projectService); + DeleteLineCommand command = new DeleteLineCommand(); + command.setLineNumber("3"); + command.setCategory(Category.LENGTH); + + commandService.doAction(command, project, project.getControl()); + commandService.undoAction(project, project.getControl()); + project.getControl().getHistoryCommand().add(command); + commandService.undoAction(project, project.getControl()); + } } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 15:43:38 UTC (rev 135) @@ -38,7 +38,7 @@ import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; import fr.ifremer.coser.storage.DataStorage; -import fr.ifremer.coser.storage.MemoryListStorage; +import fr.ifremer.coser.storage.MemoryDataStorage; /** * Test abour validation. @@ -106,7 +106,7 @@ @Test public void testWeigthWithNonCapture() { Control control = new Control(); - DataStorage dataCatch = new MemoryListStorage(); + DataStorage dataCatch = new MemoryDataStorage(); dataCatch.add(new String[]{"Line", "Campagne","Annee","Trait","Espece","Nombre","Poids"}); dataCatch.add(new String[]{"1", "Test survey","1999","Test trait","Test sp","0","12"}); control.setCatch(dataCatch); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-10-29 15:32:52 UTC (rev 134) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-10-29 15:43:38 UTC (rev 135) @@ -134,21 +134,8 @@ * @return l'index */ public int getRealIndexOfLine(String lineNumber) { - Iterator<String[]> itData = data.iterator(); - itData.next(); // skip header - int result = -1; - int index = 0; - while (itData.hasNext() && result == -1) { - String currentLineNumber = itData.next()[AbstractDataEntity.INDEX_LINE]; - if (lineNumber.equals(currentLineNumber)) { - result = index; - } - ++index; - } - - if (log.isDebugEnabled()) { - log.debug("Real line for " + lineNumber + " = " + index); - } + // -1 because header is table header + int result = data.indexOf(lineNumber) - 1; return result; } }

1 0