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

r154 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: chatellier Date: 2010-11-03 13:45:45 +0000 (Wed, 03 Nov 2010) New Revision: 154 Log: Selection de l'espece sur laquelle porte le graphique. Changement du type de graphique en ligne (xy). Ajoute de la deuxieme s?\195?\169rie taille sur le graphique des captures. Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/SpecyComboModel.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 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/services/ChartService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java 2010-11-03 11:27:39 UTC (rev 153) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java 2010-11-03 13:45:45 UTC (rev 154) @@ -25,9 +25,11 @@ package fr.ifremer.coser.services; -import java.util.ArrayList; +import static org.nuiton.i18n.I18n._; + +import java.text.NumberFormat; +import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -38,17 +40,21 @@ import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.labels.CategoryToolTipGenerator; import org.jfree.chart.labels.StandardCategoryItemLabelGenerator; +import org.jfree.chart.labels.StandardCategoryToolTipGenerator; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.PlotOrientation; -import org.jfree.chart.renderer.category.AreaRenderer; import org.jfree.chart.renderer.category.CategoryItemRenderer; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.DefaultCategoryDataset; import fr.ifremer.coser.CoserBusinessConfig; +import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Length; /** * Validation service. @@ -69,34 +75,37 @@ this.config = config; } - public JFreeChart getCatchGraph(Project project, Control control) { - + /** + * Retourne le graph de comparaison entre le nombre de capture et + * le nombre dans les tailles. + * + * @param project projet + * @param control control + * @param specyName sepcy name + * @return chart + */ + public JFreeChart getCompareCatchLengthGraph(Project project, Control control, String specyName) { + + // look for data (data summed over catch) + SortedMap<String, Double> catchForYears = new TreeMap<String, Double>(); Iterator<String[]> itCatchData = control.getCatch().iterator(); itCatchData.next(); // header - - // look for data (data summed) - SortedMap<String, Double> dataForYears = new TreeMap<String, Double>(); - String species = null; while (itCatchData.hasNext()) { String[] tuple = itCatchData.next(); - - if (species == null) { - species = tuple[Catch.INDEX_SPECIES]; - } - if (species.equals(tuple[Catch.INDEX_SPECIES])) { + if (specyName.equals(tuple[Catch.INDEX_SPECIES])) { String year = tuple[Catch.INDEX_YEAR]; String nombreValue = tuple[Catch.INDEX_NUMBER]; try { Double nombreDouble = Double.valueOf(nombreValue); - if (dataForYears.containsKey(year)) { - Double oldValue = dataForYears.get(year); + if (catchForYears.containsKey(year)) { + Double oldValue = catchForYears.get(year); Double newValue = oldValue + nombreDouble; - dataForYears.put(year, newValue); + catchForYears.put(year, newValue); } else { - dataForYears.put(year, nombreDouble); + catchForYears.put(year, nombreDouble); } } catch (NumberFormatException ex) { @@ -107,43 +116,72 @@ } } - List<SortedMap<String, Double>> results = new ArrayList<SortedMap<String,Double>>(); - results.add(dataForYears); + // look for data (data summed over length) + SortedMap<String, Double> lengthForYears = new TreeMap<String, Double>(); + Iterator<String[]> itLengthData = control.getLength().iterator(); + itLengthData.next(); // header + while (itLengthData.hasNext()) { + String[] tuple = itLengthData.next(); + if (specyName.equals(tuple[Length.INDEX_SPECIES])) { + String year = tuple[Length.INDEX_YEAR]; + String nombreValue = tuple[Length.INDEX_NUMBER]; + try { + Double nombreDouble = Double.valueOf(nombreValue); + + if (lengthForYears.containsKey(year)) { + Double oldValue = lengthForYears.get(year); + Double newValue = oldValue + nombreDouble; + lengthForYears.put(year, newValue); + } + else { + lengthForYears.put(year, nombreDouble); + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse " + nombreValue + " as double"); + } + } + } + } + + Map<String, SortedMap<String, Double>> results = new HashMap<String, SortedMap<String,Double>>(); + results.put(_(Category.CATCH.getTranslationKey()), catchForYears); + results.put(_(Category.LENGTH.getTranslationKey()), lengthForYears); JFreeChart chart = displayGraph(results); return chart; } - protected JFreeChart displayGraph(List<SortedMap<String, Double>> results) { - + protected JFreeChart displayGraph(Map<String, SortedMap<String, Double>> resultSeries) { + // create a chart with the dataset DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - for (Map<String, Double> map : results) { - for (Map.Entry<String, Double> data : map.entrySet()) { - dataset.setValue(data.getValue(), "Capture campagne", data.getKey()); + for (Map.Entry<String, SortedMap<String, Double>> resultSerie : resultSeries.entrySet()) { + for (Map.Entry<String, Double> data : resultSerie.getValue().entrySet()) { + dataset.setValue(data.getValue(), resultSerie.getKey(), data.getKey()); } } - - CategoryAxis categoryAxis = new CategoryAxis("Année"); + + CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); categoryAxis.setCategoryMargin(0); // label horizontaux //categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); - ValueAxis valueAxis = new NumberAxis("Nombre"); + ValueAxis valueAxis = new NumberAxis(_("coser.business.common.number")); valueAxis.setUpperMargin(0.1); - //XYSplineRenderer renderer = new XYSplineRenderer(); - //AreaRenderer renderer = new AreaRenderer(); - //StackedBarRenderer renderer = new StackedBarRenderer(); - - CategoryItemRenderer renderer = new AreaRenderer(); + CategoryItemRenderer renderer = new LineAndShapeRenderer(); StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); renderer.setBaseItemLabelGenerator(itemLabelGenerator); renderer.setBaseItemLabelsVisible(true); + + CategoryToolTipGenerator cttg = new StandardCategoryToolTipGenerator("{0}: {2}", NumberFormat.getInstance()); + renderer.setBaseToolTipGenerator(cttg); CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, renderer); plot.setOrientation(PlotOrientation.VERTICAL); - JFreeChart chart = new JFreeChart("Captures", JFreeChart.DEFAULT_TITLE_FONT, - plot, true); + JFreeChart chart = new JFreeChart(_("coser.business.chart.compareCatchLengthNumberTitle"), + JFreeChart.DEFAULT_TITLE_FONT, plot, true); return chart; } 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-03 13:45:45 UTC (rev 154) @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -801,37 +802,63 @@ List<Integer> result = new ArrayList<Integer>(years); return result; } - + /** + * Get species name in project. + * + * Used in control ui (graph). + * + * @param container data container + * @return species + */ + public List<String> getProjectSpecies(AbstractDataContainer container) { + List<String> result = new ArrayList<String>(); + + Iterator<String[]> itTuple = container.getCatch().iterator(); + itTuple.next(); // skip header + while (itTuple.hasNext()) { + String[] tuple = itTuple.next(); + String species = tuple[Catch.INDEX_SPECIES]; + if (!result.contains(species)) { + result.add(species); + } + } + + Collections.sort(result); + return result; + } + + /** * Get species name in project with data in [{@code beginYear}-{@code endYear}]. * * Used in selection ui. * - * @param selection selection - * @param beginYear begin year - * @param endYear end year - * @return zones + * @param container data container + * @param beginYear begin year (can be null) + * @param endYear end year (can be null) + * @return species */ - public List<Specy> getProjectSpecies(Selection selection, Integer beginYear, Integer endYear) { + public List<Specy> getProjectSpecies(AbstractDataContainer container, Integer beginYear, Integer endYear) { SortedMap<String, Specy> result = new TreeMap<String, Specy>(); - Iterator<String[]> itTuple = selection.getCatch().iterator(); + Iterator<String[]> itTuple = container.getCatch().iterator(); itTuple.next(); // skip header while (itTuple.hasNext()) { String[] tuple = itTuple.next(); + String species = tuple[Catch.INDEX_SPECIES]; + // "Campagne","Annee","Trait","Espece","Nombre","Poids" String annee = tuple[Catch.INDEX_YEAR]; try { int intAnnee = Integer.parseInt(annee); if (intAnnee >= beginYear && intAnnee <= endYear) { - String species = tuple[Catch.INDEX_SPECIES]; if (!result.containsKey(species)) { Specy specy = new Specy(); specy.setName(species); result.put(species, specy); - } + } } } catch (NumberFormatException ex) { 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-03 13:45:45 UTC (rev 154) @@ -31,6 +31,9 @@ coser.business.category.length=Length coser.business.category.reftax.species= coser.business.category.strata=Stata +coser.business.chart.compareCatchLengthNumberTitle= +coser.business.common.number= +coser.business.common.year= coser.business.control.error.duplicatedLine= coser.business.control.error.minObservationCount= coser.business.control.error.minObservationCountDetail= 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-03 13:45:45 UTC (rev 154) @@ -31,6 +31,9 @@ coser.business.category.length=Tailles coser.business.category.reftax.species=Reftax (esp\u00E8ce) coser.business.category.strata=Strates +coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombre dans Capture et Taille +coser.business.common.number=Nombre +coser.business.common.year=Ann\u00E9e coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-03 13:45:45 UTC (rev 154) @@ -25,9 +25,7 @@ package fr.ifremer.coser.services; -import javax.swing.ImageIcon; import javax.swing.JDialog; -import javax.swing.JLabel; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; @@ -47,7 +45,6 @@ * Last update : $Date$ * By : $Author$ */ - at Ignore public class ChartServiceTest extends CoserTestAbstract { protected ProjectService projectService; @@ -62,7 +59,7 @@ @Test public void testCatchChart() throws CoserBusinessException { Project project = createTestProject(projectService); - JFreeChart chart = chartService.getCatchGraph(project, project.getControl()); + JFreeChart chart = chartService.getCompareCatchLengthGraph(project, project.getControl(), "COSER_SPECIES1"); JDialog f = new JDialog(); f.setModal(true); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-03 11:27:39 UTC (rev 153) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-03 13:45:45 UTC (rev 154) @@ -24,8 +24,22 @@ --> <JDialog title="coser.ui.control.graphtitle"> - <JScrollPane> - <JPanel id="controlGraphPanel" /> - </JScrollPane> + <ControlHandler id="handler" javaBean="null" /> + <Table> + <row> + <cell> + <JLabel text="coser.ui.control.graph.specy"/> + </cell> + <cell fill="horizontal"> + <SpecyComboModel id="specyComboModel" /> + <JComboBox model="{specyComboModel}" onActionPerformed="getHandler().updateGraphSpecy(this)" /> + </cell> + </row> + <row fill="both" weightx="1" weighty="1" columns="2"> + <cell> + <JPanel id="controlGraphPanel" /> + </cell> + </row> + </Table> </JDialog> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-03 11:27:39 UTC (rev 153) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-03 13:45:45 UTC (rev 154) @@ -527,17 +527,35 @@ * @param view view */ public void displayGraph(ControlView view) { - ChartService chartService = view.getContextValue(ChartService.class); + ProjectService projectService = view.getContextValue(ProjectService.class); Project project = view.getContextValue(Project.class); - JFreeChart chart = chartService.getCatchGraph(project, project.getControl()); + List<String> species = projectService.getProjectSpecies(project.getControl()); + ControlGraphDialog dialog = new ControlGraphDialog(view); - dialog.getControlGraphPanel().add(new ChartPanel(chart)); + dialog.setHandler(this); + dialog.getSpecyComboModel().setSpecy(species); + updateGraphSpecy(dialog); dialog.pack(); dialog.setLocationRelativeTo(view); dialog.setVisible(true); } /** + * Met a jour le graphique lorsque la selection de l'espece change. + * + * @param view view + */ + public void updateGraphSpecy(ControlGraphDialog view) { + ChartService chartService = view.getContextValue(ChartService.class); + Project project = view.getContextValue(Project.class); + String specyName = (String)view.getSpecyComboModel().getSelectedItem(); + JFreeChart chart = chartService.getCompareCatchLengthGraph(project, project.getControl(), specyName); + view.getControlGraphPanel().removeAll(); + view.getControlGraphPanel().add(new ChartPanel(chart)); + view.getControlGraphPanel().validate(); + } + + /** * Valide les modifications faites sur le bean actuellement edité. * * @param view view Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/SpecyComboModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/SpecyComboModel.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/SpecyComboModel.java 2010-11-03 13:45:45 UTC (rev 154) @@ -0,0 +1,97 @@ +/* + * #%L + * Coser :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.ui.control; + +import java.util.List; + +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; + +/** + * Model de selection d'especu utilise sur la dialog de graph pour + * changer l'espece sur laquelle le graphique porte. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SpecyComboModel extends AbstractListModel implements ComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4769109927915812519L; + + protected List<String> species; + + protected Object selectedItem; + + public void setSpecy(List<String> species) { + this.species = species; + selectedItem = species.get(0); + fireContentsChanged(this, 0, species.size()); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int result = 0; + if (species != null) { + result = species.size(); + } + return result; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return species.get(index); + } + + public int getIndexOf(Object o) { + return species.indexOf(o); + } + + /* + * @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object) + */ + @Override + public void setSelectedItem(Object anItem) { + this.selectedItem = anItem; + } + + /* + * @see javax.swing.ComboBoxModel#getSelectedItem() + */ + @Override + public Object getSelectedItem() { + return selectedItem; + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/SpecyComboModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-03 13:45:45 UTC (rev 154) @@ -23,6 +23,7 @@ coser.ui.control.global.done=\u2026 coser.ui.control.global.level=Type coser.ui.control.global.message=Message +coser.ui.control.graph.specy=Specy \: coser.ui.control.graphtitle=Graph coser.ui.control.replace.find=Find \: coser.ui.control.replace.inField=In field \: 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-03 11:27:39 UTC (rev 153) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-03 13:45:45 UTC (rev 154) @@ -23,6 +23,7 @@ coser.ui.control.global.done=\u2026 coser.ui.control.global.level=Type coser.ui.control.global.message=Message +coser.ui.control.graph.specy=Esp\u00E8ces \: coser.ui.control.graphtitle=Graphique coser.ui.control.replace.find=Chercher \: coser.ui.control.replace.inField=Dans le champ \:

1 0

r153 - trunk/coser-business/src/test/resources/csv/correct
by chatellier＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: chatellier Date: 2010-11-03 11:27:39 +0000 (Wed, 03 Nov 2010) New Revision: 153 Log: Convert file to uft-8 Modified: trunk/coser-business/src/test/resources/csv/correct/testreftax.csv Modified: trunk/coser-business/src/test/resources/csv/correct/testreftax.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2010-11-03 11:12:04 UTC (rev 152) +++ trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2010-11-03 11:27:39 UTC (rev 153) @@ -1,4 +1,4 @@ -"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxP�";"Taxa" +"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" "1";"000001";"1";"COSER_SPECIES1";"L'espece de test coser 1";"";"";""; "2";"000002";"2";"COSER_SPECIES2";"L'espece de test coser 2";"";"";""; "3";"000003";"3";"COSER_SPECIES3";"L'espece de test coser 3";"";"";"";

1 0

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

03 Nov '10

Author: chatellier Date: 2010-11-03 11:12:04 +0000 (Wed, 03 Nov 2010) New Revision: 152 Log: Ajout du groupement des erreurs de controle par type Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationGroup.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java Removed: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.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/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.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/control/ValidationError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-03 10:04:10 UTC (rev 151) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-03 11:12:04 UTC (rev 152) @@ -27,6 +27,7 @@ import java.io.Serializable; +import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserConstants.ValidationLevel; /** @@ -50,11 +51,14 @@ /** Message explicitant l'erreur de validation. */ protected String message; + + /** Message donnant plus de précision sur l'erreur. */ + protected String detailMessage; /** * Numero de la ligne dans le fichier CSV. * - * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + * Peut être {@code null} si l'erreur n'est pas associé à une ligne specifiques. */ protected String lineNumber; @@ -99,9 +103,27 @@ } /** + * Message donnant plus de précision sur l'erreur. + * + * @return detail message + */ + public String getDetailMessage() { + return detailMessage; + } + + /** + * Message donnant plus de précision sur l'erreur. + * + * @param detailMessage detail message + */ + public void setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + } + + /** * Numero de la ligne dans le fichier CSV. * - * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + * Peut être {@code null} si l'erreur n'est pas associé a une ligne specifiques. * * @return line number */ @@ -112,7 +134,7 @@ /** * Numero de la ligne dans le fichier CSV. * - * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + * Peut être {@code null} si l'erreur n'est pas associé a une ligne specifiques. * * @param lineNumber line number */ 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-03 11:12:04 UTC (rev 152) @@ -450,7 +450,8 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.WARNING); error.setLineNumber(lineNumber); - error.setMessage(_("coser.business.control.error.minObservationCount", key, value)); + error.setMessage(_("coser.business.control.error.minObservationCount")); + error.setDetailMessage(_("coser.business.control.error.minObservationCountDetail", key, value)); validationErrors.add(error); } } 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-03 11:12:04 UTC (rev 152) @@ -33,6 +33,7 @@ coser.business.category.strata=Stata coser.business.control.error.duplicatedLine= coser.business.control.error.minObservationCount= +coser.business.control.error.minObservationCountDetail= coser.business.control.error.noCatchNumberWithWeight= coser.business.control.step.observation= coser.business.control.step.xworks= 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-03 11:12:04 UTC (rev 152) @@ -32,7 +32,8 @@ coser.business.category.reftax.species=Reftax (esp\u00E8ce) coser.business.category.strata=Strates coser.business.control.error.duplicatedLine=Ligne en doublon -coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint (%s) \: %.2f +coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint +coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9, mais capture non pr\u00E9sente coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-03 11:12:04 UTC (rev 152) @@ -245,6 +245,10 @@ List<ValidationError> errors = get(); view.getGlobalValidationModel().setValidationErrors(errors); + // hack parce que impossible de faire un fire + // sans que les colonnes soit redimentionnées + SwingUtil.fixTableColumnWidth(view.getValidationGlobalErrorsTable(), 1, 25); + // active le bouton de sauvegarde si la liste d'erreur // ne contient pas de message d'erreur // warning, c'est ok @@ -335,7 +339,7 @@ public void showSelectedError(ControlView view, ListSelectionEvent event) { int selectedError = view.getValidationGlobalErrorsTable().getSelectedRow(); if (selectedError != -1) { - ValidationError error = view.getGlobalValidationModel().getErrorAt(selectedError); + /*ValidationError error = view.getGlobalValidationModel().getErrorAt(selectedError); String errorLineNumber = error.getLineNumber(); // peut être null, si l'erreur ne porte pas sur un bean en particulier @@ -343,7 +347,7 @@ int errorLineIndex = view.getControlDataTableModel().getRealIndexOfLine(errorLineNumber); view.getControlDataTableSelectionModel().setSelectionInterval(errorLineIndex, errorLineIndex); scrollToVisible(view.getControlDataTable(), errorLineIndex, 0); - } + }*/ } } Deleted: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-03 11:12:04 UTC (rev 152) @@ -1,105 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.ui.control; - -import static org.nuiton.i18n.I18n._; - -import java.awt.Component; - -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.table.DefaultTableCellRenderer; - -import jaxx.runtime.validator.swing.SwingValidatorUtil; -import fr.ifremer.coser.CoserConstants.ValidationLevel; - -/** - * Renderer pour le table des erreurs globales. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ControlValidationRenderer extends DefaultTableCellRenderer { - - /** serialVersionUID. */ - private static final long serialVersionUID = -6423364126451874968L; - - protected ImageIcon fatalIcon = null; - protected ImageIcon errorIcon = null; - protected ImageIcon warningIcon = null; - protected ImageIcon infoIcon = null; - - public ControlValidationRenderer() { - // use icon in jaxx - fatalIcon = SwingValidatorUtil.getFatalIcon(); - errorIcon = SwingValidatorUtil.getErrorIcon(); - warningIcon = SwingValidatorUtil.getWarningIcon(); - infoIcon = SwingValidatorUtil.getInfoIcon(); - } - - @Override - public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, boolean hasFocus, int row, int column) { - - JLabel component = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - - ImageIcon icon = null; - String text = null; - - switch (column) { - case 0: - ValidationLevel level = (ValidationLevel)value; - switch (level) { - case FATAL: - icon = fatalIcon; - break; - case ERROR: - icon = errorIcon; - break; - case WARNING: - icon = warningIcon; - break; - case INFO: - icon = infoIcon; - break; - } - break; - case 1: - String message = (String)value; - text = _(message); - break; - } - - component.setIcon(icon); - component.setText(text); - - return component; - } - - -} Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-03 11:12:04 UTC (rev 152) @@ -0,0 +1,127 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.ui.control; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Component; + +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; + +import jaxx.runtime.validator.swing.SwingValidatorUtil; +import fr.ifremer.coser.CoserConstants.ValidationLevel; +import fr.ifremer.coser.control.ValidationError; + +/** + * Renderer pour le table des erreurs globales. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ControlValidationRenderer extends DefaultTreeCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6423364126451874968L; + + protected ImageIcon fatalIcon = null; + protected ImageIcon errorIcon = null; + protected ImageIcon warningIcon = null; + protected ImageIcon infoIcon = null; + + public ControlValidationRenderer() { + // use icon in jaxx + fatalIcon = SwingValidatorUtil.getFatalIcon(); + errorIcon = SwingValidatorUtil.getErrorIcon(); + warningIcon = SwingValidatorUtil.getWarningIcon(); + infoIcon = SwingValidatorUtil.getInfoIcon(); + } + + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, + boolean sel, boolean expanded, boolean leaf, int row, + boolean hasFocus) { + + JLabel component = (JLabel)super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); + + ImageIcon icon = null; + String text = null; + + if (value instanceof GlobalValidationGroup) { + GlobalValidationGroup validationErrorGroup = (GlobalValidationGroup)value; + ValidationLevel level = validationErrorGroup.getValidationLevel(); + switch (level) { + case FATAL: + icon = fatalIcon; + break; + case ERROR: + icon = errorIcon; + break; + case WARNING: + icon = warningIcon; + break; + case INFO: + icon = infoIcon; + break; + } + + String message = validationErrorGroup.getMessage(); + text = _(message); + } + else if (value instanceof ValidationError) { + ValidationError validationError = (ValidationError)value; + ValidationLevel level = validationError.getLevel(); + switch (level) { + case FATAL: + icon = fatalIcon; + break; + case ERROR: + icon = errorIcon; + break; + case WARNING: + icon = warningIcon; + break; + case INFO: + icon = infoIcon; + break; + } + + String message = validationError.getDetailMessage(); + if (message == null) { + message = validationError.getMessage(); + } + text = _(message); + } + + component.setText(text); + component.setIcon(icon); + + return component; + } +} 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-03 11:12:04 UTC (rev 152) @@ -30,9 +30,7 @@ new jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer()); // global validation - SwingUtil.fixTableColumnWidth(validationGlobalErrorsTable, 0, 25); - validationGlobalErrorsTable.getRowSorter().setSortKeys(Arrays.asList(new RowSorter.SortKey(0, SortOrder.DESCENDING))); - validationGlobalErrorsTable.setDefaultRenderer(Object.class, new ControlValidationRenderer()); + SwingUtil.fixTableColumnWidth(validationGlobalErrorsTable, 1, 25); } ]]></script> @@ -52,7 +50,7 @@ </cell> </row> <row> - <cell fill="both" weightx="1" weighty="2" columns="2"> + <cell fill="both" weightx="1" weighty="1" columns="2"> <JScrollPane> <fr.ifremer.coser.ui.control.ControlDataTableModel id="controlDataTableModel" constructorParams="this" /> <JTable id='controlDataTable' model="{controlDataTableModel}" @@ -122,9 +120,9 @@ <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <GlobalValidationModel id="globalValidationModel" /> - <JTable id='validationGlobalErrorsTable' model="{globalValidationModel}" - autoCreateRowSorter="true" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> + <JXTreeTable id='validationGlobalErrorsTable' treeTableModel="{globalValidationModel}" + rootVisible="false" showsRootHandles="true" + treeCellRenderer="{new ControlValidationRenderer()}" /> <ListSelectionModel id="globalValidationTableSelectionModel" javaBean="validationGlobalErrorsTable.getSelectionModel()" onValueChanged="getHandler().showSelectedError(this, event)" /> Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationGroup.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationGroup.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationGroup.java 2010-11-03 11:12:04 UTC (rev 152) @@ -0,0 +1,116 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.ui.control; + +import fr.ifremer.coser.CoserConstants.ValidationLevel; + +/** + * Global validation group node. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class GlobalValidationGroup implements Comparable<GlobalValidationGroup> { + + protected ValidationLevel validationLevel; + + protected String message; + + /** + * @param validationLevel + * @param message + */ + public GlobalValidationGroup(ValidationLevel validationLevel, String message) { + super(); + this.validationLevel = validationLevel; + this.message = message; + } + + public ValidationLevel getValidationLevel() { + return validationLevel; + } + + public void setValidationLevel(ValidationLevel validationLevel) { + this.validationLevel = validationLevel; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + /* + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + @Override + public int compareTo(GlobalValidationGroup o) { + int compare = o.getValidationLevel().compareTo(validationLevel); + if (compare == 0) { + compare = o.getMessage().compareTo(message); + } + return compare; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((message == null) ? 0 : message.hashCode()); + result = prime * result + ((validationLevel == null) ? 0 : validationLevel.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + GlobalValidationGroup other = (GlobalValidationGroup) obj; + if (message == null) { + if (other.message != null) { + return false; + } + } else if (!message.equals(other.message)) { + return false; + } + if (validationLevel != other.validationLevel) { + return false; + } + return true; + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationGroup.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-03 11:12:04 UTC (rev 152) @@ -1,144 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.ui.control; - -import static org.nuiton.i18n.I18n._; - -import java.util.List; - -import javax.swing.table.AbstractTableModel; - -import fr.ifremer.coser.CoserConstants.ValidationLevel; -import fr.ifremer.coser.control.ValidationError; - -/** - * Global validation table model. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class GlobalValidationModel extends AbstractTableModel { - - /** serialVersionUID. */ - private static final long serialVersionUID = -32286733264427664L; - - protected List<ValidationError> validationErrors; - - public GlobalValidationModel() { - super(); - } - - public void setValidationErrors(List<ValidationError> validationErrors) { - this.validationErrors = validationErrors; - fireTableDataChanged(); - } - - /* - * @see javax.swing.table.TableModel#getRowCount() - */ - @Override - public int getRowCount() { - int result = 0; - if (validationErrors != null) { - result = validationErrors.size(); - } - return result; - } - - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ - @Override - public int getColumnCount() { - return 2; - } - - - @Override - public String getColumnName(int columnIndex) { - - String result = null; - - switch (columnIndex) { - case 0: - result = _("coser.ui.control.global.level"); - break; - case 1: - result = _("coser.ui.control.global.message"); - break; - } - return result; - } - - @Override - public Class<?> getColumnClass(int columnIndex) { - Class<?> result = null; - - switch (columnIndex) { - case 0: - result = ValidationLevel.class; - break; - case 1: - result = String.class; - break; - } - return result; - } - - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - - ValidationError validationError = getErrorAt(rowIndex); - - Object result = null; - - switch (columnIndex) { - case 0: - result = validationError.getLevel(); - break; - case 1: - result = validationError.getMessage(); - break; - } - return result; - } - - /** - * Get error a specified row index. - * - * @param rowIndex row index - * @return error - */ - public ValidationError getErrorAt(int rowIndex) { - ValidationError validationError = validationErrors.get(rowIndex); - return validationError; - } - -} Added: 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 (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-03 11:12:04 UTC (rev 152) @@ -0,0 +1,237 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.ui.control; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.jdesktop.swingx.treetable.AbstractTreeTableModel; + +import fr.ifremer.coser.CoserConstants.ValidationLevel; +import fr.ifremer.coser.control.ValidationError; + +/** + * Global validation table model. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class GlobalValidationModel extends AbstractTreeTableModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -32286733264427664L; + + protected List<GlobalValidationGroup> validationErrorsGroups; + protected SortedMap<GlobalValidationGroup, List<ValidationError>> validationErrorsChilds; + protected Set<ValidationError> checkedValidationErrors; + + public GlobalValidationModel() { + super(1); + } + + public void setValidationErrors(List<ValidationError> validationErrors) { + getValidationErrorAsMaps(validationErrors); + modelSupport.fireNewRoot(); + } + + /** + * Convert error list to tree structure. + * + * @param validationErrors list to convert + */ + protected void getValidationErrorAsMaps(List<ValidationError> validationErrors) { + + validationErrorsChilds = new TreeMap<GlobalValidationGroup, List<ValidationError>>(); + + for (ValidationError validationError : validationErrors) { + GlobalValidationGroup group = new GlobalValidationGroup(validationError.getLevel(), validationError.getMessage()); + + List<ValidationError> childErrors = validationErrorsChilds.get(group); + if (childErrors == null) { + childErrors = new ArrayList<ValidationError>(); + } + + childErrors.add(validationError); + validationErrorsChilds.put(group, childErrors); + } + + validationErrorsGroups = new ArrayList<GlobalValidationGroup>(validationErrorsChilds.keySet()); + Collections.sort(validationErrorsGroups); + + checkedValidationErrors = new HashSet<ValidationError>(); + } + + /* + * @see javax.swing.table.TableModel#getColumnCount() + */ + @Override + public int getColumnCount() { + return 2; + } + + + @Override + public String getColumnName(int columnIndex) { + + String result = null; + + switch (columnIndex) { + case 0: + result = _("coser.ui.control.global.message"); + break; + case 1: + result = _("coser.ui.control.global.done"); + break; + } + return result; + } + + @Override + public Class<?> getColumnClass(int columnIndex) { + Class<?> result = null; + + switch (columnIndex) { + case 0: + result = ValidationLevel.class; + break; + case 1: + result = Boolean.class; + break; + } + return result; + } + + /* + * @see org.jdesktop.swingx.treetable.TreeTableModel#getValueAt(java.lang.Object, int) + */ + @Override + public Object getValueAt(Object node, int column) { + + Object result = null; + + if (node instanceof ValidationError) { + + switch (column) { + case 0: + result = node; + break; + default: + result = checkedValidationErrors.contains(node); + break; + } + } + return result; + } + + /* + * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int) + */ + @Override + public Object getChild(Object parent, int index) { + + Object result = null; + + if (parent == getRoot()) { + result = validationErrorsGroups.get(index); + } + else if (parent instanceof GlobalValidationGroup) { + List<ValidationError> childError = validationErrorsChilds.get(parent); + result = childError.get(index); + } + + return result; + } + + /* + * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object) + */ + @Override + public int getChildCount(Object parent) { + int result = 0; + + if (parent == getRoot()) { + if (validationErrorsGroups != null) { + result = validationErrorsGroups.size(); + } + } + else if (parent instanceof GlobalValidationGroup) { + List<ValidationError> childError = validationErrorsChilds.get(parent); + result = childError.size(); + } + + return result; + } + + /* + * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) + */ + @Override + public int getIndexOfChild(Object parent, Object child) { + int result = -1; + + if (parent == getRoot()) { + result = validationErrorsGroups.indexOf(child); + } + else if (parent instanceof GlobalValidationGroup) { + List<ValidationError> childError = validationErrorsChilds.get(parent); + result = childError.indexOf(child); + } + + return result; + } + + @Override + public boolean isCellEditable(Object node, int column) { + boolean result = false; + if (column == 1) { + result = true; + } + return result; + } + + @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); + } + else { + checkedValidationErrors.remove(validationError); + } + } + } +} 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-03 11:12:04 UTC (rev 152) @@ -20,6 +20,7 @@ coser.ui.control.dataMenuLabel=Data menu coser.ui.control.dataMenuReplace=Replace in %s coser.ui.control.deleteLine=Delete line +coser.ui.control.global.done=\u2026 coser.ui.control.global.level=Type coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graph 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-03 10:04:10 UTC (rev 151) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-03 11:12:04 UTC (rev 152) @@ -20,6 +20,7 @@ coser.ui.control.dataMenuLabel=Menu des donn\u00E9es coser.ui.control.dataMenuReplace=Remplacer dans %s coser.ui.control.deleteLine=Supprimer la ligne +coser.ui.control.global.done=\u2026 coser.ui.control.global.level=Type coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graphique

