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

r627 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 14:12:53 +0000 (Mon, 31 Jan 2011) New Revision: 627 Log: List projects names sorted alphabetically Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:58:48 UTC (rev 626) +++ trunk/changelog.txt 2011-01-31 14:12:53 UTC (rev 627) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * List projects names sorted alphabetically * Fix website texts * Close extract/upload view after extraction/upload * Add wait cursor in add rsufi result view 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 2011-01-31 13:58:48 UTC (rev 626) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-31 14:12:53 UTC (rev 627) @@ -118,7 +118,7 @@ } /** - * Return existing project name list. + * Return existing project name list sorted by project name. * * @return projects list */ @@ -134,6 +134,9 @@ } } } + + Collections.sort(result); + return result; }

1 0

r626 - in trunk: . coser-web/src/main/resources/fr/ifremer/coser/web
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:58:48 +0000 (Mon, 31 Jan 2011) New Revision: 626 Log: Fix website texts Modified: trunk/changelog.txt trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:52:29 UTC (rev 625) +++ trunk/changelog.txt 2011-01-31 13:58:48 UTC (rev 626) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Fix website texts * Close extract/upload view after extraction/upload * Add wait cursor in add rsufi result view * Add creation date in rsufi data extraction Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-31 13:52:29 UTC (rev 625) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-31 13:58:48 UTC (rev 626) @@ -26,9 +26,9 @@ message.com.downloadascsv=Download as CSV message.com.downloadaszip=Download as ZIP message.layout.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey -message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques -message.layout.oceanicdata1=le Syst\u00E8me d'informations scientifiques pour la mer de l'Ifremer (SISMER) -message.layout.oceanicdata2=le Syst\u00E8me d'information halieutique de l'Ifremer (SIH) +message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer +message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER) +message.layout.oceanicdata2=le Syst\u00E8me d''information halieutique de l''Ifremer (SIH) message.index.title=Home message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises. message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-01-31 13:52:29 UTC (rev 625) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-01-31 13:58:48 UTC (rev 626) @@ -26,9 +26,9 @@ message.com.title=Indices de communaut\u00E9s message.com.paragraph1=Des indices de communaut\u00E9 sont calcul\u00E9s pour un ensemble d''esp\u00E8ces dans chaque s\u00E9rie. La liste des esp\u00E8ces incluses pour le calcul de chaque indice varie selon les donn\u00E9es disponibles pour la r\u00E9alisation des calculs. message.layout.title=Indices de populations et de communaut\u00E9s issus des campagnes de surveillance halieutique de l''Ifremer -message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques -message.layout.oceanicdata1=le Syst\u00E8me d'informations scientifiques pour la mer de l'Ifremer (SISMER) -message.layout.oceanicdata2=le Syst\u00E8me d'information halieutique de l'Ifremer (SIH) +message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer +message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER) +message.layout.oceanicdata2=le Syst\u00E8me d''information halieutique de l''Ifremer (SIH) message.index.title=Accueil message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises. message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s.

1 0

r625 - in trunk: . coser-ui/src/main/java/fr/ifremer/coser/ui/result
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:52:29 +0000 (Mon, 31 Jan 2011) New Revision: 625 Log: Close extract/upload view after extraction/upload Modified: trunk/changelog.txt trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:46:18 UTC (rev 624) +++ trunk/changelog.txt 2011-01-31 13:52:29 UTC (rev 625) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Close extract/upload view after extraction/upload * Add wait cursor in add rsufi result view * Add creation date in rsufi data extraction * Name rsufi data extraction directory : RSUFI_DATA_projectname Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:46:18 UTC (rev 624) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:52:29 UTC (rev 625) @@ -197,6 +197,8 @@ JOptionPane.showMessageDialog(view, _("coser.ui.uploadresult.resultsuploaded"), _("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); } + + view.dispose(); } catch (Exception ex) { //throw new CoserException("Can't get upload status", ex); @@ -229,6 +231,7 @@ webService.performResultExtract(selectedResult, publishDataResults, extractDirectory); JOptionPane.showMessageDialog(view, _("coser.ui.uploadresult.resultsextracted"), _("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); + view.dispose(); } catch (CoserBusinessException ex) { throw new CoserException("Can't upload results", ex);

1 0

r624 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:46:18 +0000 (Mon, 31 Jan 2011) New Revision: 624 Log: Add creation date in rsufi data extraction 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 2011-01-31 13:43:04 UTC (rev 623) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-31 13:46:18 UTC (rev 624) @@ -38,6 +38,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PrintStream; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -2654,17 +2655,22 @@ // extract additionnal data file (selected species) File listSpeciesFile = new File(projectDirectory, "ListEspeces" + project.getName() + ".txt"); fillListSpeciesFile(selection, listSpeciesFile); - + // extract additionnal project information File informationFile = new File(projectDirectory, "project.txt"); PrintStream out = null; try { out = new PrintStream(new BufferedOutputStream(new FileOutputStream(informationFile))); - + out.println(_("coser.business.extract.projectName") + project.getName()); out.println(_("coser.business.extract.projectAuthor") + project.getAuthor()); out.println(_("coser.business.extract.projectComment") + project.getComment()); out.println(_("coser.business.extract.selectionName") + selection.getName()); + + // date de creation du projet + DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT, config.getLocale()); + out.println(_("coser.business.extract.creationdate") + dateFormat.format(project.getCreationDate())); + } catch (IOException ex) { throw new CoserBusinessException("Can't save project information file", ex); }

1 0

r623 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:43:04 +0000 (Mon, 31 Jan 2011) New Revision: 623 Log: Add wait cursor in add rsufi result view Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:43:00 UTC (rev 622) +++ trunk/changelog.txt 2011-01-31 13:43:04 UTC (rev 623) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Add wait cursor in add rsufi result view * Add creation date in rsufi data extraction * Name rsufi data extraction directory : RSUFI_DATA_projectname * Remember configuration window size

1 0

r622 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:43:00 +0000 (Mon, 31 Jan 2011) New Revision: 622 Log: Add wait cursor in add rsufi result view Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:39:27 UTC (rev 621) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:43:00 UTC (rev 622) @@ -1100,11 +1100,14 @@ */ public void performAddResult(SelectionAddResultDialog view) { + setWaitCursor(view); + Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); List<File> otherFiles = view.getOtherDataFileListModel().getOtherFiles(); + RSufiResult newResult = view.getRsufiResult(); try { projectService.saveRsufiResults(project, selection, newResult, otherFiles); @@ -1113,6 +1116,9 @@ JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); throw new CoserException("Can't save result", ex); } + finally { + setDefaultCursor(view); + } view.dispose(); }

