branch develop updated (044d8c0 -> 47c9099)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git from 044d8c0 fixes #7566: Conséquences suppression valeur d’un critère new 47c9099 Fix build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 47c909950fb38bc11a23de61c58df6bb3a16c3ea Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jan 13 11:06:57 2016 +0100 Fix build Summary of changes: masc-api/pom.xml | 12 +++++++++++- .../inra/masc/io/parser/CsvThresholdsParser.java | 22 ++++++++++++++++++++++ masc-ui/pom.xml | 2 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../editor/threshold/ThresholdEditorHandler.java | 2 +- .../main/resources/i18n/masc-ui_en_GB.properties | 8 ++++---- .../main/resources/i18n/masc-ui_fr_FR.properties | 8 ++++---- pom.xml | 16 ++++++++++++++-- 8 files changed, 59 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git commit 47c909950fb38bc11a23de61c58df6bb3a16c3ea Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jan 13 11:06:57 2016 +0100 Fix build --- masc-api/pom.xml | 12 +++++++++++- .../inra/masc/io/parser/CsvThresholdsParser.java | 22 ++++++++++++++++++++++ masc-ui/pom.xml | 2 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../editor/threshold/ThresholdEditorHandler.java | 2 +- .../main/resources/i18n/masc-ui_en_GB.properties | 8 ++++---- .../main/resources/i18n/masc-ui_fr_FR.properties | 8 ++++---- pom.xml | 16 ++++++++++++++-- 8 files changed, 59 insertions(+), 15 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 8399c10..e7ba1a8 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1-beta-1-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> @@ -149,6 +149,16 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> </dependency> diff --git a/masc-api/src/main/java/fr/inra/masc/io/parser/CsvThresholdsParser.java b/masc-api/src/main/java/fr/inra/masc/io/parser/CsvThresholdsParser.java index db5fd52..0632a2b 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/parser/CsvThresholdsParser.java +++ b/masc-api/src/main/java/fr/inra/masc/io/parser/CsvThresholdsParser.java @@ -1,5 +1,27 @@ package fr.inra.masc.io.parser; +/* + * #%L + * Masc :: API + * %% + * Copyright (C) 2011 - 2016 Inra, Codelutin + * %% + * 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% + */ + import java.io.BufferedReader; import java.io.File; import java.io.IOException; diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 5c3098d..ddcd36e 100644 --- a/masc-ui/pom.xml +++ b/masc-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1-beta-1-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java index 08609b2..85e1952 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java @@ -68,8 +68,8 @@ public class MascUIHelper extends JAXXWidgetUtil { SVG(_("masc.file.app.image.svg"), null, _("masc.fileType.app.svg"), ".svg"), CSV(_("masc.file.app.import.csv"), null, _("masc.fileType.app.csv"), ".csv"), REPORT(null, _("masc.file.report.dialog"), _("masc.fileType.pdf"), ".pdf"), - THRESHOLD(_("masc.file.app.threshold.open"), _("masc.file.app.threashold.save"), _("masc.fileType.threshold"), ".mthreshold"), - THRESHOLDCSV(_("masc.file.app.threshold.open"), _("masc.file.app.threashold.save"), _("masc.fileType.threshold.csv"), ".csv"); + THRESHOLD(_("masc.file.app.threshold.open"), _("masc.file.app.threshold.save"), _("masc.fileType.threshold"), ".mthreshold"), + THRESHOLDCSV(_("masc.file.app.threshold.open"), _("masc.file.app.threshold.save"), _("masc.fileType.threshold.csv"), ".csv"); private String openTitle; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java index df8e30e..413f864 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java @@ -227,7 +227,7 @@ public class ThresholdEditorHandler extends MascHandler { public void exportValues() { File exportFile = MascUIHelper.saveAsFile( - ui, MascUIHelper.MascFileType.THRESHOLD.getOpenTitle(), "izi-eval", + ui, MascUIHelper.MascFileType.THRESHOLD.getSaveTitle(), "izi-eval", MascUIHelper.MascFileType.THRESHOLD, MascUIHelper.MascFileType.THRESHOLDCSV); //ExportThresholdModel model = new ExportThresholdModel(); diff --git a/masc-ui/src/main/resources/i18n/masc-ui_en_GB.properties b/masc-ui/src/main/resources/i18n/masc-ui_en_GB.properties index c2bf8cd..2590126 100644 --- a/masc-ui/src/main/resources/i18n/masc-ui_en_GB.properties +++ b/masc-ui/src/main/resources/i18n/masc-ui_en_GB.properties @@ -98,13 +98,11 @@ masc.file.app.image.dialog=Please select a image to export. masc.file.app.image.svg=Please select a SVG file. masc.file.app.import.csv=Please select a csv file. masc.file.app.r.dialog=Please select DEXi executable file. +masc.file.app.threshold.open=Open threshold file +masc.file.app.threshold.save=Save threshold file masc.file.export.dialog=Please select a file to export. masc.file.import.dialog=Please select a DEXi file. masc.file.open.dialog=Open a DEXi (*.dxi) or IZI-EVAL (*.izi) file -masc.file.app.threshold.open=Open threshold file -masc.file.app.threshold.save=Save threshold file -masc.fileType.threshold=IZI-EVAL threshold file (*.mthreshold) -masc.fileType.threshold.csv=IZI-EVAL threshold file (*.csv) masc.file.report.dialog=Please select a file to save the reports masc.file.saveAs.dialog=Save as a IZI-EVAL file masc.fileType.app.csv=CSV file (*.csv) @@ -117,6 +115,8 @@ masc.fileType.app.svg=SVG Image (*.svg) masc.fileType.dexi=DEXi file (*.dxi) masc.fileType.masc=IZI-EVAL file (*.izi) masc.fileType.pdf=PDF file (*.pdf) +masc.fileType.threshold=IZI-EVAL threshold file (*.mthreshold) +masc.fileType.threshold.csv=IZI-EVAL threshold file (*.csv) masc.footer=Criteria\: %1$s (%2$s basic, %3$s linked, %4$s aggregate) | Options\: %5$s masc.importThreshold.warning=Before importing an option with quantitative values, corresponding thresholds have to be defined. masc.importThreshold.warning.title=Threshold values must be filled before import diff --git a/masc-ui/src/main/resources/i18n/masc-ui_fr_FR.properties b/masc-ui/src/main/resources/i18n/masc-ui_fr_FR.properties index 3a0b531..33ae82f 100644 --- a/masc-ui/src/main/resources/i18n/masc-ui_fr_FR.properties +++ b/masc-ui/src/main/resources/i18n/masc-ui_fr_FR.properties @@ -98,6 +98,8 @@ masc.file.app.image.dialog=Merci de sélectionner un fichier à exporter. masc.file.app.image.svg=Merci de sélectionner un fichier SVG. masc.file.app.import.csv=Merci de sélectionner un fichier CSV. masc.file.app.r.dialog=Merci de sélectionner l'application R. +masc.file.app.threshold.open=Ouvrir un fichier de valeurs-seuils +masc.file.app.threshold.save=Exporter un fichier de valeurs-seuils masc.file.export.dialog=Merci de sélectionner un fichier à exporter. masc.file.import.dialog=Merci d'ouvrir un fichier DEXi. masc.file.open.dialog=Ouvrir un fichier DEXi (*.dxi) ou IZI-EVAL (*.izi) @@ -108,15 +110,13 @@ masc.fileType.app.dexi=Fichier exécutable (*.exe) masc.fileType.app.dexiEval=Fichier exécutable (*.exe) masc.fileType.app.jpg=Image JPEG (*.jpg) masc.fileType.app.png=Image PNG (*.png) -masc.file.app.threshold.open=Ouvrir un fichier de valeurs-seuils -masc.file.app.threshold.save=Exporter un fichier de valeurs-seuils masc.fileType.app.r=Fichier exécutable (*.exe) -masc.fileType.threshold=IZI-EVAL fichier de valeurs-seuils (*.mthreshold) -masc.fileType.threshold.csv=IZI-EVAL fichier de valeurs-seuils (*.csv) masc.fileType.app.svg=Image SVG (*.svg) masc.fileType.dexi=Fichier DEXi (*.dxi) masc.fileType.masc=Fichier IZI-EVAL (*.izi) masc.fileType.pdf=Fichier PDF (*.pdf) +masc.fileType.threshold=IZI-EVAL fichier de valeurs-seuils (*.mthreshold) +masc.fileType.threshold.csv=IZI-EVAL fichier de valeurs-seuils (*.csv) masc.footer=Critères\: %1$s (%2$s basiques, %3$s liés, %4$s agrégés) | Options\: %5$s masc.importThreshold.warning=Les valeurs-seuils doivent être renseignées avant l'import d'une option comportant des variables quantitatives pour que celles-ci soient correctement discrétisées masc.importThreshold.warning.title=Les valeurs-seuils doivent être renseignées avant l'import diff --git a/pom.xml b/pom.xml index 8bd05cb..3f46d30 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1-beta-1-SNAPSHOT</version> <packaging>pom</packaging> <name>Masc</name> @@ -66,7 +66,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <jaxxVersion>2.5.22</jaxxVersion> <swingXVersion>1.6.5-1</swingXVersion> - <jMexicoVersion>0.11.1-SNAPSHOT</jMexicoVersion> + <jMexicoVersion>0.11.1</jMexicoVersion> <batikVersion>1.8</batikVersion> <xmlApisVersion>1.3.04</xmlApisVersion> @@ -369,6 +369,18 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>${batikVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>${batikVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> <version>2.0.1</version> <scope>runtime</scope> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm