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

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

09 Nov '10

Author: chatellier Date: 2010-11-09 14:45:50 +0000 (Tue, 09 Nov 2010) New Revision: 194 Log: Ajout du debug du calcul de la densit?\195?\169 (pas fini) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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-09 13:06:36 UTC (rev 193) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-09 14:45:50 UTC (rev 194) @@ -1460,6 +1460,142 @@ * @return density as matrix */ public MatrixND getDensity(Project project, Selection selection) { - return null; + + // map species > "year, all density as double" + Map<String, Map<String, Set<Double>>> densityPerSpeciesAndYear = new HashMap<String, Map<String, Set<Double>>>(); + Set<String> lineNames = new HashSet<String>(); + Set<String> columns = new HashSet<String>(); + + // load map strataname > stratasurface + Map<String, Double> startaAndSurface = new HashMap<String, Double>(); + double totalSourface = 0; + Iterator<String[]> itStrata = selection.getStrata().iterator(); + itStrata.next(); // skip header + while (itStrata.hasNext()) { + String[] tuple = itStrata.next(); + String stataName = tuple[Strata.INDEX_STRATUM]; + String stringSurface = tuple[Strata.INDEX_SURFACE]; + try { + Double surface = Double.valueOf(stringSurface); + totalSourface += surface; + startaAndSurface.put(stataName, surface); + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't convert surface '" + stringSurface + "' as double"); + } + } + } + + // load map traitname > stratename + Map<String, String> haulAndStratas = new HashMap<String, String>(); + Map<String, Double> haulAndSweptSurface = new HashMap<String, Double>(); + Iterator<String[]> itHaul = selection.getHaul().iterator(); + itHaul.next(); // skip header + while (itHaul.hasNext()) { + String[] tuple = itHaul.next(); + String haulKey = tuple[Haul.INDEX_YEAR] + ";" + tuple[Haul.INDEX_HAUL]; + String strataName = tuple[Haul.INDEX_STRATUM]; + haulAndStratas.put(haulKey, strataName); + + String sweptSurfaceAsString = tuple[Haul.INDEX_SWEPT_SURFACE]; + try { + Double sweptSurface = Double.valueOf(sweptSurfaceAsString); + haulAndSweptSurface.put(haulKey, sweptSurface); + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't convert swept surface '" + sweptSurfaceAsString + "' as double"); + } + } + } + + // on conserve egalement les surfaces associé a chaque species/year + // pour post traiement + Map<String, Double> surfacesParStrates = new HashMap<String, Double>(); + + // calcul de la densité + Iterator<String[]> itData = selection.getCatch().iterator(); + itData.next(); // skip header + + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Catch.INDEX_YEAR]; + String haul = tuple[Catch.INDEX_HAUL]; + String species = tuple[Catch.INDEX_SPECIES]; + String numberAsString = tuple[Catch.INDEX_NUMBER]; + + lineNames.add(species); + columns.add(year); + + // compute density + try { + Double number = Double.valueOf(numberAsString); + Double sweptSurface = haulAndSweptSurface.get(year + ";" + haul); + Double density = number / sweptSurface; + + // count for species and year + Map<String, Set<Double>> specyDensityPerYear = densityPerSpeciesAndYear.get(species); + if (specyDensityPerYear == null) { + specyDensityPerYear = new HashMap<String, Set<Double>>(); + Set<Double> densities = new HashSet<Double>(); + densities.add(density); + specyDensityPerYear.put(year, densities); + densityPerSpeciesAndYear.put(species, specyDensityPerYear); + } + else { + Set<Double> specyYearDensity = specyDensityPerYear.get(year); + if (specyYearDensity == null) { + Set<Double> densities = new HashSet<Double>(); + densities.add(density); + specyDensityPerYear.put(year, densities); + } + else { + specyYearDensity.add(density); + } + } + + // surfaceparstrate + String strata = haulAndStratas.get(haul); + Double surface = startaAndSurface.get(strata); + surfacesParStrates.put(year + ";" + species, surface); + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't convert number '" + numberAsString + "' as double"); + } + } + } + + // convert to matrix + List<String> lineNames2 = new ArrayList<String>(lineNames); + Collections.sort(lineNames2); + List<String> columnsNames2 = new ArrayList<String>(columns); + Collections.sort(columnsNames2); + MatrixND matrix = MatrixFactory.getInstance().create("density", new List<?>[] { + lineNames2 , columnsNames2}); + + for (Map.Entry<String, Map<String, Set<Double>>> dynMatrixEntry : densityPerSpeciesAndYear.entrySet()) { + for (Map.Entry<String, Set<Double>> haulCountForYearEntry : dynMatrixEntry.getValue().entrySet()) { + + // mean density + double totalDensity = 0; + double densityCount = 0; + for (Double singleDensity : haulCountForYearEntry.getValue()) { + totalDensity += singleDensity; + densityCount++; + } + double meanDensity = totalDensity / densityCount; + + // surfaceparstrate + double surfaceparstrate = surfacesParStrates.get(haulCountForYearEntry.getKey() + ";" + dynMatrixEntry.getKey()); + + //TODO echatellier 20101109 finir + //matrix.setValue(dynMatrixEntry.getKey(), haulCountForYearEntry.getKey(), occurence); + } + } + + return matrix; } }

1 0

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

09 Nov '10

Author: chatellier Date: 2010-11-09 13:06:36 +0000 (Tue, 09 Nov 2010) New Revision: 193 Log: Add sampling effort and occurence algorithms Modified: trunk/coser-business/pom.xml 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/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-11-08 16:35:46 UTC (rev 192) +++ trunk/coser-business/pom.xml 2010-11-09 13:06:36 UTC (rev 193) @@ -55,6 +55,10 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + </dependency> + <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> 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-08 16:35:46 UTC (rev 192) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-09 13:06:36 UTC (rev 193) @@ -55,6 +55,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.math.util.MathUtils; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; @@ -1263,9 +1266,58 @@ * * @param project * @param selection + * @return sampling effort as matrix */ - public void getSamplingEffort(Project project, Selection selection) { + public MatrixND getSamplingEffort(Project project, Selection selection) { + + // map strate > "year,integer" + Map<String, Map<String, Double>> dynMatrix = new HashMap<String, Map<String,Double>>(); + Set<String> lineNames = new HashSet<String>(); + Set<String> columns = new HashSet<String>(); + Iterator<String[]> itData = selection.getHaul().iterator(); + itData.next(); // skip header + + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Haul.INDEX_YEAR]; + String strata = tuple[Haul.INDEX_STRATUM]; + lineNames.add(strata); + columns.add(year); + + Map<String, Double> haulCountForStrata = dynMatrix.get(strata); + if (haulCountForStrata == null) { + haulCountForStrata = new HashMap<String, Double>(); + haulCountForStrata.put(year, 1.0); + dynMatrix.put(strata, haulCountForStrata); + } + else { + Double haulCountForYear = haulCountForStrata.get(year); + if (haulCountForYear == null) { + haulCountForStrata.put(year, 1.0); + } + else { + haulCountForYear++; + haulCountForStrata.put(year, haulCountForYear); + } + } + } + + List<String> lineNames2 = new ArrayList<String>(lineNames); + Collections.sort(lineNames2); + List<String> columnsNames2 = new ArrayList<String>(columns); + Collections.sort(columnsNames2); + MatrixND matrix = MatrixFactory.getInstance().create("sampling effort", new List<?>[] { + lineNames2 , columnsNames2}); + + for (Map.Entry<String, Map<String, Double>> dynMatrixEntry : dynMatrix.entrySet()) { + for (Map.Entry<String, Double> haulCountForYearEntry : dynMatrixEntry.getValue().entrySet()) { + matrix.setValue(dynMatrixEntry.getKey(), haulCountForYearEntry.getKey(), haulCountForYearEntry.getValue()); + } + } + + return matrix; } /** @@ -1294,9 +1346,80 @@ * * @param project * @param selection + * @return occurence as matrix */ - public void getOccurence(Project project, Selection selection) { + public MatrixND getOccurence(Project project, Selection selection) { + + // map species > "year, hauls" + Map<String, Map<String, Set<String>>> dynMatrix = new HashMap<String, Map<String, Set<String>>>(); + Set<String> lineNames = new HashSet<String>(); + Set<String> columns = new HashSet<String>(); + Map<String, Set<String>> traitsCountPerYear = new HashMap<String, Set<String>>(); + + Iterator<String[]> itData = selection.getCatch().iterator(); + itData.next(); // skip header + + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Catch.INDEX_YEAR]; + String haul = tuple[Catch.INDEX_HAUL]; + String species = tuple[Catch.INDEX_SPECIES]; + lineNames.add(species); + columns.add(year); + + // count all traits + Set<String> traitCountPerYear = traitsCountPerYear.get(year); + if (traitCountPerYear == null) { + Set<String> hauls = new HashSet<String>(); + hauls.add(haul); + traitsCountPerYear.put(year, hauls); + } + else { + traitCountPerYear.add(haul); + } + + // count for species and year + Map<String, Set<String>> haulCountForStrata = dynMatrix.get(species); + if (haulCountForStrata == null) { + haulCountForStrata = new HashMap<String, Set<String>>(); + Set<String> hauls = new HashSet<String>(); + hauls.add(haul); + haulCountForStrata.put(year, hauls); + dynMatrix.put(species, haulCountForStrata); + } + else { + Set<String> traitCountPerYear2 = haulCountForStrata.get(year); + if (traitCountPerYear2 == null) { + Set<String> hauls = new HashSet<String>(); + hauls.add(haul); + haulCountForStrata.put(year, hauls); + } + else { + traitCountPerYear2.add(haul); + } + } + } + + List<String> lineNames2 = new ArrayList<String>(lineNames); + Collections.sort(lineNames2); + List<String> columnsNames2 = new ArrayList<String>(columns); + Collections.sort(columnsNames2); + MatrixND matrix = MatrixFactory.getInstance().create("occurence", new List<?>[] { + lineNames2 , columnsNames2}); + for (Map.Entry<String, Map<String, Set<String>>> dynMatrixEntry : dynMatrix.entrySet()) { + for (Map.Entry<String, Set<String>> haulCountForYearEntry : dynMatrixEntry.getValue().entrySet()) { + double occurence = (double)haulCountForYearEntry.getValue().size() / + (double) traitsCountPerYear.get(haulCountForYearEntry.getKey()).size(); + occurence = MathUtils.round(occurence * 100.0, 2); + + matrix.setValue(dynMatrixEntry.getKey(), haulCountForYearEntry.getKey(), occurence); + } + } + + return matrix; + } /** @@ -1334,8 +1457,9 @@ * * @param project project * @param selection selection + * @return density as matrix */ - public void getDensity(Project project, Selection selection) { - + public MatrixND getDensity(Project project, Selection selection) { + return null; } } 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-08 16:35:46 UTC (rev 192) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-09 13:06:36 UTC (rev 193) @@ -35,6 +35,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants; @@ -298,4 +299,32 @@ commandService.undoAction(project, project.getControl()); Assert.assertEquals(30, project.getControl().getLength().size()); } + + /** + * Test de la method sampling effort. + * + * @throws CoserBusinessException + */ + @Test + public void testSamplingEffort() throws CoserBusinessException { + Project project = createTestProject(projectService); + Selection selection = projectService.initProjectSelection(project); + selection.setName("test"); + MatrixND matrix = projectService.getSamplingEffort(project, selection); + Assert.assertNotNull(matrix); + } + + /** + * Test de la méthode occurence. + * + * @throws CoserBusinessException + */ + @Test + public void getOccurence() throws CoserBusinessException { + Project project = createTestProject(projectService); + Selection selection = projectService.initProjectSelection(project); + selection.setName("test"); + MatrixND matrix = projectService.getOccurence(project, selection); + Assert.assertNotNull(matrix); + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-08 16:35:46 UTC (rev 192) +++ trunk/pom.xml 2010-11-09 13:06:36 UTC (rev 193) @@ -53,6 +53,13 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.3</version>

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 16:35:46 +0000 (Mon, 08 Nov 2010) New Revision: 192 Log: Rename zone to strata Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-08 16:33:00 UTC (rev 191) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-08 16:35:46 UTC (rev 192) @@ -88,7 +88,7 @@ </row> <row> <cell fill="horizontal" columns="3"> - <JLabel text="coser.ui.selection.details.zone" /> + <JLabel text="coser.ui.selection.details.strata" /> </cell> <cell anchor="east"> <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" 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-08 16:33:00 UTC (rev 191) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:35:46 UTC (rev 192) @@ -102,9 +102,9 @@ coser.ui.selection.details.showMapTip= coser.ui.selection.details.showSpreciesTip= coser.ui.selection.details.species=Species \: +coser.ui.selection.details.strata=Strata \: coser.ui.selection.details.technicalComment=Technical comment coser.ui.selection.details.type= -coser.ui.selection.details.zone=Zone \: coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter coser.ui.selection.filter.occurrence=Occurrence \: 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-08 16:33:00 UTC (rev 191) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:35:46 UTC (rev 192) @@ -102,9 +102,9 @@ 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.species=Esp\u00E8ces \: +coser.ui.selection.details.strata=Strates \: coser.ui.selection.details.technicalComment=Commentaire technique coser.ui.selection.details.type=Filtrer par type \: -coser.ui.selection.details.zone=Zone \: coser.ui.selection.filter.density=Densit\u00E9 \: coser.ui.selection.filter.filter=Filtrer coser.ui.selection.filter.occurrence=Occurence \:

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 16:33:00 +0000 (Mon, 08 Nov 2010) New Revision: 191 Log: Add select all / unselect all in specy context menu 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/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-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-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-08 16:33:00 UTC (rev 191) @@ -180,14 +180,16 @@ * @param event mouse event */ public void showSpeciesContextMenu(final SelectionDetailsView view, MouseEvent event) { - + // clic droit if (event.getButton() == MouseEvent.BUTTON3) { - + + JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + // affiche le menu contextuel si au moins 2 especes selectionnées int[] selectedRows = view.getSpecyList().getSelectedIndices(); if (selectedRows.length > 1) { - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + // merge menu JMenuItem fusionMenu = new JMenuItem(_("coser.ui.selection.speciesMenuFusion")); fusionMenu.addActionListener(new ActionListener() { @Override @@ -204,8 +206,30 @@ } }); popupMenu.add(fusionMenu); - popupMenu.show(view.getSpecyList(), event.getX(), event.getY()); } + + // select all menu + JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + selectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + int size = view.getSpecyList().getModel().getSize(); + view.getSpecyList().getSelectionModel().addSelectionInterval(0, size - 1); + } + }); + popupMenu.add(selectAllMenu); + + // unselect all menu + JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + unselectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + view.getSpecyList().getSelectionModel().clearSelection(); + } + }); + popupMenu.add(unselectAllMenu); + + popupMenu.show(view.getSpecyList(), event.getX(), event.getY()); } } 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-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-08 16:33:00 UTC (rev 191) @@ -109,35 +109,35 @@ </row> <row> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionAllSpeciesList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionAllSpeciesList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionOccurenceDensityList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionOccurenceDensityList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionSizeAllYearList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionSizeAllYearList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionMaturityList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionMaturityList.getSelectionModel()).clearSelection()"/> </cell> </row> 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-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:33:00 UTC (rev 191) @@ -10,8 +10,10 @@ coser.ui.common.cancel=Cancel coser.ui.common.comment=Comment coser.ui.common.selectAll=All +coser.ui.common.selectAll.short= coser.ui.common.selectFile=Select\u2026 coser.ui.common.unselectAll=None +coser.ui.common.unselectAll.short= coser.ui.common.valid=Valid coser.ui.config.title=Configuration coser.ui.control.check.containsError= 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-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:33:00 UTC (rev 191) @@ -9,9 +9,11 @@ coser.config.support.email.description=Adresse de suport pour l'envoi des erreurs coser.ui.common.cancel=Annuler coser.ui.common.comment=Commentaire -coser.ui.common.selectAll=Tous +coser.ui.common.selectAll=S\u00E9lectionner tout +coser.ui.common.selectAll.short=Tout coser.ui.common.selectFile=S\u00E9lectionner\u2026 -coser.ui.common.unselectAll=Aucun +coser.ui.common.unselectAll=D\u00E9-s\u00E9lectionner tout +coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider coser.ui.config.title=Configuration coser.ui.control.check.containsError=Les donn\u00E9es contiennent encore des erreurs non corrig\u00E9es\npouvant fausser la cr\u00E9ation de la s\u00E9lection.\nVoulez vous poursuivre la cr\u00E9ation de la s\u00E9lection ?

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 16:22:13 +0000 (Mon, 08 Nov 2010) New Revision: 190 Log: Ajout des champ comment, person in charge, selection description Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.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/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-08 15:54:12 UTC (rev 189) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-08 16:22:13 UTC (rev 190) @@ -59,7 +59,11 @@ public static final String PROPERTY_SELECTIONS="selections"; protected String name; - + + protected String personInCharge; + + protected String comment; + protected Control control; protected Map<String, Selection> selections; @@ -80,6 +84,22 @@ getPropertyChangeSupport().firePropertyChange("name", oldValue, name); } + public String getPersonInCharge() { + return personInCharge; + } + + public void setPersonInCharge(String personInCharge) { + this.personInCharge = personInCharge; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + public Control getControl() { return control; } 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-08 16:22:13 UTC (rev 190) @@ -47,6 +47,8 @@ protected String name; + protected String description; + protected int beginDate; protected int endDate; @@ -57,10 +59,8 @@ protected List<String> species; - protected String technicalComment; + protected String comment; - protected String otherComment; - public String getName() { return name; } @@ -71,6 +71,14 @@ getPropertyChangeSupport().firePropertyChange("name", oldValue, name); } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public int getBeginDate() { return beginDate; } @@ -111,21 +119,13 @@ this.species = species; } - public String getThechnicalComment() { - return technicalComment; + public String getComment() { + return comment; } - public void setTechnicalComment(String technicalComment) { - this.technicalComment = technicalComment; + public void setComment(String comment) { + this.comment = comment; } - - public String getOtherComment() { - return otherComment; - } - - public void setOtherComment(String otherComment) { - this.otherComment = otherComment; - } public Properties toProperties() { Properties props = new Properties(); @@ -140,11 +140,11 @@ if (getFilterSpecyTypes() != null) { props.setProperty("selection.specy.types", StringUtils.join(getFilterSpecyTypes(),',')); } - if (technicalComment != null) { - props.setProperty("selection.technicalcomment", technicalComment); + if (description != null) { + props.setProperty("selection.description", description); } - if (otherComment != null) { - props.setProperty("selection.othercomment", otherComment); + if (comment != null) { + props.setProperty("selection.comment", comment); } return props; } @@ -165,11 +165,11 @@ if (props.containsKey("selection.specy.types")) { setFilterSpecyTypes(splitAsList(props.getProperty("selection.specy.types"))); } - if (props.containsKey("selection.technicalcomment")) { - setTechnicalComment(props.getProperty("selection.technicalcomment")); + if (props.containsKey("selection.description")) { + setDescription(props.getProperty("selection.description")); } - if (props.containsKey("selection.othercomment")) { - setOtherComment(props.getProperty("selection.othercomment")); + if (props.containsKey("selection.comment")) { + setComment(props.getProperty("selection.comment")); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-08 16:22:13 UTC (rev 190) @@ -64,6 +64,18 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.projectpersonincharge" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JTextField id="projectPersonInCharge" text="{project.getPersonInCharge()}" /> + <javax.swing.text.Document javaBean="projectPersonInCharge.getDocument()" + onInsertUpdate='getProject().setPersonInCharge(projectPersonInCharge.getText())' + onRemoveUpdate='getProject().setPersonInCharge(projectPersonInCharge.getText())' /> + + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.captureFile" /> </cell> <cell weightx="1" fill="horizontal"> @@ -142,6 +154,20 @@ </cell> </row> <row> + <cell anchor="northwest"> + <JLabel text="coser.ui.project.projectcomment" /> + </cell> + <cell fill="horizontal"> + <JScrollPane> + <JXTextArea id="projectComment" constructorParams='_("coser.ui.common.comment")' rows="3" /> + </JScrollPane> + <javax.swing.text.Document javaBean="projectComment.getDocument()" + onInsertUpdate='getProject().setComment(projectComment.getText())' + onRemoveUpdate='getProject().setComment(projectComment.getText())' /> + + </cell> + </row> + <row> <cell columns="3" anchor="east"> <JButton id="createProjectButton" text="coser.ui.project.createProject" onActionPerformed="getHandler().createProject(this)" /> 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-08 16:22:13 UTC (rev 190) @@ -35,7 +35,7 @@ <BeanValidator id='validatorSelection' bean='selection' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" errorTableModel="errorsTableModel"> - <field name="name" component="selectionDetailsSelecionNameField" /> + <field name="name" component="selectionDetailsSelectionNameField" /> </BeanValidator> <row> @@ -46,15 +46,28 @@ <JLabel text="coser.ui.selection.details.name" /> </cell> <cell weightx="1" fill="horizontal" columns="3"> - <JTextField id="selectionDetailsSelecionNameField" text="{getSelection().getName()}" + <JTextField id="selectionDetailsSelectionNameField" text="{getSelection().getName()}" enabled="{isCreationState()}"/> - <javax.swing.text.Document javaBean="selectionDetailsSelecionNameField.getDocument()" - onInsertUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' - onRemoveUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' /> + <javax.swing.text.Document javaBean="selectionDetailsSelectionNameField.getDocument()" + onInsertUpdate='getSelection().setName(selectionDetailsSelectionNameField.getText())' + onRemoveUpdate='getSelection().setName(selectionDetailsSelectionNameField.getText())' /> </cell> </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.selection.details.description" /> + </cell> + <cell weightx="1" fill="horizontal" columns="3"> + <JScrollPane> + <JTextArea id="selectionDetailsDescription" text="{getSelection().getDescription()}" rows="3" /> + </JScrollPane> + <javax.swing.text.Document javaBean="selectionDetailsDescription.getDocument()" + onInsertUpdate='getSelection().setDescription(selectionDetailsDescription.getText())' + onRemoveUpdate='getSelection().setDescription(selectionDetailsDescription.getText())' /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.selection.details.beginDate" /> </cell> <cell weightx="1" fill="horizontal"> @@ -95,7 +108,7 @@ </cell> </row> <row> - <cell weightx="1" fill="horizontal" columns="4"> + <cell weighty="2" fill="both" columns="4"> <Table border='{BorderFactory.createTitledBorder(_("coser.ui.selection.details.species"))}'> <row> <cell fill="horizontal"> @@ -107,7 +120,7 @@ </cell> </row> <row> - <cell fill="horizontal" weightx="1" weighty="1" columns="2"> + <cell fill="both" weightx="1" weighty="1" columns="2"> <JScrollPane> <TypeSpecyListModel id="typeSpecyModel" constructorParams="this" /> <JList id="typeSpecyList" model="{typeSpecyModel}" @@ -135,18 +148,11 @@ <row> <cell weighty="1" fill="both" columns="4"> <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.selection.details.technicalComment")' rows="3" /> + <JXTextArea constructorParams='_("coser.ui.selection.details.comment")' rows="3" /> </JScrollPane> </cell> </row> <row> - <cell weighty="1" fill="both" columns="4"> - <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.selection.details.otherComment")' rows="3" /> - </JScrollPane> - </cell> - </row> - <row> <cell fill="horizontal" columns="4"> <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" onActionPerformed="getHandler().saveSelection(this)" /> 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:22:13 UTC (rev 190) @@ -41,6 +41,11 @@ coser.ui.graph.compareNumberCatchSize= coser.ui.graph.lengthStructure= coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Data +coser.ui.mainframe.menu.data.control=Control +coser.ui.mainframe.menu.data.newSelection=New selection +coser.ui.mainframe.menu.data.noSelection=No selection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -51,11 +56,6 @@ coser.ui.mainframe.menu.validators=Validators coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Theme -coser.ui.mainframe.menu.data=Data -coser.ui.mainframe.menu.data.control=Control -coser.ui.mainframe.menu.data.newSelection=New selection -coser.ui.mainframe.menu.data.noSelection=No selection -coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Capture file \: coser.ui.project.createProject=Create project @@ -67,7 +67,9 @@ coser.ui.project.openProject=Open coser.ui.project.openProjectTitle=Open existing project coser.ui.project.project=Project \: +coser.ui.project.projectcomment=Comments \: coser.ui.project.projectname=Project name \: +coser.ui.project.projectpersonincharge=Person in charge \: coser.ui.project.stratesFile=Strates file \: coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file @@ -87,6 +89,8 @@ coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: +coser.ui.selection.details.comment=Comments +coser.ui.selection.details.description=Description \: coser.ui.selection.details.endDate=End date \: coser.ui.selection.details.family=Filter by family \: coser.ui.selection.details.gender=Filter by gender \: 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:22:13 UTC (rev 190) @@ -41,6 +41,11 @@ coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles coser.ui.graph.lengthStructure=Structures en taille coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Donn\u00E9es +coser.ui.mainframe.menu.data.control=Contr\u00F4le +coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection +coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -51,11 +56,6 @@ coser.ui.mainframe.menu.validators=Validateurs coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me -coser.ui.mainframe.menu.data=Donn\u00E9es -coser.ui.mainframe.menu.data.control=Contr\u00F4le -coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection -coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection -coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet @@ -67,7 +67,9 @@ coser.ui.project.openProject=Ouvrir coser.ui.project.openProjectTitle=Ouvrir un projet existant coser.ui.project.project=Projet \: +coser.ui.project.projectcomment=Commentaire \: coser.ui.project.projectname=Nom du projet \: +coser.ui.project.projectpersonincharge=Responsable \: coser.ui.project.stratesFile=Fichiers des strates \: coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence @@ -87,6 +89,8 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.details.beginDate=Date de d\u00E9but \: +coser.ui.selection.details.comment=Commentaire +coser.ui.selection.details.description=Description \: coser.ui.selection.details.endDate=Date de fin \: coser.ui.selection.details.family=Filtrer par famille \: coser.ui.selection.details.gender=Filtrer par genre \:

1 0

r189 - in trunk: . coser-business coser-ui
by chatellier＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: chatellier Date: 2010-11-08 15:54:12 +0000 (Mon, 08 Nov 2010) New Revision: 189 Log: Add nuiton matrix dependency Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-11-08 14:28:19 UTC (rev 188) +++ trunk/coser-business/pom.xml 2010-11-08 15:54:12 UTC (rev 189) @@ -23,6 +23,10 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-matrix</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-11-08 14:28:19 UTC (rev 188) +++ trunk/coser-ui/pom.xml 2010-11-08 15:54:12 UTC (rev 189) @@ -38,6 +38,10 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-matrix</artifactId> + </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-08 14:28:19 UTC (rev 188) +++ trunk/pom.xml 2010-11-08 15:54:12 UTC (rev 189) @@ -86,8 +86,15 @@ <version>1.5.1-SNAPSHOT</version> <scope>compile</scope> </dependency> - + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-matrix</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${i18n.version}</version>

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 14:28:19 +0000 (Mon, 08 Nov 2010) New Revision: 188 Log: Selection les errors des sous noued lorsqu'on check un groupe Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-08 14:12:05 UTC (rev 187) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-08 14:28:19 UTC (rev 188) @@ -54,7 +54,7 @@ protected List<GlobalValidationGroup> validationErrorsGroups; protected SortedMap<GlobalValidationGroup, List<ValidationError>> validationErrorsChilds; - protected Set<ValidationError> checkedValidationErrors; + protected Set<Object> checkedValidationErrors; public GlobalValidationModel() { super(1); @@ -89,7 +89,7 @@ validationErrorsGroups = new ArrayList<GlobalValidationGroup>(validationErrorsChilds.keySet()); Collections.sort(validationErrorsGroups); - checkedValidationErrors = new HashSet<ValidationError>(); + checkedValidationErrors = new HashSet<Object>(); } /* @@ -140,17 +140,15 @@ Object result = null; - if (node instanceof ValidationError) { - - switch (column) { - case 0: - result = node; - break; - default: - result = checkedValidationErrors.contains(node); - break; - } + switch (column) { + case 0: + result = node; + break; + default: + result = checkedValidationErrors.contains(node); + break; } + return result; } @@ -223,15 +221,21 @@ @Override public void setValueAt(Object value, Object node, int column) { - if (node instanceof ValidationError) { - Boolean booleanValue = (Boolean)value; - ValidationError validationError = (ValidationError)node; - if (booleanValue.booleanValue()) { - checkedValidationErrors.add(validationError); + Boolean booleanValue = (Boolean)value; + if (booleanValue.booleanValue()) { + checkedValidationErrors.add(node); + } + else { + checkedValidationErrors.remove(node); + } + + // recursive check of sub errors + if (node instanceof GlobalValidationGroup) { + int childCount = getChildCount(node); + for (int i = 0 ; i < childCount; ++i) { + Object child = getChild(node, i); + setValueAt(value, child, column); } - else { - checkedValidationErrors.remove(validationError); - } } } }

1 0

r187 - trunk/coser-ui/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: chatellier Date: 2010-11-08 14:12:05 +0000 (Mon, 08 Nov 2010) New Revision: 187 Log: Add icon for check button Added: trunk/coser-ui/src/main/resources/icons/spellcheck.png Added: trunk/coser-ui/src/main/resources/icons/spellcheck.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/spellcheck.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 14:11:51 +0000 (Mon, 08 Nov 2010) New Revision: 186 Log: Add icon for check button Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-08 13:45:07 UTC (rev 185) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-08 14:11:51 UTC (rev 186) @@ -48,7 +48,8 @@ renderer="{new fr.ifremer.coser.ui.control.ControlCategoryListRenderer()}" onActionPerformed="getHandler().categoryChanged(this, event)"/> <JToolBar.Separator /> - <JButton text="coser.ui.validation.checkData" onActionPerformed="getHandler().checkData(this)" /> + <JButton icon="spellcheck.png" text="coser.ui.validation.checkData" + onActionPerformed="getHandler().checkData(this)" /> <JToolBar.Separator /> <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchSize" onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)"/> @@ -67,7 +68,7 @@ <ListSelectionModel id="controlDataTableSelectionModel" javaBean="controlDataTable.getSelectionModel()" onValueChanged="getHandler().controlDataTableSelectionChanged(this, event)" /> </JScrollPane> - + <JSplitPane name="splitpaneDetail" orientation="{JSplitPane.VERTICAL_SPLIT}"> <JSplitPane name="splitpaneDataDetailError"> <JScrollPane id="editionScrollPane">

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 13:45:07 +0000 (Mon, 08 Nov 2010) New Revision: 185 Log: Fix tests Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 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-08 13:43:33 UTC (rev 184) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-08 13:45:07 UTC (rev 185) @@ -32,7 +32,6 @@ import java.util.HashMap; import java.util.List; -import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -129,7 +128,7 @@ Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "selections" + File.separator + - "titi" + File.separator + "catch_se.csv").exists()); + "titi" + File.separator + "data" + File.separator + "catch_se.csv").exists()); } /**

1 0