1 0

r621 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:39:27 +0000 (Mon, 31 Jan 2011) New Revision: 621 Log: Add creation date in rsufi data extraction Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:39:25 UTC (rev 620) +++ trunk/changelog.txt 2011-01-31 13:39:27 UTC (rev 621) @@ -4,7 +4,8 @@ 1.0.0-beta3 ----------- - * Name rsufi extraction directory : RSUFI_DATA_projectname + * Add creation date in rsufi data extraction + * Name rsufi data extraction directory : RSUFI_DATA_projectname * Remember configuration window size * Fix LengthStruture graph bounds with null values * FileChooser opened to projectsDirectory

1 0

r620 - trunk/coser-business/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:39:25 +0000 (Mon, 31 Jan 2011) New Revision: 620 Log: Add creation date in rsufi data extraction Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 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 2011-01-31 13:31:13 UTC (rev 619) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-31 13:39:25 UTC (rev 620) @@ -66,6 +66,7 @@ coser.business.control.step.diffCatchLength=Check diff catch/length (%d%%) coser.business.control.step.observation=Checking observation number \: %s (%d%%) coser.business.control.step.xworks=Line checks \: %s (%d%%) +coser.business.extract.creationdate=Creation date \: coser.business.extract.projectAuthor=Project author \: coser.business.extract.projectComment=Project comment \: coser.business.extract.projectName=Project name \: 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 2011-01-31 13:31:13 UTC (rev 619) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-31 13:39:25 UTC (rev 620) @@ -66,6 +66,7 @@ coser.business.control.step.diffCatchLength=V\u00E9rification des diff\u00E9rences captures/taille (%d%%) coser.business.control.step.observation=V\u00E9rification du nombre d'observation \: %s (%d%%) coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) +coser.business.extract.creationdate=Date de cr\u00E9ation \: coser.business.extract.projectAuthor=Auteur du projet \: coser.business.extract.projectComment=Commentaire du projet \: coser.business.extract.projectName=Nom du project \:

1 0

r619 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:31:13 +0000 (Mon, 31 Jan 2011) New Revision: 619 Log: Nommer le dossier RSUFI_DATA_nomduprojet.... Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:31:11 UTC (rev 618) +++ trunk/changelog.txt 2011-01-31 13:31:13 UTC (rev 619) @@ -4,6 +4,10 @@ 1.0.0-beta3 ----------- + * Name rsufi extraction directory : RSUFI_DATA_projectname + * Remember configuration window size + * Fix LengthStruture graph bounds with null values + * FileChooser opened to projectsDirectory * Update jaxx to 2.3 * Update nuiton-widgets to 1.1.1 * Update nuiton-i18n to 2.2

1 0

r618 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:31:11 +0000 (Mon, 31 Jan 2011) New Revision: 618 Log: Nommer le dossier RSUFI_DATA_nomduprojet.... 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 2011-01-31 13:24:51 UTC (rev 617) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-31 13:31:11 UTC (rev 618) @@ -2631,7 +2631,8 @@ */ public File extractRSUfiData(Project project, Selection selection, File directory, boolean onlyDataTable) throws CoserBusinessException { - File projectDirectory = new File(directory, project.getName()); + // Nommer le dossier RSUFI_DATA_nomduprojet.... + File projectDirectory = new File(directory, "RSUFI_DATA_" + project.getName()); projectDirectory.mkdirs(); // extract 4 data files

1 0