1 0

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

03 Nov '10

Author: chatellier Date: 2010-11-03 10:04:10 +0000 (Wed, 03 Nov 2010) New Revision: 151 Log: Select file box don't fill correct textfield Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ProjectCreationView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ProjectCreationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ProjectCreationView.jaxx 2010-11-03 09:26:42 UTC (rev 150) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ProjectCreationView.jaxx 2010-11-03 10:04:10 UTC (rev 151) @@ -134,7 +134,7 @@ </cell> <cell> <JButton text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectInputFile(this, projectTraitsFileField)" + onActionPerformed="getHandler().selectInputFile(this, customReferenceSpeciesFileTextField)" enabled="{customReferenceCheckBox.isSelected()}"/> </cell> </row>

1 0

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

03 Nov '10

Author: chatellier Date: 2010-11-03 09:26:42 +0000 (Wed, 03 Nov 2010) New Revision: 150 Log: Fix NPE if projects directory doesn't exists 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-03 09:09:42 UTC (rev 149) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-03 09:26:42 UTC (rev 150) @@ -96,11 +96,13 @@ */ public List<String> getProjectNames() { File projectsDirectory = config.getProjectsDirectory(); + List<String> result = new ArrayList<String>(); File[] projects = projectsDirectory.listFiles(); - List<String> result = new ArrayList<String>(); - for (File existingProject : projects) { - String projectName = existingProject.getName(); - result.add(projectName); + if (projects != null) { + for (File existingProject : projects) { + String projectName = existingProject.getName(); + result.add(projectName); + } } return result; }

