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

r283 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 09:30:27 +0000 (Fri, 26 Nov 2010) New Revision: 283 Log: Inverse la condition de test (si c'est sup a 0) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 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-11-26 09:02:31 UTC (rev 282) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-26 09:30:27 UTC (rev 283) @@ -60,6 +60,7 @@ import fr.ifremer.coser.CoserConstants.ValidationLevel; import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.control.DiffCatchLengthValidationError; import fr.ifremer.coser.control.ProgressMonitor; import fr.ifremer.coser.control.ValidationError; import fr.ifremer.coser.data.AbstractDataEntity; @@ -544,7 +545,7 @@ * Detecte des différences entre les nombres dans captures * et les nombres dand taille. * - * @see ChartService#getCompareCatchLengthGraph(Project, Control, String) for details + * @see PublicationService#getCompareCatchLengthGraph(Project, Control, String) for details * @see CoserBusinessConfig#getControlDiffCatchLength() for option * * @return errors @@ -653,12 +654,13 @@ // diff entre 4 et 5 = (5-4) * 100 / 5 double min = Math.min(catchNumber, lengthNumber); // si c'est 0, ou absence de catures, ce n'est pas une erreur - if (min <= 0) { + if (min > 0) { double max = Math.max(catchNumber, lengthNumber); double diff = (max - min) * 100 / max; if (diff > config.getControlDiffCatchLength()) { - ValidationError error = new ValidationError(); + DiffCatchLengthValidationError error = new DiffCatchLengthValidationError(); + error.setSpecies(species); error.setLevel(ValidationLevel.WARNING); error.setMessage(_("coser.business.control.error.diffCatchLength")); error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year));

1 0

r282 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 09:02:31 +0000 (Fri, 26 Nov 2010) New Revision: 282 Log: Delete temp directory after tests Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 16:13:26 UTC (rev 281) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-26 09:02:31 UTC (rev 282) @@ -31,6 +31,7 @@ import java.util.Locale; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; @@ -74,7 +75,7 @@ @AfterClass public static void cleanDirectory() throws IOException { - //FileUtils.deleteDirectory(testDirectory); + FileUtils.deleteDirectory(testDirectory); } /**

1 0

r281 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 16:13:26 +0000 (Thu, 25 Nov 2010) New Revision: 281 Log: Dans le controle de diff?\195?\169rence catch/length, les cas 0 n'est pas une erreur Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 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-11-25 15:29:23 UTC (rev 280) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-25 16:13:26 UTC (rev 281) @@ -475,7 +475,7 @@ int lineIndex = 1; // skip header while (itTuple.hasNext()) { String[] tuple = itTuple.next(); - + // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); @@ -483,7 +483,7 @@ progress.setCurrent(lineIndex); ++lineIndex; } - + // compute key StringBuffer sb = new StringBuffer(); for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { @@ -517,8 +517,6 @@ log.warn("Can't parse '" + nombreValue + "' as double"); } } - - } // now look for invalid data @@ -653,15 +651,19 @@ } // diff entre 4 et 5 = (5-4) * 100 / 5 - double diff = (Math.max(catchNumber, lengthNumber) - - Math.min(catchNumber, lengthNumber)) * 100 / Math.max(catchNumber, lengthNumber); - - if (diff > config.getControlDiffCatchLength()) { - ValidationError error = new ValidationError(); - error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.diffCatchLength")); - error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year)); - validationErrors.add(error); + double min = Math.min(catchNumber, lengthNumber); + // si c'est 0, ou absence de catures, ce n'est pas une erreur + if (min <= 0) { + double max = Math.max(catchNumber, lengthNumber); + double diff = (max - min) * 100 / max; + + if (diff > config.getControlDiffCatchLength()) { + ValidationError error = new ValidationError(); + error.setLevel(ValidationLevel.WARNING); + error.setMessage(_("coser.business.control.error.diffCatchLength")); + error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year)); + validationErrors.add(error); + } } } }

1 0

