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

r129 - 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/fr/ifremer/coser/data coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 11:42:24 +0000 (Fri, 29 Oct 2010) New Revision: 129 Log: Improve selection, ui controls and ui checks Removed: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-warning-validation.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.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-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 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 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-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-10-29 11:42:24 UTC (rev 129) @@ -51,7 +51,11 @@ /** Message explicitant l'erreur de validation. */ protected String message; - /** Numero de la ligne dans le fichier CSV (header non compté). */ + /** + * Numero de la ligne dans le fichier CSV. + * + * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + */ protected String lineNumber; public ValidationError() { @@ -97,6 +101,8 @@ /** * Numero de la ligne dans le fichier CSV. * + * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + * * @return line number */ public String getLineNumber() { @@ -106,6 +112,8 @@ /** * Numero de la ligne dans le fichier CSV. * + * Peut être {@code null} si l'erreur n'est pas associéa a une ligne specifiques. + * * @param lineNumber line number */ public void setLineNumber(String lineNumber) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-29 11:42:24 UTC (rev 129) @@ -432,6 +432,20 @@ */ public Selection initProjectSelection(Project project) throws CoserBusinessException { + // tout ce qui suit doit exister à ce stade + File projectsDirectory = config.getProjectsDirectory(); + String projectName = project.getName(); + File projectDirectory = new File(projectsDirectory, projectName); + File controlDirectory = new File(projectDirectory, CoserConstants.STORAGE_CONTROL_DIRECTORY); + File catchControlFile = new File(controlDirectory, Category.CATCH.getStorageFileName() + + CoserConstants.STORAGE_CONTROL_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); + + // petit test pour savoir si la validation a été validée + // et sauvée, empechant dans le cas contraire, la création d'une selection + if (!catchControlFile.exists()) { + throw new CoserBusinessException(_("coser.business.selection.noControlForSelection")); + } + // TODO echatellier 20101027 voir si on force que les // fichier de validation existe ici ou pas Deleted: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-warning-validation.xml 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-warning-validation.xml 2010-10-29 11:42:24 UTC (rev 129) @@ -1,36 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - <field name="weight"> - <field-validator type="coserDouble"> - <param name="min">0</param> - <param name="max">999</param> - <message>Weight n'est pas compris entre ${min} en ${max}</message> - </field-validator> - </field> -</validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-10-29 11:42:24 UTC (rev 129) @@ -16,7 +16,6 @@ Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential= Weight\ attribute\ is\ not\ a\ valid\ double= -Weight\ n'est\ pas\ compris\ entre\ ${min}\ en\ ${max}= Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= You\ must\ enter\ a\ campagne\ name.= @@ -26,7 +25,6 @@ You\ must\ enter\ a\ strata\ name.= You\ must\ enter\ a\ stratum\ name.= You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ sweptSurface\ name.= You\ must\ enter\ a\ trait\ name.= You\ must\ enter\ a\ year\ name.= coser.business.category.catch=Catch @@ -38,9 +36,9 @@ coser.business.control.error.minObservationCount= coser.business.control.error.noCatchNumberWithWeight= coser.business.control.step.observation= -coser.business.control.step.observation.catch= coser.business.control.step.xworks= coser.business.line=Line +coser.business.selection.noControlForSelection= coser.config.database.directory.description= coser.config.observation.nobsmin.description= coser.config.projects.directory.description= Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-29 11:42:24 UTC (rev 129) @@ -16,7 +16,6 @@ Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel Weight\ attribute\ is\ not\ a\ valid\ double= -Weight\ n'est\ pas\ compris\ entre\ ${min}\ en\ ${max}= Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. You\ must\ enter\ a\ campagne\ name.= @@ -26,7 +25,6 @@ You\ must\ enter\ a\ strata\ name.= You\ must\ enter\ a\ stratum\ name.= You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ sweptSurface\ name.= You\ must\ enter\ a\ trait\ name.= You\ must\ enter\ a\ year\ name.= coser.business.category.catch=Captures @@ -40,6 +38,7 @@ coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne +coser.business.selection.noControlForSelection=Impossible de creer une s\u00E9lection sans donn\u00E9es control\u00E9es. coser.config.database.directory.description=Emplacement de la base de campagnes de coser coser.config.observation.nobsmin.description=Nombre minimal d'observation coser.config.projects.directory.description=Emplacement des projets Coser Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-10-29 11:42:24 UTC (rev 129) @@ -40,7 +40,7 @@ </JMenu> <JMenu id='menuWindow' text="coser.ui.mainframe.menu.window" enabled="false"> - <JMenuItem text="coser.ui.mainframe.menu.window.validation" onActionPerformed="getHandler().showControlView()"/> + <JMenuItem text="coser.ui.mainframe.menu.window.control" onActionPerformed="getHandler().showControlView()"/> <SelectionsListMenuItem id="menuWindowSelectionMenuItem" text="coser.ui.mainframe.menu.window.selection" constructorParams="this" /> </JMenu> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-29 11:42:24 UTC (rev 129) @@ -395,6 +395,8 @@ }; setMainComponent(selectionView); } catch (CoserBusinessException ex) { + JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.createError"), + JOptionPane.ERROR_MESSAGE); throw new CoserException("Can't create new selection", ex); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2010-10-29 11:42:24 UTC (rev 129) @@ -29,6 +29,9 @@ 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; @@ -45,6 +48,8 @@ */ public class ControlDataTableModel extends AbstractTableModel { + private static final Log log = LogFactory.getLog(ControlDataTableModel.class); + /** serialVersionUID. */ private static final long serialVersionUID = -1192463259386773117L; @@ -140,6 +145,10 @@ } ++index; } + + if (log.isDebugEnabled()) { + log.debug("Real line for " + lineNumber + " = " + index); + } return result; } } 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-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-10-29 11:42:24 UTC (rev 129) @@ -32,6 +32,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; +import java.util.Iterator; import java.util.List; import javax.swing.JLabel; @@ -59,6 +60,7 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; +import fr.ifremer.coser.CoserConstants.ValidationLevel; import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.control.ValidationError; @@ -172,6 +174,21 @@ try { List<ValidationError> errors = get(); view.getGlobalValidationModel().setValidationErrors(errors); + + // active le bouton de sauvegarde si la liste d'erreur + // ne contient pas de message d'erreur + // warning, c'est ok + boolean errorFound = false; + Iterator<ValidationError> itError = errors.iterator(); + while (itError.hasNext() && !errorFound) { + ValidationError error = itError.next(); + if (error.getLevel() == ValidationLevel.ERROR || error.getLevel() == ValidationLevel.FATAL) { + errorFound = true; + } + } + if (!errorFound) { + view.getSaveButton().setEnabled(true); + } } catch (Exception ex) { throw new CoserException("Can't validate data", ex); } @@ -250,9 +267,13 @@ if (selectedError != -1) { ValidationError error = view.getGlobalValidationModel().getErrorAt(selectedError); String errorLineNumber = error.getLineNumber(); - int errorLineIndex = view.getControlDataTableModel().getRealIndexOfLine(errorLineNumber); - view.getControlDataTableSelectionModel().setSelectionInterval(errorLineIndex, errorLineIndex); - scrollToVisible(view.getControlDataTable(), errorLineIndex, 0); + + // peut être null, si l'erreur ne porte pas sur un bean en particulier + if (errorLineNumber != null) { + int errorLineIndex = view.getControlDataTableModel().getRealIndexOfLine(errorLineNumber); + view.getControlDataTableSelectionModel().setSelectionInterval(errorLineIndex, errorLineIndex); + scrollToVisible(view.getControlDataTable(), errorLineIndex, 0); + } } } @@ -389,6 +410,13 @@ view.getControlDataDeleteButton().setEnabled(true); } else { + + // set to all validators to clear non concerned + view.getValidatorCatch().setBean(null); + view.getValidatorHaul().setBean(null); + view.getValidatorLength().setBean(null); + view.getValidatorStrata().setBean(null); + view.getControlDataValidButton().setEnabled(false); view.getControlDataCancelButton().setEnabled(false); view.getControlDataDeleteButton().setEnabled(false); 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-10-29 11:41:17 UTC (rev 128) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-10-29 11:42:24 UTC (rev 129) @@ -149,7 +149,8 @@ </row> <row> <cell anchor="east" columns="2"> - <JButton id="saveButton" text="coser.ui.control.save" onActionPerformed="getHandler().saveControl(this)" /> + <JButton id="saveButton" text="coser.ui.control.save" enabled="false" + onActionPerformed="getHandler().saveControl(this)" /> </cell> </row> </Table>

1 0

r128 - in trunk/src/site: . rst rst/user
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 11:41:17 +0000 (Fri, 29 Oct 2010) New Revision: 128 Log: Begin doc about validation Added: trunk/src/site/rst/user/ trunk/src/site/rst/user/validation.rst Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Added: trunk/src/site/rst/user/validation.rst =================================================================== --- trunk/src/site/rst/user/validation.rst (rev 0) +++ trunk/src/site/rst/user/validation.rst 2010-10-29 11:41:17 UTC (rev 128) @@ -0,0 +1,5 @@ +Validation +========== + +Source : http://struts.apache.org/2.x/docs/validation.html + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-10-29 11:40:22 UTC (rev 127) +++ trunk/src/site/site_en.xml 2010-10-29 11:41:17 UTC (rev 128) @@ -56,7 +56,7 @@ <menu name="Documentation"> <item name="Home" href="index.html"/> <item name="User" href="user.html"> - + <item name="Validation" href="user/validation.html" /> </item> <item name="Developer" href="developer.html"> <item name="Coser Project layout" href="directory.html" /> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-10-29 11:40:22 UTC (rev 127) +++ trunk/src/site/site_fr.xml 2010-10-29 11:41:17 UTC (rev 128) @@ -58,7 +58,7 @@ <menu name="Documentation"> <item name="Accueil" href="index.html"/> <item name="Utilisateur" href="user.html"> - + <item name="Validation" href="user/validation.html" /> </item> <item name="Développeur" href="developer.html"> <item name="Coser Project layout" href="directory.html" />

1 0

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

29 Oct '10

Author: chatellier Date: 2010-10-29 11:40:22 +0000 (Fri, 29 Oct 2010) New Revision: 127 Log: Fill en i18n file Modified: 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/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-29 10:00:17 UTC (rev 126) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-29 11:40:22 UTC (rev 127) @@ -1,30 +1,29 @@ coser.config.application.version.description=Application's version -coser.config.category.main= -coser.config.category.main.description= -coser.config.config.file.description= +coser.config.category.main=Coser +coser.config.category.main.description=Main configuration +coser.config.config.file.description=Coser configuration file coser.config.locale.description=Application's locale coser.config.lookandfeel.description=Application's swing theme coser.config.support.email.description=Support email address coser.ui.common.cancel=Cancel coser.ui.common.comment=Comment -coser.ui.common.delete= -coser.ui.common.selectAll= -coser.ui.common.selectFile= -coser.ui.common.unselectAll= -coser.ui.common.valid= -coser.ui.config.title= -coser.ui.control.confirmDeletionMessage= -coser.ui.control.confirmDeletionTitle= -coser.ui.control.dataMenuLabel= -coser.ui.control.dataMenuReplace= -coser.ui.control.global.field= -coser.ui.control.global.level= -coser.ui.control.global.message= +coser.ui.common.delete=Delete +coser.ui.common.selectAll=All +coser.ui.common.selectFile=Select\u2026 +coser.ui.common.unselectAll=None +coser.ui.common.valid=Valid +coser.ui.config.title=Configuration +coser.ui.control.confirmDeletionMessage=Are you sure you want to delete this data ? +coser.ui.control.confirmDeletionTitle=Confirm delete +coser.ui.control.dataMenuLabel=Data menu +coser.ui.control.dataMenuReplace=Replace in %s +coser.ui.control.global.level=Type +coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graph -coser.ui.control.replace.find= -coser.ui.control.replace.replace= -coser.ui.control.replace.title= -coser.ui.control.save= +coser.ui.control.replace.find=Find \: +coser.ui.control.replace.replace=Replace \: +coser.ui.control.replace.title=Find and replace +coser.ui.control.save=Save coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.title=Global application error coser.ui.mainframe.menu.configuration=Configuration @@ -33,71 +32,72 @@ coser.ui.mainframe.menu.locale.uk=English coser.ui.mainframe.menu.newProject=New project coser.ui.mainframe.menu.openProject=Open project -coser.ui.mainframe.menu.options= -coser.ui.mainframe.menu.quit= -coser.ui.mainframe.menu.validators= +coser.ui.mainframe.menu.options=Options +coser.ui.mainframe.menu.quit=Quit +coser.ui.mainframe.menu.validators=Validators coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Theme coser.ui.mainframe.menu.window=Window -coser.ui.mainframe.menu.window.newSelection= -coser.ui.mainframe.menu.window.noSelection= -coser.ui.mainframe.menu.window.selection= -coser.ui.mainframe.menu.window.validation= +coser.ui.mainframe.menu.window.control=Control +coser.ui.mainframe.menu.window.newSelection=New selection +coser.ui.mainframe.menu.window.noSelection=No selection +coser.ui.mainframe.menu.window.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 -coser.ui.project.creationError= -coser.ui.project.customReferenceSpeciesFile= -coser.ui.project.lengthFile= +coser.ui.project.creationError=Creation error +coser.ui.project.customReferenceSpeciesFile=New reference file \: +coser.ui.project.lengthFile=Length file \: coser.ui.project.newProject=New project -coser.ui.project.openError= -coser.ui.project.openProject= -coser.ui.project.openProjectTitle= -coser.ui.project.project= +coser.ui.project.openError=Open error +coser.ui.project.openProject=Open +coser.ui.project.openProjectTitle=Open existing project +coser.ui.project.project=Project \: coser.ui.project.projectname=Project name \: coser.ui.project.stratesFile=Strates file \: coser.ui.project.traitsFile=Traits file \: -coser.ui.project.useCustomReferenceSpeciesFile= -coser.ui.project.usedReferenceSpeciesFile= -coser.ui.result.availableDataTitle= -coser.ui.result.extractDataButton= -coser.ui.result.extractDataLabel= -coser.ui.result.extractDataTitle= +coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file +coser.ui.project.usedReferenceSpeciesFile=Current reference file \: +coser.ui.result.availableDataTitle=Available results \: +coser.ui.result.extractDataButton=Extract +coser.ui.result.extractDataLabel=Extraction directory +coser.ui.result.extractDataTitle=Extract RSufi data coser.ui.selection.allSpecies=All species -coser.ui.selection.details.beginDate= -coser.ui.selection.details.endDate= -coser.ui.selection.details.family= -coser.ui.selection.details.gender= -coser.ui.selection.details.name= -coser.ui.selection.details.otherComment= -coser.ui.selection.details.saveSelection= -coser.ui.selection.details.species= -coser.ui.selection.details.technicalComment= -coser.ui.selection.details.zone= +coser.ui.selection.createError=Creation error +coser.ui.selection.details.beginDate=Begin date \: +coser.ui.selection.details.endDate=End date \: +coser.ui.selection.details.family=Filter by family \: +coser.ui.selection.details.gender=Filter by gender \: +coser.ui.selection.details.name=Selection name \: +coser.ui.selection.details.otherComment=Other comments +coser.ui.selection.details.saveSelection=Save selection +coser.ui.selection.details.species=Species \: +coser.ui.selection.details.technicalComment=Technical comment +coser.ui.selection.details.zone=Zone \: coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter coser.ui.selection.filter.occurrence=Occurrence \: -coser.ui.selection.fusion.comment= -coser.ui.selection.fusion.description= -coser.ui.selection.fusion.name= -coser.ui.selection.fusion.title= -coser.ui.selection.fusionError= -coser.ui.selection.invalidFusionName= +coser.ui.selection.fusion.comment=Comment +coser.ui.selection.fusion.description=Species merge. Fill new specy name with name existing in referential. +coser.ui.selection.fusion.name=New name \: +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.saveError= +coser.ui.selection.saveError=Save error coser.ui.selection.sizeAllYearSpecies=Species with size all year -coser.ui.selection.speciesMenuFusion= -coser.ui.selection.speciesMenuLabel= -coser.ui.selection.tab.details= -coser.ui.selection.tab.lists= -coser.ui.selection.tab.result= +coser.ui.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.validation.checkData=Check data -coser.ui.validators.cancel= -coser.ui.validators.deleteValidator= -coser.ui.validators.description= -coser.ui.validators.entity= -coser.ui.validators.newValidator= -coser.ui.validators.title= -coser.ui.validators.valid= -coser.ui.validators.validators= +coser.ui.validators.cancel=Cancel +coser.ui.validators.deleteValidator=Supprimer +coser.ui.validators.description=Application must be restarted after validators modification. +coser.ui.validators.entity=Entity +coser.ui.validators.newValidator=New Validator +coser.ui.validators.title=Validators +coser.ui.validators.valid=Valid +coser.ui.validators.validators=Validators \: Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-29 10:00:17 UTC (rev 126) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-29 11:40:22 UTC (rev 127) @@ -9,15 +9,14 @@ coser.ui.common.comment=Commentaire coser.ui.common.delete=Supprimer coser.ui.common.selectAll=Tous -coser.ui.common.selectFile=S\u00E9lectionner... +coser.ui.common.selectFile=S\u00E9lectionner\u2026 coser.ui.common.unselectAll=Aucun coser.ui.common.valid=Valider coser.ui.config.title=Configuration coser.ui.control.confirmDeletionMessage=\u00CAtes vous s\u00FBr de vouloir supprimer cette donn\u00E9e ? coser.ui.control.confirmDeletionTitle=Confirmation de suppression -coser.ui.control.dataMenuLabel=Menu table des donn\u00E9es +coser.ui.control.dataMenuLabel=Menu des donn\u00E9es coser.ui.control.dataMenuReplace=Remplacer dans %s -coser.ui.control.global.field=Champ coser.ui.control.global.level=Type coser.ui.control.global.message=Message coser.ui.control.graphtitle=Graphique @@ -39,10 +38,10 @@ coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainframe.menu.window=Fen\u00EAtre +coser.ui.mainframe.menu.window.control=Contr\u00F4le coser.ui.mainframe.menu.window.newSelection=Nouvelle s\u00E9lection coser.ui.mainframe.menu.window.noSelection=Aucune s\u00E9lection coser.ui.mainframe.menu.window.selection=S\u00E9lection -coser.ui.mainframe.menu.window.validation=Validation coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet @@ -64,6 +63,7 @@ coser.ui.result.extractDataLabel=Dossier d'extraction \: coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi coser.ui.selection.allSpecies=Toutes les esp\u00E8ces +coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.details.beginDate=Date de d\u00E9but \: coser.ui.selection.details.endDate=Date de fin \: coser.ui.selection.details.family=Filtrer par famille \: @@ -78,7 +78,7 @@ coser.ui.selection.filter.filter=Filtrer coser.ui.selection.filter.occurrence=Occurence \: coser.ui.selection.fusion.comment=Commentaire -coser.ui.selection.fusion.description=Fusion de deux esp\u00E8ces. Veuillez renseigner un nouveau nom pr\u00E9sent dans le r\u00E9f\u00E9rentiel. +coser.ui.selection.fusion.description=Fusion d'esp\u00E8ces. Veuillez renseigner un nouveau nom pr\u00E9sent dans le r\u00E9f\u00E9rentiel. coser.ui.selection.fusion.name=Nouveau nom \: coser.ui.selection.fusion.title=Fusion coser.ui.selection.fusionError=Erreur de fusion

1 0

r126 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 10:00:17 +0000 (Fri, 29 Oct 2010) New Revision: 126 Log: Fix tests Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 09:47:19 UTC (rev 125) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-29 10:00:17 UTC (rev 126) @@ -82,7 +82,7 @@ Catch myCatch = new Catch(); myCatch.setData(new String[]{"1", "Test survey","1999","Test trait","Test sp","NA","12"}); List<ValidationError> errors = validationService.validate(myCatch); - Assert.assertNull(errors); + Assert.assertTrue(errors.isEmpty()); } /** @@ -91,13 +91,13 @@ @Test public void test5DecimalValidation() { Haul haulBean = new Haul(); - haulBean.setData(new String[]{"1", "COSER_TEST","2010","TRAIT3","10","STR3","0.06","43.89","-1.73","115.00"}); + haulBean.setData(new String[]{"1", "COSER_TEST","2010","TRAIT3","10","STR3","0.06","43.89","1.73","115.00"}); List<ValidationError> errors = validationService.validate(haulBean); Assert.assertEquals(3, errors.size()); - haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","0.06000","43.89000","-1.73234","115.00"}); + haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","0.06000","43.89000","1.73234","115.00"}); errors = validationService.validate(haulBean); - Assert.assertNull(errors); + Assert.assertTrue(errors.isEmpty()); } /**

1 0

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

29 Oct '10

Author: chatellier Date: 2010-10-29 09:47:19 +0000 (Fri, 29 Oct 2010) New Revision: 125 Log: Gestion des erreurs d'action (xwork) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-29 08:06:11 UTC (rev 124) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-29 09:47:19 UTC (rev 125) @@ -28,6 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -35,6 +36,7 @@ import java.util.Map; import java.util.Set; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.xwork.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -121,20 +123,17 @@ * @return */ protected List<ValidationError> validate(AbstractDataEntity bean) { - List<ValidationError> result = null; + List<ValidationError> result = new ArrayList<ValidationError>();; try { // obligatoire pour les appel dans les thread et swing EDT ActionContext.setContext(context); for(ValidationLevel validationLevel : ValidationLevel.values()) { - + try { validator.validate(bean, validationLevel.getXWorkContext(), validationContext); - - if (validationContext.hasFieldErrors()) { - if (result == null) { - result = new ArrayList<ValidationError>(); - } + + if (validationContext.hasErrors()) { Map<String, List<String>> fieldErrors = validationContext.getFieldErrors(); for (List<String> errors : fieldErrors.values()) { @@ -148,14 +147,28 @@ result.add(error); } + + Collection<String> actionMessages = validationContext.getActionErrors(); + if (CollectionUtils.isNotEmpty(actionMessages)) { + ValidationError error = new ValidationError(); + String messages = StringUtils.join(actionMessages, ", "); + error.setMessage(messages); + error.setLevel(validationLevel); + + // add error line + error.setLineNumber(bean.getLine()); + + result.add(error); + } } } finally { // vidage par log level validationSupport.clearFieldErrors(); + validationSupport.clearActionErrors(); } } - + } catch (ValidationException ex) { if (log.isErrorEnabled()) { log.error("Can't validate bean", ex); @@ -163,6 +176,7 @@ } finally { validationSupport.clearFieldErrors(); + validationSupport.clearActionErrors(); } return result; }

1 0

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

29 Oct '10

Author: chatellier Date: 2010-10-29 08:06:11 +0000 (Fri, 29 Oct 2010) New Revision: 124 Log: Unused imports Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java 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-10-29 08:03:14 UTC (rev 123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java 2010-10-29 08:06:11 UTC (rev 124) @@ -25,9 +25,6 @@ package fr.ifremer.coser.services; -import java.awt.image.BufferedImage; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List;

1 0

r123 - trunk
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 08:03:14 +0000 (Fri, 29 Oct 2010) New Revision: 123 Log: Update maven pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:01:08 UTC (rev 122) +++ trunk/pom.xml 2010-10-29 08:03:14 UTC (rev 123) @@ -209,7 +209,7 @@ <scm> <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> - <developerConnection>scm:svn:svn+ssh://developpeur at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> </scm> @@ -235,7 +235,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

r122 - trunk
by chatellier＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: chatellier Date: 2010-10-29 08:01:08 +0000 (Fri, 29 Oct 2010) New Revision: 122 Log: Update maven pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-28 16:52:30 UTC (rev 121) +++ trunk/pom.xml 2010-10-29 08:01:08 UTC (rev 122) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

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

28 Oct '10

Author: chatellier Date: 2010-10-28 16:52:30 +0000 (Thu, 28 Oct 2010) New Revision: 121 Log: Correction i18n Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-28 16:44:54 UTC (rev 120) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-10-28 16:52:30 UTC (rev 121) @@ -37,7 +37,7 @@ coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint (%s) \: %.2f coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9s, mais capture non pr\u00E9sente -coser.business.control.step.observation=Verfication du nombre d'obervation (%d%%) +coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne coser.config.database.directory.description=Emplacement de la base de campagnes de coser

1 0

r120 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 28 Oct '10

28 Oct '10

Author: chatellier Date: 2010-10-28 16:44:54 +0000 (Thu, 28 Oct 2010) New Revision: 120 Log: Add chart service and first generated chart Added: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.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 Added: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java 2010-10-28 16:44:54 UTC (rev 120) @@ -0,0 +1,153 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.services; + +import java.awt.image.BufferedImage; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.NumberAxis; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.labels.StandardCategoryItemLabelGenerator; +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.data.category.DefaultCategoryDataset; + +import fr.ifremer.coser.CoserBusinessConfig; +import fr.ifremer.coser.bean.Control; +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.data.Catch; + +/** + * Validation service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ChartService { + + private static final Log log = LogFactory.getLog(ChartService.class); + + protected CoserBusinessConfig config; + + public ChartService(CoserBusinessConfig config) { + this.config = config; + } + + public JFreeChart getCatchGraph(Project project, Control control) { + + 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])) { + 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); + Double newValue = oldValue + nombreDouble; + dataForYears.put(year, newValue); + } + else { + dataForYears.put(year, nombreDouble); + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse " + nombreValue + " as double"); + } + } + } + } + + List<SortedMap<String, Double>> results = new ArrayList<SortedMap<String,Double>>(); + results.add(dataForYears); + JFreeChart chart = displayGraph(results); + return chart; + } + + protected JFreeChart displayGraph(List<SortedMap<String, Double>> results) { + + // 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()); + } + } + + CategoryAxis categoryAxis = new CategoryAxis("Année"); + categoryAxis.setCategoryMargin(0); + // label horizontaux + //categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); + ValueAxis valueAxis = new NumberAxis("Nombre"); + valueAxis.setUpperMargin(0.1); + + //XYSplineRenderer renderer = new XYSplineRenderer(); + //AreaRenderer renderer = new AreaRenderer(); + //StackedBarRenderer renderer = new StackedBarRenderer(); + + CategoryItemRenderer renderer = new AreaRenderer(); + StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); + renderer.setBaseItemLabelGenerator(itemLabelGenerator); + renderer.setBaseItemLabelsVisible(true); + + CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, renderer); + plot.setOrientation(PlotOrientation.VERTICAL); + JFreeChart chart = new JFreeChart("Captures", JFreeChart.DEFAULT_TITLE_FONT, + plot, true); + + return chart; + } +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ChartService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java (rev 0) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-10-28 16:44:54 UTC (rev 120) @@ -0,0 +1,73 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.services; + +import javax.swing.ImageIcon; +import javax.swing.JDialog; +import javax.swing.JLabel; + +import org.jfree.chart.ChartPanel; +import org.jfree.chart.JFreeChart; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.bean.Project; + +/** + * CommandService tests + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ + at Ignore +public class ChartServiceTest extends CoserTestAbstract { + + protected ProjectService projectService; + protected ChartService chartService; + + @Before + public void initService() { + projectService = new ProjectService(config); + chartService = new ChartService(config); + } + + @Test + public void testCatchChart() throws CoserBusinessException { + Project project = createTestProject(projectService); + JFreeChart chart = chartService.getCatchGraph(project, project.getControl()); + + JDialog f = new JDialog(); + f.setModal(true); + f.add(new ChartPanel(chart)); + f.pack(); + f.setVisible(true); + } +} Property changes on: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2010-10-28 16:44:32 UTC (rev 119) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2010-10-28 16:44:54 UTC (rev 120) @@ -34,6 +34,7 @@ import org.nuiton.i18n.I18n; import org.nuiton.util.ArgumentsParserException; +import fr.ifremer.coser.services.ChartService; import fr.ifremer.coser.services.ImportService; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.ValidationService; @@ -126,6 +127,7 @@ context.setContextValue(new ProjectService(coserConfig)); context.setContextValue(new ImportService(coserConfig)); context.setContextValue(new ValidationService(coserConfig)); + context.setContextValue(new ChartService(coserConfig)); CoserFrame frame = new CoserFrame(context); frame.setLocationRelativeTo(null); frame.setVisible(true); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-10-28 16:44:32 UTC (rev 119) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-10-28 16:44:54 UTC (rev 120) @@ -27,11 +27,9 @@ import static org.nuiton.i18n.I18n._; -import java.io.File; import java.util.Locale; import org.apache.commons.beanutils.ConvertUtils; -import org.nuiton.util.ApplicationConfig; import org.nuiton.util.LocaleConverter; /** 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-10-28 16:44:32 UTC (rev 119) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-10-28 16:44:54 UTC (rev 120) @@ -25,7 +25,7 @@ <JDialog title="coser.ui.control.graphtitle"> <JScrollPane> - <JXImagePanel id="controlGraphPanel" /> + <JPanel id="controlGraphPanel" /> </JScrollPane> </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-10-28 16:44:32 UTC (rev 119) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-10-28 16:44:54 UTC (rev 120) @@ -32,8 +32,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; -import java.io.File; -import java.io.IOException; import java.util.List; import javax.swing.JLabel; @@ -48,7 +46,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; -import javax.swing.table.TableColumnModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -57,6 +54,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jfree.chart.ChartPanel; +import org.jfree.chart.JFreeChart; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; @@ -68,6 +67,7 @@ import fr.ifremer.coser.data.Haul; import fr.ifremer.coser.data.Length; import fr.ifremer.coser.data.Strata; +import fr.ifremer.coser.services.ChartService; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.ValidationService; @@ -419,13 +419,17 @@ } } + /** + * Display data graph. + * + * @param view view + */ public void displayGraph(ControlView view) { + ChartService chartService = view.getContextValue(ChartService.class); + Project project = view.getContextValue(Project.class); + JFreeChart chart = chartService.getCatchGraph(project, project.getControl()); ControlGraphDialog dialog = new ControlGraphDialog(view); - try { - dialog.getControlGraphPanel().setImage(javax.imageio.ImageIO.read(new File("/home/chatellier/tmp/coser/graph.png"))); - } catch (IOException ex) { - throw new CoserException("Can't init graph", ex); - } + dialog.getControlGraphPanel().add(new ChartPanel(chart)); dialog.pack(); dialog.setLocationRelativeTo(view); dialog.setVisible(true);

1 0