1 0

r149 - trunk/coser-business/src/main/java/fr/ifremer/coser/command
by chatellier＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: chatellier Date: 2010-11-03 09:09:42 +0000 (Wed, 03 Nov 2010) New Revision: 149 Log: Add command comment field Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2010-11-03 09:07:03 UTC (rev 148) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2010-11-03 09:09:42 UTC (rev 149) @@ -49,6 +49,11 @@ protected String commandUUID; /** + * Command comment. + */ + protected String comment; + + /** * UUID de la commande. Les commandes ayant un UUID commun font partie * du même groupe de commandes. * @@ -71,6 +76,24 @@ } /** + * Command comment. + * + * @return command comment + */ + public String getComment() { + return comment; + } + + /** + * Command comment. + * + * @param comment command comment + */ + public void setComment(String comment) { + this.comment = comment; + } + + /** * Do command on project. * * @param project project

1 0

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

03 Nov '10

Author: chatellier Date: 2010-11-03 09:07:03 +0000 (Wed, 03 Nov 2010) New Revision: 148 Log: Modify rsufi tab name Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-11-03 09:04:02 UTC (rev 147) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-11-03 09:07:03 UTC (rev 148) @@ -46,7 +46,7 @@ <SelectionListsView id="selectionListsView" constructorParams="this" handler="{getHandler()}" /> </tab> - <tab title="coser.ui.selection.tab.result"> + <tab title="coser.ui.selection.tab.rsufi"> <SelectionResultView id="selectionResultView" constructorParams="this" handler="{getHandler()}" /> </tab> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-03 09:04:02 UTC (rev 147) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-03 09:07:03 UTC (rev 148) @@ -75,7 +75,7 @@ coser.ui.result.otherDataFile=Other files \: coser.ui.result.resultName=Result name \: coser.ui.result.rsufiVersion=RSufi version -coser.ui.selection.allSpecies=L1 : All species +coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: coser.ui.selection.details.endDate=End date \: @@ -96,15 +96,15 @@ coser.ui.selection.fusion.title=Merge coser.ui.selection.fusionError=Merge error coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! -coser.ui.selection.maturitySpecies=L4 : Species with maturity -coser.ui.selection.occurenceDensitySpecies=L2 : Filtered species +coser.ui.selection.maturitySpecies=L4 \: Species with maturity +coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species coser.ui.selection.saveError=Save error -coser.ui.selection.sizeAllYearSpecies=L3 : Species with size all year +coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu coser.ui.selection.tab.details=Selection details coser.ui.selection.tab.lists=Species lists -coser.ui.selection.tab.result=RSufi results +coser.ui.selection.tab.rsufi=RSufi coser.ui.validation.checkData=Check data coser.ui.validators.cancel=Cancel coser.ui.validators.deleteValidator=Supprimer 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-03 09:04:02 UTC (rev 147) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-03 09:07:03 UTC (rev 148) @@ -104,7 +104,7 @@ coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection coser.ui.selection.tab.lists=Listes des esp\u00E8ces -coser.ui.selection.tab.result=Resultats RSufi +coser.ui.selection.tab.rsufi=RSufi coser.ui.validation.checkData=V\u00E9rifier les donn\u00E9es coser.ui.validators.cancel=Annuler coser.ui.validators.deleteValidator=Supprimer

1 0

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

03 Nov '10

Author: chatellier Date: 2010-11-03 09:04:02 +0000 (Wed, 03 Nov 2010) New Revision: 147 Log: Read all csv file as unicode Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-02 16:24:38 UTC (rev 146) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-03 09:04:02 UTC (rev 147) @@ -42,7 +42,7 @@ public static final char CSV_SEPARATOR_CHAR = ';'; /** CSV File encoding. */ - public static final String CSV_FILE_ENCODING = "ISO-8859-1"; + public static final String CSV_FILE_ENCODING = "UTF-8"; /** Valeur NA valide si pas de valeur. */ public static final String VALIDATION_NA = "NA";