r280 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 15:29:23 +0000 (Thu, 25 Nov 2010) New Revision: 280 Log: Fix years data filtering that need data reload when new years are bigger set than previous filtered data years Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 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-11-25 14:59:24 UTC (rev 279) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-25 15:29:23 UTC (rev 280) @@ -669,8 +669,26 @@ localProject = loadControlData(localProject); } + Selection selection = new Selection(); + copyControlDataToSelection(localProject, selection); + + selection.setRsufiResults(new ArrayList<RSufiResult>()); + + // init filter values with configuration + selection.setDensityFilter(config.getSelectionDensityFilter()); + selection.setOccurrenceFilter(config.getSelectionOccurrenceFilter()); + + return selection; + } + + /** + * Copy loaded control data to new created selection. + * + * @return selection initialized with + */ + protected Selection copyControlDataToSelection(Project project, Selection selection) { // create new selection - Control control = localProject.getControl(); + Control control = project.getControl(); DataStorage dataCatch = control.getCatch(); DataStorage dataHaul = control.getHaul(); DataStorage dataLength = control.getLength(); @@ -678,19 +696,14 @@ project.clearData(); - Selection selection = new Selection(); selection.setCatch(dataCatch); selection.setHaul(dataHaul); selection.setLength(dataLength); selection.setStrata(dataStrata); + + // data reloaded from control, so modification are empty selection.setHistoryCommand(new ArrayList<Command>()); - selection.setRsufiResults(new ArrayList<RSufiResult>()); - - // init filter values with configuration - selection.setDensityFilter(config.getSelectionDensityFilter()); - selection.setOccurrenceFilter(config.getSelectionOccurrenceFilter()); - return selection; } @@ -1244,14 +1257,28 @@ /** * Get zones name in project with data in [{@code beginYear}-{@code endYear}]. * + * This methods set {@link Selection#setSelectedYears(List)}, and use + * it to known if control data need to be reloaded (don't set it yourself). + * * Used in selection ui. * + * @param project project * @param selection selection * @param years selected years * @return zones + * @throws CoserBusinessException */ - public List<String> filterDataYearsAndGetStrata(Selection selection, Collection<String> years) { + public List<String> filterDataYearsAndGetStrata(Project project, Selection selection, List<String> years) throws CoserBusinessException { + List<String> currentSelectionYears = selection.getSelectedYears(); + if (currentSelectionYears == null || !currentSelectionYears.containsAll(years)) { + // la liste des nouvelles année est plus grande que la liste + // actuelle des données de la selection + // les données doivent être rechargée + project = loadControlData(project); + copyControlDataToSelection(project, selection); + } + List<String> result = new ArrayList<String>(); // manage haul @@ -1308,6 +1335,9 @@ log.debug("Length data filtered by " + years); } + // the only place to set this value + selection.setSelectedYears(years); + return result; } 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-11-25 14:59:24 UTC (rev 279) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-25 15:29:23 UTC (rev 280) @@ -200,30 +200,30 @@ } /** - * Test l'obtention de la liste des zones d'un projet. + * Test l'obtention de la liste des strates d'un projet. * * @throws CoserBusinessException */ @Test - public void testProjectZone() throws CoserBusinessException { + public void testProjectStrata() throws CoserBusinessException { Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> years = new ArrayList<String>(); years.add("2010"); years.add("2011"); - List<String> strata = projectService.filterDataYearsAndGetStrata(selection, years); + List<String> strata = projectService.filterDataYearsAndGetStrata(project, selection, years); Assert.assertEquals(6, strata.size()); List<String> years2 = new ArrayList<String>(); years2.add("2009"); - strata = projectService.filterDataYearsAndGetStrata(selection, years2); + strata = projectService.filterDataYearsAndGetStrata(project, selection, years2); Assert.assertEquals(0, strata.size()); List<String> years3 = new ArrayList<String>(); years3.add("2011"); // doit recharger les données pour être correct - strata = projectService.filterDataYearsAndGetStrata(selection, years3); + strata = projectService.filterDataYearsAndGetStrata(project, selection, years3); Assert.assertEquals(3, strata.size()); @@ -239,30 +239,39 @@ Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); - List<String> allStrata = new ArrayList<String>(); - allStrata.add("STR1"); - allStrata.add("STR2"); - allStrata.add("STR3"); - allStrata.add("STR4"); - allStrata.add("STR5"); - allStrata.add("STR6"); + List<String> years20102011 = new ArrayList<String>(); + years20102011.add("2010"); + years20102011.add("2011"); + List<String> years2011 = new ArrayList<String>(); + years2011.add("2011"); + List<String> years2009 = new ArrayList<String>(); + years2009.add("2009"); + // all data + List<String> allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); List<String> species = projectService.getProjectSpecies(project, selection, allStrata, null); Assert.assertEquals(4, species.size()); - + + // data in 2011 + allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years2011); species = projectService.getProjectSpecies(project, selection, allStrata, null); Assert.assertEquals(4, species.size()); + // all strata but no data for years + allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years2009); species = projectService.getProjectSpecies(project, selection, allStrata, null); Assert.assertEquals(0, species.size()); // test with no strata + allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); species = projectService.getProjectSpecies(project, selection, new ArrayList<String>(), null); Assert.assertEquals(0, species.size()); // test with only one stratum + allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); species = projectService.getProjectSpecies(project, selection, Collections.singletonList("STR6"), null); Assert.assertEquals(4, species.size()); + } /** 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-11-25 14:59:24 UTC (rev 279) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-25 15:29:23 UTC (rev 280) @@ -215,6 +215,7 @@ * @param view view */ public void updateSelectionDateData(SelectionDetailsView view) { + Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); @@ -224,15 +225,22 @@ for (Object selectedDate : selectedDates) { years.add((String)selectedDate); } - selection.setSelectedYears(years); - + if (log.isDebugEnabled()) { log.debug("Refreshing strata list"); } - List<String> strata = projectService.filterDataYearsAndGetStrata(selection, years); - view.getStrataListModel().setStrata(strata); - if (log.isDebugEnabled()) { - log.debug("Strata list refreshed"); + + try { + // filterDataYearsAndGetStrata do selection.setSelectedYears(years); + // don't set yourself + List<String> strata = projectService.filterDataYearsAndGetStrata(project, selection, years); + view.getStrataListModel().setStrata(strata); + + if (log.isDebugEnabled()) { + log.debug("Strata list refreshed"); + } + } catch (CoserBusinessException ex) { + throw new CoserException("Can't filters data with specified years", ex); } }

