Author: chatellier Date: 2010-10-27 14:12:12 +0000 (Wed, 27 Oct 2010) New Revision: 107 Log: Add selection loading/reloading Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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/main/resources/validators.xml trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java trunk/coser-ui/LICENSE.txt trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.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 trunk/coser-web/src/license/THIRD-PARTY.properties trunk/coser-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-10-27 14:12:12 UTC (rev 107) @@ -52,6 +52,8 @@ "C_Perm","NumSys","NivSys","C_VALIDE","L_VALIDE","AA_VALIDE","C_TxP\u00E8re","Taxa" }; + public static final String PROPERTY_SELECTIONS="selections"; + protected String name; protected Control control; @@ -87,8 +89,13 @@ public void setSelections(Map<String, Selection> selections) { this.selections = selections; - getPropertyChangeSupport().firePropertyChange("selections", null, selections); + getPropertyChangeSupport().firePropertyChange(PROPERTY_SELECTIONS, null, selections); } + + public void addSelections(Selection selection) { + this.selections.put(selection.getName(), selection); + getPropertyChangeSupport().firePropertyChange(PROPERTY_SELECTIONS, null, selections); + } public DataStorage getRefTaxSpecies() { return refTaxSpecies; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-27 14:12:12 UTC (rev 107) @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -118,13 +119,11 @@ projectsDirectory.mkdirs(); } + // check project existence String projectName = project.getName(); - // check project existence - File[] projects = projectsDirectory.listFiles(); - for (File existingProject : projects) { - if (existingProject.getName().equalsIgnoreCase(projectName)) { - throw new CoserBusinessException(_("Project %s already exist", project.getName())); - } + File projectDirectory = new File(projectsDirectory, projectName); + if (projectDirectory.exists()) { + throw new CoserBusinessException(_("Project %s already exist", project.getName())); } // first free memory, clear all data @@ -149,8 +148,7 @@ } } - // create new project directory - File projectDirectory = new File(projectsDirectory, projectName); + // create new project directory (after data checking, if ok) projectDirectory.mkdirs(); // sauvegarde des fichiers (tracabilité) @@ -186,6 +184,7 @@ } } + project.setSelections(new HashMap<String, Selection>()); control.setHistoryCommand(new ArrayList<Command>()); project.setControl(control); @@ -227,6 +226,21 @@ throw new CoserBusinessException(_("Missing file %s", inputFile)); } + // reload selection without data + Map<String, Selection> selections = new HashMap<String, Selection>(); + File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); + if (selectionsDirectory.isDirectory()) { + File[] selectionDirectories = selectionsDirectory.listFiles(); + for (File selectionDirectory : selectionDirectories) { + if (selectionDirectory.isDirectory()) { + Selection selection = new Selection(); + selection.setName(selectionDirectory.getName()); + selections.put(selectionDirectory.getName(), selection); + } + } + } + project.setSelections(selections); + return project; } @@ -319,7 +333,51 @@ return project; } + + /** + * Load selection data in an initialized project. + * + * @param project project + * @param selection selection to fill + * @return project with data + * @throws CoserBusinessException + */ + public Project loadSelectionData(Project project, Selection selection) throws CoserBusinessException { + + File projectsDirectory = config.getProjectsDirectory(); + File projectDirectory = new File(projectsDirectory, project.getName()); + // first free memory, clear all data + project.clearData(); + + // try to load validated data first + File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); + File selectionDirectory = new File(selectionsDirectory, selection.getName()); + int fileLoaded = 0; + for (Category category : Category.values()) { + + // seulement les category de données ici + if (category.isDataCategory()) { + File inputFile = new File(selectionDirectory, category.getStorageFileName() + + CoserConstants.STORAGE_SELECTION_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); + + if (inputFile.isFile()) { + DataStorage dataStorage = importService.loadCSVFile(project, category, inputFile, false); + addProjectContent(project, selection, category, dataStorage, false); + fileLoaded++; + } + else { + throw new CoserBusinessException(_("Missing file %s", inputFile)); + } + } + } + + // TODO echatellier 20101027 need history file reloading + selection.setHistoryCommand(new ArrayList<Command>()); + + return project; + } + /** * Enregistre les fichiers de données apres validation. * @@ -372,7 +430,7 @@ * @return selection * @throws CoserBusinessException */ - public Selection createProjectSelection(Project project) throws CoserBusinessException { + public Selection initProjectSelection(Project project) throws CoserBusinessException { // TODO echatellier 20101027 voir si on force que les // fichier de validation existe ici ou pas @@ -402,6 +460,36 @@ } /** + * Create and save project selection. + * + * @param project project to create selection + * @param selection selection to create + * @throws CoserBusinessException + */ + public void createProjectSelection(Project project, Selection selection) throws CoserBusinessException { + + // tout ce qui suit doit exister à ce stade + File projectsDirectory = config.getProjectsDirectory(); + String projectName = project.getName(); + File projectDirectory = new File(projectsDirectory, projectName); + + // creation du dossier de selections (peut deja exister) + File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); + + // creation du dossier de la selection courante + File selectionDirectory = new File(selectionsDirectory, selection.getName()); + + if (selectionDirectory.isDirectory()) { + throw new CoserBusinessException(_("Selection %s already exists", selection.getName())); + } + else { + selectionDirectory.mkdirs(); + saveProjectSelection(project, selection); + project.addSelections(selection); + } + } + + /** * Save project selection. * * @param project project to save selection @@ -420,7 +508,6 @@ // creation du dossier de la selection courante File selectionDirectory = new File(selectionsDirectory, selection.getName()); - selectionDirectory.mkdirs(); for (Category category : Category.values()) { if (category.isDataCategory()) { 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-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-27 14:12:12 UTC (rev 107) @@ -6,6 +6,7 @@ Original\ line\ already\ exists\!= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= +Selection\ %s\ already\ exists= Specy\ %s\ doesn't\ exist\ in\ referential= Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= 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-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-27 14:12:12 UTC (rev 107) @@ -6,9 +6,10 @@ 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 \! -Specy\ %s\ doesn't\ exist\ in\ referential= -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s=auvais ent\u00EAte de fichier d\u00E9tect\u00E9.\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9.\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. +Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! +Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel +Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. +Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. coser.business.category.catch=Captures coser.business.category.haul=Traits coser.business.category.length=Tailles Modified: trunk/coser-business/src/main/resources/validators.xml =================================================================== --- trunk/coser-business/src/main/resources/validators.xml 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/main/resources/validators.xml 2010-10-27 14:12:12 UTC (rev 107) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Coser :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + 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% + --> + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator Config 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-10-27 14:12:12 UTC (rev 107) @@ -113,7 +113,7 @@ @Test public void testProjectYear() throws CoserBusinessException { Project project = createTestProject(service); - Selection selection = service.createProjectSelection(project); + Selection selection = service.initProjectSelection(project); List<Integer> years = service.getProjectYears(selection); Assert.assertEquals(2, years.size()); @@ -129,7 +129,7 @@ @Test public void testProjectZone() throws CoserBusinessException { Project project = createTestProject(service); - Selection selection = service.createProjectSelection(project); + Selection selection = service.initProjectSelection(project); List<String> zones = service.getProjectZone(selection, 2010, 2011); Assert.assertEquals(6, zones.size()); @@ -149,7 +149,7 @@ @Test public void testProjectSpecies() throws CoserBusinessException { Project project = createTestProject(service); - Selection selection = service.createProjectSelection(project); + Selection selection = service.initProjectSelection(project); List<Specy> species = service.getProjectSpecies(selection, 2010, 2011); Assert.assertEquals(4, species.size()); @@ -169,7 +169,7 @@ @Test public void testMergeSpecies() throws CoserBusinessException { Project project = createTestProject(service); - Selection selection = service.createProjectSelection(project); + Selection selection = service.initProjectSelection(project); Assert.assertTrue(service.isSpecyNameExist(project, "COSER_SPECIES_MERGE")); Assert.assertEquals(25, selection.getCatch().size()); Modified: trunk/coser-ui/LICENSE.txt =================================================================== --- trunk/coser-ui/LICENSE.txt 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/LICENSE.txt 2010-10-27 14:12:12 UTC (rev 107) @@ -1,166 +1,674 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 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 General Public License is a free, copyleft license for +software and other kinds of works. - 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, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. - 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. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. - 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. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - 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". + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - 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. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - 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. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. - 1. Exception to Section 3 of the GNU GPL. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + The precise terms and conditions for copying, distribution and +modification follow. - 2. Conveying Modified Versions. + TERMS AND CONDITIONS - 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: + 0. Definitions. - 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 + "This License" refers to version 3 of the GNU General Public License. - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 3. Object Code Incorporating Material from Library Header Files. + "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. - 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 "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. - 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. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + 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. - 4. Combined Works. + 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. - 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: + 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. - 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. + 1. Source Code. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + 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. - 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. + 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. - d) Do one of the following: + 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. - 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 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. - 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. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - 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.) + The Corresponding Source for a work in source code form is that +same work. - 5. Combined Libraries. + 2. Basic Permissions. - 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: + 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. - 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. + 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. - 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. + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. - 6. Revised Versions of the GNU Lesser General Public License. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - 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. + 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. - 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. + 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. - 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. + 4. Conveying Verbatim Copies. + 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. + + 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 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 Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-10-27 14:12:12 UTC (rev 107) @@ -39,9 +39,10 @@ <JMenuItem text="coser.ui.mainframe.menu.quit" onActionPerformed="getHandler().quit()"/> </JMenu> - <JMenu id='menuWindow' text="coser.ui.mainframe.menu.window"> + <JMenu id='menuWindow' text="coser.ui.mainframe.menu.window" enabled="false"> <JMenuItem text="coser.ui.mainframe.menu.window.validation" onActionPerformed="getHandler().showControlView()"/> - <SelectionsListMenuItem text="coser.ui.mainframe.menu.window.selection" constructorParams="this" /> + <SelectionsListMenuItem id="menuWindowSelectionMenuItem" + text="coser.ui.mainframe.menu.window.selection" constructorParams="this" /> </JMenu> <JMenu id='menuOptions' text="coser.ui.mainframe.menu.options"> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-27 14:12:12 UTC (rev 107) @@ -261,7 +261,7 @@ try { Project project = get(); if (project != null) { - view.setContextValue(project); + projectLoaded(project); showControlView(false); } } catch (Exception ex) { @@ -312,7 +312,7 @@ try { Project project = get(); if (project != null) { - view.setContextValue(project); + projectLoaded(project); showControlView(); } } catch (Exception ex) { @@ -324,6 +324,15 @@ } /** + * Do some operation when a new project is loaded into application. + */ + protected void projectLoaded(Project project) { + view.setContextValue(project); + view.getMenuWindow().setEnabled(true); + view.getMenuWindowSelectionMenuItem().setProject(project); + } + + /** * Charge les données de control et affiche la vue de control. */ public void showControlView() { @@ -363,11 +372,16 @@ ProjectService projectService = view.getContextValue(ProjectService.class); Project project = view.getContextValue(Project.class); try { - Selection selection = projectService.createProjectSelection(project); + Selection selection = projectService.initProjectSelection(project); view.setContextValue(selection); SelectionView selectionView = new SelectionView(view); + selectionView.setCreationState(true); selectionView.setSelection(selection); + // disable tabs + selectionView.setEnabledAt(1, false); // selection lists + selectionView.setEnabledAt(2, false); // rsufi + // fix, binding not working ? selectionView.getSelectionDetailsTab().getValidatorSelection().setBean(selection); selectionView.setHandler(new SelectionHandler()); @@ -391,7 +405,31 @@ * @param selectionName selection name to open */ public void showSelectionView(String selectionName) { - + // get selected selection + ProjectService projectService = view.getContextValue(ProjectService.class); + Project project = view.getContextValue(Project.class); + Selection selection = project.getSelections().get(selectionName); + try { + projectService.loadSelectionData(project, selection); + + view.setContextValue(selection); + + SelectionView selectionView = new SelectionView(view); + selectionView.setSelection(selection); + // fix, binding not working ? + selectionView.getSelectionDetailsTab().getValidatorSelection().setBean(selection); + selectionView.setHandler(new SelectionHandler()); + + File file = new File("/home/chatellier/tmp/coser/zones.png"); + ImageIcon icon = new ImageIcon(file.toURI().toURL()); + selectionView.getSelectionDetailsTab().getZonesMap().setIcon(icon); + + setMainComponent(selectionView); + } catch (CoserBusinessException ex) { + throw new CoserException("Can't reload selection data", ex); + } catch(Exception ex){ + throw new CoserException("Can't init map", ex); + } } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2010-10-27 14:12:12 UTC (rev 107) @@ -25,10 +25,11 @@ import static org.nuiton.i18n.I18n._; -import java.awt.Component; +import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.HashMap; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Map; import javax.swing.JMenu; @@ -36,7 +37,12 @@ import javax.swing.JSeparator; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; + /** * Selection list menu item. Display dynamic entries for project selection. * @@ -46,23 +52,67 @@ * Last update : $Date$ * By : $Author$ */ -public class SelectionsListMenuItem extends JMenu implements ActionListener { +public class SelectionsListMenuItem extends JMenu implements ActionListener, PropertyChangeListener { /** serialVersionUID. */ private static final long serialVersionUID = -3528302058982208907L; + private static final Log log = LogFactory.getLog(SelectionsListMenuItem.class); + protected CoserFrame view; - protected Map<Object, Component> components; + protected Project project; public SelectionsListMenuItem(CoserFrame view) { super(); this.view = view; - components = new HashMap<Object, Component>(); - - // seperator - add(new JSeparator()); - + updateMenuContent(); + } + + public Project getProject() { + return project; + } + + public void setProject(Project project) { + if (this.project != null) { + this.project.removePropertyChangeListener(Project.PROPERTY_SELECTIONS, this); + } + this.project = project; + this.project.addPropertyChangeListener(Project.PROPERTY_SELECTIONS, this); + updateMenuContent(); + } + + protected void updateMenuContent() { + removeAll(); + + if (log.isDebugEnabled()) { + log.debug("Refresh selection menu items"); + } + + if (project != null) { + + Map<String, Selection> selections = project.getSelections(); + + if (selections == null || selections.isEmpty()) { + JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.window.noSelection")); + menuItem.setFont(menuItem.getFont().deriveFont(Font.ITALIC)); + menuItem.setEnabled(false); + add(menuItem); + } + else { + for (String selectionName : selections.keySet()) { + // new selection + JMenuItem menuItem = new JMenuItem(selectionName); + menuItem.setActionCommand(selectionName); + menuItem.addActionListener(this); + add(menuItem); + } + } + + // seperator + add(new JSeparator()); + } + // new selection JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.window.newSelection")); menuItem.setActionCommand(""); // peut pas etre null, c'est nul ! @@ -85,4 +135,12 @@ view.getHandler().showSelectionView(actionCommand); } } + + /* + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ + @Override + public void propertyChange(PropertyChangeEvent evt) { + updateMenuContent(); + } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-10-27 14:12:12 UTC (rev 107) @@ -25,7 +25,9 @@ <Table> <SelectionHandler id="handler" javaBean="null" /> - + + <Boolean id="creationState" javaBean="false" /> + <!-- Validation --> <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' @@ -44,7 +46,8 @@ <JLabel text="coser.ui.selection.details.name" /> </cell> <cell weightx="1" fill="horizontal" columns="3"> - <JTextField id="selectionDetailsSelecionNameField" text="{selection.getName()}" /> + <JTextField id="selectionDetailsSelecionNameField" text="{getSelection().getName()}" + enabled="{isCreationState()}"/> <javax.swing.text.Document javaBean="selectionDetailsSelecionNameField.getDocument()" onInsertUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' onRemoveUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-10-27 14:12:12 UTC (rev 107) @@ -167,21 +167,26 @@ */ public void saveSelection(SelectionDetailsView view) { - // TODO test de nom valid ? - Project project = view.getContextValue(Project.class); - Selection seletion = view.getContextValue(Selection.class); + Selection selection = view.getContextValue(Selection.class); ProjectService service = view.getContextValue(ProjectService.class); - + SelectionView selectionView = view.getParentContainer(SelectionView.class); + try { - service.saveProjectSelection(project, seletion); + if (view.isCreationState()) { + service.createProjectSelection(project, selection); + selectionView.setCreationState(false); + } + else { + service.saveProjectSelection(project, selection); + } } catch (CoserBusinessException ex) { + JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); throw new CoserException("Can't save selection", ex); } // enable tabs - SelectionView selectionView = view.getParentContainer(SelectionView.class); selectionView.setEnabledAt(1, true); // selection lists selectionView.setEnabledAt(2, true); // rsufi } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-10-27 14:12:12 UTC (rev 107) @@ -25,6 +25,8 @@ <JTabbedPane> <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> + <Boolean id="creationState" javaBean="false" /> + <SelectionHandler id="handler" javaBean="null" /> <script><![CDATA[ void $afterCompleteSetup() { @@ -38,13 +40,13 @@ ]]></script> <tab title="coser.ui.selection.tab.details"> <SelectionDetailsView id="selectionDetailsTab" constructorParams="this" - handler="{getHandler()}" selection="{getSelection()}"/> + handler="{getHandler()}" selection="{getSelection()}" creationState="{isCreationState()}"/> </tab> - <tab title="coser.ui.selection.tab.lists" enabled="false"> + <tab title="coser.ui.selection.tab.lists"> <SelectionListsView id="selectionListsView" constructorParams="this" handler="{getHandler()}" /> </tab> - <tab title="coser.ui.selection.tab.result" enabled="false"> + <tab title="coser.ui.selection.tab.result"> <SelectionResultView id="selectionResultView" constructorParams="this" handler="{getHandler()}" /> </tab> 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-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-27 14:12:12 UTC (rev 107) @@ -2,13 +2,9 @@ coser.config.category.main= coser.config.category.main.description= coser.config.config.file.description= -coser.config.database.directory.description= coser.config.locale.description=Application's locale coser.config.lookandfeel.description=Application's swing theme -coser.config.reference.species.description= -coser.config.reference.zones.description= coser.config.support.email.description=Support email address -coser.config.validator.directory.description= coser.ui.common.cancel=Cancel coser.ui.common.comment=Comment coser.ui.common.delete= @@ -44,6 +40,7 @@ coser.ui.mainframe.menu.view.lookandfeel=Theme coser.ui.mainframe.menu.window=Window coser.ui.mainframe.menu.window.newSelection= +coser.ui.mainframe.menu.window.noSelection= coser.ui.mainframe.menu.window.selection= coser.ui.mainframe.menu.window.validation= coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi @@ -58,7 +55,6 @@ coser.ui.project.openProjectTitle= coser.ui.project.project= coser.ui.project.projectname=Project name \: -coser.ui.project.sizeFile=Size file \: coser.ui.project.stratesFile=Strates file \: coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile= @@ -69,7 +65,6 @@ coser.ui.result.extractDataTitle= coser.ui.selection.allSpecies=All species coser.ui.selection.details.beginDate= -coser.ui.selection.details.createSelection= coser.ui.selection.details.endDate= coser.ui.selection.details.family= coser.ui.selection.details.gender= @@ -90,16 +85,14 @@ coser.ui.selection.invalidFusionName= coser.ui.selection.maturitySpecies=Species with maturity coser.ui.selection.occurenceDensitySpecies=Filtered species +coser.ui.selection.saveError= coser.ui.selection.sizeAllYearSpecies=Species with size all year coser.ui.selection.speciesMenuFusion= coser.ui.selection.speciesMenuLabel= coser.ui.selection.tab.details= coser.ui.selection.tab.lists= coser.ui.selection.tab.result= -coser.ui.selectionlist.createSelection=Create selection -coser.ui.selectionlist.species= coser.ui.validation.checkData=Check data -coser.ui.validation.data.index= coser.ui.validators.cancel= coser.ui.validators.deleteValidator= coser.ui.validators.description= 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-27 11:47:34 UTC (rev 106) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-27 14:12:12 UTC (rev 107) @@ -40,6 +40,7 @@ coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainframe.menu.window=Fen\u00EAtre coser.ui.mainframe.menu.window.newSelection=Nouvelle s\u00E9lection +coser.ui.mainframe.menu.window.noSelection=Aucune s\u00E9lection coser.ui.mainframe.menu.window.selection=S\u00E9lection coser.ui.mainframe.menu.window.validation=Validation coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi @@ -84,6 +85,7 @@ coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! coser.ui.selection.maturitySpecies=Esp\u00E8ces avec maturit\u00E9 coser.ui.selection.occurenceDensitySpecies=Esp\u00E8ces filtr\u00E9es +coser.ui.selection.saveError=Erreur de sauvegarde coser.ui.selection.sizeAllYearSpecies=Esp\u00E8ces avec taille pour toutes les ann\u00E9es coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces @@ -91,7 +93,6 @@ coser.ui.selection.tab.lists=Listes des esp\u00E8ces coser.ui.selection.tab.result=Resultats RSufi coser.ui.validation.checkData=V\u00E9rifier les donn\u00E9es -coser.ui.validation.data.index=Index coser.ui.validators.cancel=Annuler coser.ui.validators.deleteValidator=Supprimer coser.ui.validators.description=L'application doit \u00EAtre red\u00E9marr\u00E9e apr\u00E8s la modification des validateurs. Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2010-10-27 14:12:12 UTC (rev 107) @@ -1,3 +1,26 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 Ifremer, Codelutin +# %% +# 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 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/>. +# #L% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/coser-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-10-27 11:47:34 UTC (rev 106) +++ trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-10-27 14:12:12 UTC (rev 107) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 Ifremer, Codelutin + %% + 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 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/>. + #L% + --> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.5//EN"