1 0

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

02 Nov '10

Author: chatellier Date: 2010-11-02 16:24:38 +0000 (Tue, 02 Nov 2010) New Revision: 146 Log: Add graph button caption text. Add L1, L2... code in selection liste titles Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.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/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-02 16:23:57 UTC (rev 145) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-02 16:24:38 UTC (rev 146) @@ -46,7 +46,8 @@ renderer="{new fr.ifremer.coser.ui.control.ControlCategoryListRenderer()}" onActionPerformed="getHandler().categoryChanged(this, event)"/> <JSeparator /> - <JButton icon="chart_bar.png" onActionPerformed="getHandler().displayGraph(this)"/> + <JButton icon="chart_bar.png" text="coser.ui.graph.compareNumberCatchSize" + onActionPerformed="getHandler().displayGraph(this)"/> </JToolBar> </cell> </row> @@ -62,7 +63,7 @@ </cell> </row> <row> - <cell fill="both" weightx="1" weighty="3" columns="2"> + <cell fill="both" weightx="1" weighty="1"> <JScrollPane id="editionScrollPane"> <Table> <row> @@ -82,7 +83,7 @@ enabled="false" /> </cell> <cell> - <JButton id="controlDataDeleteButton" text="coser.ui.common.delete" + <JButton id="controlDataDeleteButton" text="coser.ui.control.deleteLine" onActionPerformed="getHandler().deleteData(this)" enabled="false" /> </cell> @@ -91,9 +92,7 @@ </JScrollPane> </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="2" columns="2"> + <cell fill="both" weightx="1" weighty="1"> <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' onTableChanged='saveButton.setEnabled(errorsTableModel.getRowCount()==0)'/> <fr.ifremer.coser.data.Catch id="beanCatch" javaBean="null" /> @@ -120,7 +119,7 @@ </cell> </row> <row> - <cell fill="both" weightx="1" weighty="1" columns="2"> + <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <GlobalValidationModel id="globalValidationModel" /> <JTable id='validationGlobalErrorsTable' model="{globalValidationModel}" @@ -131,6 +130,11 @@ onValueChanged="getHandler().showSelectedError(this, event)" /> </JScrollPane> </cell> + <cell fill="both" weighty="1"> + <JScrollPane> + <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> + </JScrollPane> + </cell> </row> <row> <cell anchor="center" weightx="1" fill="horizontal"> @@ -141,13 +145,6 @@ </cell> </row> <row> - <cell fill="both" weighty="1" columns="2"> - <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> - </JScrollPane> - </cell> - </row> - <row> <cell anchor="east" columns="2"> <JButton id="saveButton" text="coser.ui.control.save" enabled="false" onActionPerformed="getHandler().saveControl(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-02 16:23:57 UTC (rev 145) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-02 16:24:38 UTC (rev 146) @@ -19,6 +19,7 @@ coser.ui.control.confirmDeletionTitle=Confirm delete coser.ui.control.dataMenuLabel=Data menu coser.ui.control.dataMenuReplace=Replace in %s +coser.ui.control.deleteLine=Delete line coser.ui.control.global.level=Type coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graph @@ -29,6 +30,7 @@ coser.ui.control.save=Save coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.title=Global application error +coser.ui.graph.compareNumberCatchSize= coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais @@ -73,7 +75,7 @@ coser.ui.result.otherDataFile=Other files \: coser.ui.result.resultName=Result name \: coser.ui.result.rsufiVersion=RSufi version -coser.ui.selection.allSpecies=All species +coser.ui.selection.allSpecies=L1 : All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: coser.ui.selection.details.endDate=End date \: @@ -94,10 +96,10 @@ coser.ui.selection.fusion.title=Merge coser.ui.selection.fusionError=Merge error coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! -coser.ui.selection.maturitySpecies=Species with maturity -coser.ui.selection.occurenceDensitySpecies=Filtered species +coser.ui.selection.maturitySpecies=L4 : Species with maturity +coser.ui.selection.occurenceDensitySpecies=L2 : Filtered species coser.ui.selection.saveError=Save error -coser.ui.selection.sizeAllYearSpecies=Species with size all year +coser.ui.selection.sizeAllYearSpecies=L3 : Species with size all year coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu coser.ui.selection.tab.details=Selection details 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-02 16:23:57 UTC (rev 145) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-02 16:24:38 UTC (rev 146) @@ -19,6 +19,7 @@ coser.ui.control.confirmDeletionTitle=Confirmation de suppression coser.ui.control.dataMenuLabel=Menu des donn\u00E9es coser.ui.control.dataMenuReplace=Remplacer dans %s +coser.ui.control.deleteLine=Supprimer la ligne coser.ui.control.global.level=Type coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graphique @@ -29,6 +30,7 @@ coser.ui.control.save=Sauvegarder coser.ui.error.htmlmessage=Une erreur s'est produite \: %s coser.ui.error.title=Erreur globale +coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais @@ -73,7 +75,7 @@ coser.ui.result.otherDataFile=Autre fichiers \: coser.ui.result.resultName=Nom du r\u00E9sultat \: coser.ui.result.rsufiVersion=Version de RSufi \: -coser.ui.selection.allSpecies=Toutes les esp\u00E8ces +coser.ui.selection.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.endDate=Date de fin \: @@ -94,10 +96,10 @@ coser.ui.selection.fusion.title=Fusion coser.ui.selection.fusionError=Erreur de fusion coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! -coser.ui.selection.maturitySpecies=Esp\u00E8ces avec maturit\u00E9 -coser.ui.selection.occurenceDensitySpecies=Esp\u00E8ces filtr\u00E9es +coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 +coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es coser.ui.selection.saveError=Erreur de sauvegarde -coser.ui.selection.sizeAllYearSpecies=Esp\u00E8ces avec taille pour toutes les ann\u00E9es +coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection

1 0

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

02 Nov '10

Author: chatellier Date: 2010-11-02 16:23:57 +0000 (Tue, 02 Nov 2010) New Revision: 145 Log: Unused code Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-11-02 16:23:50 UTC (rev 144) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-11-02 16:23:57 UTC (rev 145) @@ -25,16 +25,10 @@ import static org.nuiton.i18n.I18n._; -import java.util.Iterator; - import javax.swing.table.AbstractTableModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.storage.DataStorage; /** @@ -48,12 +42,11 @@ */ public class ControlDataTableModel extends AbstractTableModel { - private static final Log log = LogFactory.getLog(ControlDataTableModel.class); - /** serialVersionUID. */ private static final long serialVersionUID = -1192463259386773117L; protected DataStorage data; + protected String[] header; public ControlDataTableModel(ControlView controlView) {

1 0