1 0

r279 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 14:59:24 +0000 (Thu, 25 Nov 2010) New Revision: 279 Log: Fix copyrigth Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ImportServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as 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-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ImportServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ImportServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ImportServiceTest.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as 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-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as 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-11-25 14:51:55 UTC (rev 278) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-11-25 14:59:24 UTC (rev 279) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * 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 Lesser General Public License as

1 0

r278 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 14:51:55 +0000 (Thu, 25 Nov 2010) New Revision: 278 Log: La cr?\195?\169ation de selection requiere un controle valid?\195?\169 (modification des tests en cons?\195?\169quences) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -61,7 +61,7 @@ @Test public void testCatchChart() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Map<String, JFreeChart> charts = chartService.getCompareCatchLengthGraph(project, project.getControl(), null); JFreeChart chart = charts.get("COSER_SPECIES1"); JDialog f = new JDialog(); 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-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -63,7 +63,7 @@ */ @Test public void testDeleteLine() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertEquals(30, project.getControl().getLength().size()); DeleteLineCommand command = new DeleteLineCommand(); @@ -81,7 +81,7 @@ */ @Test(expected=CoserBusinessException.class) public void testDeleteLineWrong() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("2"); command.setCategory(Category.LENGTH); @@ -97,7 +97,7 @@ */ @Test public void testDeleteLineUndo() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertEquals("4", project.getControl().getLength().get(4)[Length.INDEX_LINE]); DeleteLineCommand command = new DeleteLineCommand(); @@ -118,7 +118,7 @@ */ @Test(expected=CoserBusinessException.class) public void testDeleteLineUndoAlreadyExists() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("3"); command.setCategory(Category.LENGTH); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:51:55 UTC (rev 278) @@ -82,11 +82,12 @@ * * Project is filled with control data (not selections). * - * @param projectService + * @param projectService project service + * @param controlValidated if {@code true} mark loaded control as {@code validated} * @return * @throws CoserBusinessException */ - protected Project createTestProject(ProjectService projectService) throws CoserBusinessException { + protected Project createTestProject(ProjectService projectService, boolean controlValidated) throws CoserBusinessException { Project project = new Project(); project.setName("Project-" + System.nanoTime()); @@ -112,6 +113,8 @@ // sans la sauvegarde des données de control, on ne pas creer de // selection projectService.saveProjectControl(project); + + project.getControl().setValidated(controlValidated); if (log.isDebugEnabled()) { log.debug("Created project : " + project.getName()); 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-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -90,7 +90,7 @@ */ @Test public void testCreateProject() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "original" + File.separator + "catch.csv").exists()); @@ -112,13 +112,13 @@ */ @Test public void testSaveProject() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); projectService.saveProjectControl(project); Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "control" + File.separator + "catch_co.csv").exists()); } - + /** * Test que les selections sont bien creer. * @@ -126,7 +126,7 @@ */ @Test public void testCreateSelection() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("titi"); projectService.createProjectSelection(project, selection); @@ -143,7 +143,7 @@ */ @Test public void testSelectionReloading() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Assert.assertEquals(25, project.getControl().getCatch().size()); Selection selection = projectService.initProjectSelection(project); @@ -163,7 +163,7 @@ */ @Test(expected=CoserBusinessException.class) public void testCreateSelectionError() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("titi"); projectService.createProjectSelection(project, selection); @@ -177,7 +177,7 @@ */ @Test public void testSpeciesExistence() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertFalse(projectService.isSpecyNameExist(project, "Coser_invalid")); Assert.assertTrue(projectService.isSpecyNameExist(project, "COSER_SPECIES1")); Assert.assertTrue(projectService.isSpecyNameExist(project, "COSER_SPECIES2")); @@ -190,7 +190,7 @@ */ @Test public void testProjectYear() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> years = projectService.getProjectYears(selection); @@ -206,7 +206,7 @@ */ @Test public void testProjectZone() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> years = new ArrayList<String>(); @@ -236,7 +236,7 @@ */ @Test public void testProjectSpecies() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> allStrata = new ArrayList<String>(); @@ -272,7 +272,7 @@ */ @Test public void testMergeSpecies() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); @@ -297,7 +297,7 @@ */ @Test public void testCommandStoreAndReloading() throws CoserBusinessException, IOException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("2"); @@ -373,7 +373,7 @@ */ @Test public void testSamplingEffort() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getSamplingEffort(project, selection); @@ -387,7 +387,7 @@ */ @Test public void getOccurence() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getOccurrence(project, selection); @@ -401,7 +401,7 @@ */ @Test public void getDensity() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getDensity(project, selection);

1 0

r277 - trunk/coser-business/src/main/resources/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 14:38:57 +0000 (Thu, 25 Nov 2010) New Revision: 277 Log: Wrong character in expresion (strange space) Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-25 14:34:00 UTC (rev 276) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-25 14:38:57 UTC (rev 277) @@ -66,7 +66,7 @@ </field-validator> </field> <validator type="coserExpression"> - <param name="expression"><![CDATA[lengthAsString.endsWith(".00") || lengthAsString.endsWith(".0") || lengthAsString.endsWith(".50") || lengthAsString.endsWith(".5")]]></param> + <param name="expression"><![CDATA[lengthAsString.endsWith(".00") || lengthAsString.endsWith(".0") || lengthAsString.endsWith(".50") || lengthAsString.endsWith(".5")]]></param> <message>coser.business.control.error.invalidLengthLengthStep</message> </validator> <field name="numberAsString">

1 0

r276 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 14:34:00 +0000 (Thu, 25 Nov 2010) New Revision: 276 Log: Imports Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 14:31:31 UTC (rev 275) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 14:34:00 UTC (rev 276) @@ -31,9 +31,6 @@ import org.apache.commons.lang.StringUtils; -import fr.ifremer.coser.CoserBusinessConfig; -import fr.ifremer.coser.CoserConstants; - /** * Project selection. *

1 0

r275 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 14:31:31 +0000 (Thu, 25 Nov 2010) New Revision: 275 Log: Save occurrence and density filter. Ass occurrence and density configuration Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.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-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.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-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-25 14:31:31 UTC (rev 275) @@ -82,16 +82,26 @@ return result; } - public double getObervationNobsmin() { - double result = getOptionAsDouble(CoserBusinessOption.OBSERVATION_NOBSMIN.key); + public double getControlNobsmin() { + double result = getOptionAsDouble(CoserBusinessOption.CONTROL_NOBSMIN.key); return result; } public double getControlDiffCatchLength() { - double result = getOptionAsDouble(CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH.key); + double result = getOptionAsDouble(CoserBusinessOption.CONTROL_DIFF_CATCH_LENGTH.key); return result; } + public double getSelectionOccurrenceFilter() { + double result = getOptionAsDouble(CoserBusinessOption.SELECTION_FILTER_OCCURRENCE.key); + return result; + } + + public double getSelectionDensityFilter() { + double result = getOptionAsDouble(CoserBusinessOption.SELECTION_FILTER_DENSITY.key); + return result; + } + public static enum CoserBusinessOption implements OptionDef { DATABASE_DIRECTORY("coser.database.directory", _("coser.config.database.directory.description"), "${user.home}" + File.separator + "coser", String.class, false, false), @@ -101,8 +111,10 @@ REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), REFERENCE_TYPE_ESPECES("coser.reference.typeEspeces", _("coser.config.reference.typeEspeces.description"), "", String.class, false, false), - OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false), - CONTROL_DIFF_CACTH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0", Double.class, false, false); + CONTROL_NOBSMIN("coser.control.nobsmin", _("coser.config.control.nobsmin.description"), "1.0", Double.class, false, false), + CONTROL_DIFF_CATCH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0", Double.class, false, false), + SELECTION_FILTER_OCCURRENCE("coser.selection.occurrenceFilter", _("coser.config.selection.occurrenceFilter.description"), "5.0", Double.class, false, false), + SELECTION_FILTER_DENSITY("coser.selection.densityFilter", _("coser.config.selection.densityFilter.description"), "5.0", Double.class, false, false); protected String key; protected String description; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 14:31:31 UTC (rev 275) @@ -31,6 +31,9 @@ import org.apache.commons.lang.StringUtils; +import fr.ifremer.coser.CoserBusinessConfig; +import fr.ifremer.coser.CoserConstants; + /** * Project selection. * @@ -61,6 +64,10 @@ protected String comment; + protected double occurrenceFilter; + + protected double densityFilter; + /** L1 : liste des especes. */ protected List<String> selectedSpecies; @@ -143,6 +150,26 @@ getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); } + public double getOccurrenceFilter() { + return occurrenceFilter; + } + + public void setOccurrenceFilter(double occurrenceFilter) { + double oldValue = this.occurrenceFilter; + this.occurrenceFilter = occurrenceFilter; + getPropertyChangeSupport().firePropertyChange("occurrenceFilter", oldValue, occurrenceFilter); + } + + public double getDensityFilter() { + return densityFilter; + } + + public void setDensityFilter(double densityFilter) { + double oldValue = this.densityFilter; + this.densityFilter = densityFilter; + getPropertyChangeSupport().firePropertyChange("densityFilter", oldValue, densityFilter); + } + public List<String> getSelectedSpecies() { return selectedSpecies; } @@ -255,6 +282,8 @@ if (comment != null) { props.setProperty("selection.comment", comment); } + props.setProperty("selection.occurrenceFilter", String.valueOf(occurrenceFilter)); + props.setProperty("selection.densityFilter", String.valueOf(densityFilter)); if (getSelectedSpecies() != null) { props.setProperty("selection.selectedSpecies", StringUtils.join(getSelectedSpecies(),',')); } @@ -300,6 +329,12 @@ if (props.containsKey("selection.comment")) { setComment(props.getProperty("selection.comment")); } + if (props.containsKey("selection.occurrenceFilter")) { + setOccurrenceFilter(Double.parseDouble(props.getProperty("selection.occurrenceFilter"))); + } + if (props.containsKey("selection.densityFilter")) { + setDensityFilter(Double.parseDouble(props.getProperty("selection.densityFilter"))); + } if (props.containsKey("selection.selectedSpecies")) { setSelectedSpecies(splitAsList(props.getProperty("selection.selectedSpecies"))); } 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-25 14:31:31 UTC (rev 275) @@ -686,6 +686,10 @@ selection.setHistoryCommand(new ArrayList<Command>()); selection.setRsufiResults(new ArrayList<RSufiResult>()); + + // init filter values with configuration + selection.setDensityFilter(config.getSelectionDensityFilter()); + selection.setOccurrenceFilter(config.getSelectionOccurrenceFilter()); return selection; } 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-25 14:31:31 UTC (rev 275) @@ -525,7 +525,7 @@ for (Map.Entry<String, Double> sumObservation : nombreForKey.entrySet()) { String key = sumObservation.getKey(); Double value = sumObservation.getValue(); - if (value < config.getObervationNobsmin()) { + if (value < config.getControlNobsmin()) { String lineNumber = firstLineForKey.get(key); @@ -745,7 +745,7 @@ for (Map.Entry<String, Double> sumObservation : nombreForKey.entrySet()) { String key = sumObservation.getKey(); Double value = sumObservation.getValue(); - if (value < config.getObervationNobsmin()) { + if (value < config.getControlNobsmin()) { String lineNumber = firstLineForKey.get(key); 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-25 14:31:31 UTC (rev 275) @@ -56,11 +56,13 @@ coser.business.result.rsufiResultAlreadyExists= coser.business.selection.notValidatedControl= coser.config.control.diffcatchlength.description= +coser.config.control.nobsmin.description= coser.config.database.directory.description= -coser.config.observation.nobsmin.description= coser.config.projects.directory.description= coser.config.reference.species.description= coser.config.reference.typeEspeces.description= +coser.config.selection.densityFilter.description= +coser.config.selection.occurrenceFilter.description= coser.config.validator.directory.description= depth\ attribute\ is\ not\ a\ valid\ double= lat\ attribute\ is\ not\ a\ valid\ double= 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-25 14:31:31 UTC (rev 275) @@ -56,11 +56,13 @@ coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \! coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \! coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0) +coser.config.control.nobsmin.description=Nombre minimal d'observation coser.config.database.directory.description=Emplacement du dossier de toutes les donn\u00E9es relatives \u00E0 Coser -coser.config.observation.nobsmin.description=Nombre minimal d'observation coser.config.projects.directory.description=Emplacement du dossier de sauvegarde des projets coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces (Reftax) coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces +coser.config.selection.densityFilter.description=Filtre par d\u00E9faut sur la moyenne des densit\u00E9s +coser.config.selection.occurrenceFilter.description=Filtre par d\u00E9faut sur la moyenne des occurrences coser.config.validator.directory.description=Emplacement des fichiers de validations depth\ attribute\ is\ not\ a\ valid\ double=L'attribut ProfMoy n'est pas un r\u00E9el valide lat\ attribute\ is\ not\ a\ valid\ double=L'attribut Lat n'est pas un r\u00E9el valide 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-25 14:31:31 UTC (rev 275) @@ -150,18 +150,20 @@ ConfigUIHelper modelBuilder = new ConfigUIHelper(config); // category main - modelBuilder.addCategory(_("coser.config.category.main"), _("coser.config.category.main.description")); + modelBuilder.addCategory(_("coser.config.category.path"), _("coser.config.category.path.description")); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.DATABASE_DIRECTORY); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.PROJECTS_DIRECTORY); - - // category control - modelBuilder.addCategory(_("coser.config.category.control"), _("coser.config.category.control.description")); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES); - modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.OBSERVATION_NOBSMIN); - modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH); - ConfigUI configUI = modelBuilder.buildUI(view, _("coser.config.category.main")); + // category control + modelBuilder.addCategory(_("coser.config.category.configuration"), _("coser.config.category.configuration.description")); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.CONTROL_NOBSMIN); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.CONTROL_DIFF_CATCH_LENGTH); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.SELECTION_FILTER_OCCURRENCE); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.SELECTION_FILTER_DENSITY); + + ConfigUI configUI = modelBuilder.buildUI(view, _("coser.config.category.path")); JDialog dialogUI = new JDialog(view, _("coser.ui.config.title")); dialogUI.add(configUI); dialogUI.pack(); 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-25 14:31:31 UTC (rev 275) @@ -426,6 +426,9 @@ * @param view selection list view */ public void updateOccurrenceDensityFilter(SelectionListsView view) { + + Selection selection = view.getContextValue(Selection.class); + String stringOccurrence = view.getSelectionFilterOccurrenceField().getText().trim(); String stringDensity = view.getSelectionFilterDensityField().getText().trim(); @@ -433,6 +436,9 @@ double occurrence = Double.valueOf(stringOccurrence); double density = Double.valueOf(stringDensity); + selection.setOccurrenceFilter(occurrence); + selection.setDensityFilter(density); + // construction de la liste de selection des especes OccurrenceDensitySpecyListModel model = view.getSelectionOccurrenceDensityListModel(); int speciesCount = model.getSize(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-25 14:31:31 UTC (rev 275) @@ -77,10 +77,17 @@ <cell fill="horizontal" insets="0" columns="2" anchor="west"> <JPanel> <JLabel text="coser.ui.selection.filter.occurrence" /> - <JTextField id="selectionFilterOccurrenceField" columns="3" text="5" /> + <JTextField id="selectionFilterOccurrenceField" columns="3" text="{String.valueOf(getSelection().getOccurrenceFilter())}" /> + <javax.swing.text.Document javaBean="selectionFilterOccurrenceField.getDocument()" + onInsertUpdate='applyOccDensFilter.setEnabled(true)' + onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> <JLabel text="coser.ui.selection.filter.density" /> - <JTextField id="selectionFilterDensityField" columns="3" text="5" /> - <JButton text="coser.ui.selection.filter.filter" onActionPerformed="getHandler().updateOccurrenceDensityFilter(this)" /> + <JTextField id="selectionFilterDensityField" columns="3" text="{String.valueOf(getSelection().getDensityFilter())}" /> + <javax.swing.text.Document javaBean="selectionFilterDensityField.getDocument()" + onInsertUpdate='applyOccDensFilter.setEnabled(true)' + onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> + <JButton id="applyOccDensFilter" text="coser.ui.selection.filter.filter" enabled="false" + onActionPerformed="getHandler().updateOccurrenceDensityFilter(this);applyOccDensFilter.setEnabled(false)" /> </JPanel> </cell> <cell columns="2"> 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-25 14:31:31 UTC (rev 275) @@ -1,8 +1,8 @@ coser.config.application.version.description=Application's version -coser.config.category.control=Control -coser.config.category.control.description=Control -coser.config.category.main=Coser -coser.config.category.main.description=Main configuration +coser.config.category.configuration= +coser.config.category.configuration.description= +coser.config.category.path= +coser.config.category.path.description= coser.config.config.file.description=Coser configuration file coser.config.locale.description=Application's locale coser.config.lookandfeel.description=Application's swing theme 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-11-25 13:38:11 UTC (rev 274) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-25 14:31:31 UTC (rev 275) @@ -1,8 +1,8 @@ coser.config.application.version.description=Version de l'application -coser.config.category.control=Contr\u00F4le -coser.config.category.control.description=Contr\u00F4le -coser.config.category.main=Coser -coser.config.category.main.description=Configuration principale +coser.config.category.configuration=Configuration +coser.config.category.configuration.description=Configuration (donn\u00E9es num\u00E9riques) +coser.config.category.path=Chemins +coser.config.category.path.description=Configuration des fichiers et r\u00E9pertoires coser.config.config.file.description=Fichier de configuration de Coser coser.config.locale.description=Langue de l'application coser.config.lookandfeel.description=Themes graphique Swing de l'application

1 0

r274 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 13:38:11 +0000 (Thu, 25 Nov 2010) New Revision: 274 Log: Ajout des nombres de lignes selectionn?\195?\169es/nmbre de lignes total dans les labels correspondant aux listes Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 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-11-25 10:40:51 UTC (rev 273) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-25 13:38:11 UTC (rev 274) @@ -108,7 +108,7 @@ </row> <row> <cell fill="horizontal" columns="2"> - <JLabel text="coser.ui.selection.details.strata" /> + <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> </cell> <cell anchor="east"> <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" @@ -122,10 +122,11 @@ <row> <cell weighty="2" fill="both" columns="2"> <JScrollPane> - <StrataListModel id="strataListModel" /> + <StrataListModel id="strataListModel" + onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> <JList id="strataList" model="{strataListModel}" selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" - onValueChanged="setStrataValidated(false)"/> + onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> </cell> <cell anchor="south" columns="2"> @@ -136,17 +137,18 @@ </row> <row> <cell fill="horizontal" columns="4"> - <JLabel text="coser.ui.selection.details.type" /> + <JLabel id="typeSpecyLabel" text='{_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize())}' /> </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> <JScrollPane> - <SpecyTypesListModel id="typeSpecyModel" constructorParams="this" /> + <SpecyTypesListModel id="typeSpecyModel" constructorParams="this" + onContentsChanged='typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))'/> <JList id="typeSpecyList" model="{typeSpecyModel}" selectionModel="{new CoserListSelectionModel(typeSpecyList.getSelectionModel(), typeSpecyModel)}" - onValueChanged="validFilterButton.setEnabled(true)" - enabled="{isYearsValidated() && isStrataValidated()}" /> + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='validFilterButton.setEnabled(true); typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))' /> </JScrollPane> </cell> <cell anchor="south" columns="2"> @@ -160,20 +162,22 @@ <Table> <row> <cell fill="horizontal" columns="2"> - <JLabel text="coser.ui.selection.details.filteredSpecies" /> + <JLabel id="filteredSpecyLabel" text='{_("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> </cell> <cell fill="horizontal"> - <JLabel text="coser.ui.selection.details.selectedSpecies" /> + <JLabel id="selectedSpecyLabel" text='{_("coser.ui.selection.details.selectedSpecies", 0, 0)}' /> </cell> </row> <row> <cell weightx="1" weighty="1" fill="both"> <JScrollPane> - <SpecyListModel id="filteredSpecyListModel" /> + <SpecyListModel id="filteredSpecyListModel" + onContentsChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))'/> <JList id="filteredSpecyList" model="{filteredSpecyListModel}" onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" - enabled="{isYearsValidated() && isStrataValidated()}" /> + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))' /> <ListSelectionModel id="filteredSpecyListSelectionModel" javaBean="filteredSpecyList.getSelectionModel()" /> </JScrollPane> </cell> @@ -204,10 +208,12 @@ </cell> <cell weightx="1" weighty="1" fill="both"> <JScrollPane> - <SpecyListModel id="selectedSpecyListModel" /> + <SpecyListModel id="selectedSpecyListModel" + onContentsChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> <JList id="selectedSpecyList" model="{selectedSpecyListModel}" selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}" - enabled="{isYearsValidated() && isStrataValidated()}" /> + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> <ListSelectionModel id="selectedSpecyListSelectionModel" javaBean="selectedSpecyList.getSelectionModel()" /> </JScrollPane> </cell> 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-11-25 10:40:51 UTC (rev 273) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-25 13:38:11 UTC (rev 274) @@ -123,14 +123,14 @@ coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \: coser.ui.selection.details.description=Description \: -coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es \: +coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es (%d/%d) \: coser.ui.selection.details.name=Nom de la s\u00E9lection \: coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection -coser.ui.selection.details.selectedSpecies=Esp\u00E8ces s\u00E9lectionn\u00E9es \: +coser.ui.selection.details.selectedSpecies=L1 \: Esp\u00E8ces s\u00E9lectionn\u00E9es (%d/%d) \: coser.ui.selection.details.showMapTip=Afficher la carte des zones coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces -coser.ui.selection.details.strata=Strates \: -coser.ui.selection.details.type=Filtrer par type \: +coser.ui.selection.details.strata=Strates (%d/%d) \: +coser.ui.selection.details.type=Filtrer par type (%d/%d) \: coser.ui.selection.details.validDates=Valider les ann\u00E9es coser.ui.selection.details.validFilter=Valider les filtres coser.ui.selection.details.validSelection=Valider la s\u00E9lection

1 0