branch develop updated (0ff5978 -> e6a20e0)
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 0ff5978 [jgitflow-maven-plugin]updating poms for 2.1-beta-2-SNAPSHOT development new 25d9fd3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b60ecf9 Tag release 2.0.1 new be49635 Fix pom version on master new c5921bb Add .gitignore new 3bda27f [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions new cae7dab Fix release on master new 16b2b17 [jgitflow-maven-plugin]merging 'master' into 'develop' new e6a20e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 e6a20e0af642b58c200239c2da1e23c42a15b43b Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 16b2b17a98272088ac095365fb38223b9b42e201 Merge: 25d9fd3 cae7dab Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 25d9fd3a7e3354dcda164ab336b22fa079afeb1d Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cae7daba0e0ace238e607dbc7b4f1bda8d549412 Merge: c5921bb 3bda27f Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:02 2016 +0100 Fix release on master commit c5921bb27a1721af4e151f5917be3e9e3b34c175 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 12:22:48 2016 +0100 Add .gitignore commit be496358b5c93454f9efa7ea1bd5d0bd9e5d684c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 12:19:57 2016 +0100 Fix pom version on master commit 3bda27fbe83b5efbe4904785fe1938ae395e9c5a Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 11:50:41 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions Summary of changes: .gitignore | 4 ++++ 1 file changed, 4 insertions(+) -- 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 3bda27fbe83b5efbe4904785fe1938ae395e9c5a Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 11:50:41 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions --- masc-api/pom.xml | 2 +- masc-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index e7ba1a8..ad314dd 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-beta-1-SNAPSHOT</version> + <version>2.1-beta-1</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index e1a6454..95939db 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-beta-1-SNAPSHOT</version> + <version>2.1-beta-1</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/pom.xml b/pom.xml index 3f46d30..79aefa6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-beta-1-SNAPSHOT</version> + <version>2.1-beta-1</version> <packaging>pom</packaging> <name>Masc</name> -- 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 be496358b5c93454f9efa7ea1bd5d0bd9e5d684c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 12:19:57 2016 +0100 Fix pom version on master --- masc-api/pom.xml | 2 +- masc-ui/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 1d1b040..c2a2366 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.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index d17deb3..43dedc3 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.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>fr.inra.masc</groupId> -- 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 c5921bb27a1721af4e151f5917be3e9e3b34c175 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 12:22:48 2016 +0100 Add .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1de5659 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target \ No newline at end of file -- 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 cae7daba0e0ace238e607dbc7b4f1bda8d549412 Merge: c5921bb 3bda27f Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:02 2016 +0100 Fix release on master .gitignore | 22 +- masc-api/pom.xml | 39 +- masc-api/src/license/THIRD-PARTY.properties | 12 +- .../main/java/fr/inra/masc/ExecutorException.java | 2 +- .../src/main/java/fr/inra/masc/MascConfig.java | 6 +- .../main/java/fr/inra/masc/MascConfigOption.java | 8 +- .../java/fr/inra/masc/MascTechnicalException.java | 2 +- .../src/main/java/fr/inra/masc/MascUIModel.java | 36 +- masc-api/src/main/java/fr/inra/masc/R_SCRIPT.java | 2 +- .../main/java/fr/inra/masc/charts/ChartModel.java | 2 +- .../main/java/fr/inra/masc/io/MascXmlConstant.java | 7 +- ...esholdsParser.java => CsvThresholdsParser.java} | 55 +- .../fr/inra/masc/io/parser/DexiModelParser.java | 39 +- .../fr/inra/masc/io/parser/ThresholdsParser.java | 2 +- ...esholdsWriter.java => CsvThresholdsWriter.java} | 43 +- .../java/fr/inra/masc/io/writer/DexiXmlWriter.java | 42 +- .../fr/inra/masc/io/writer/ThresholdsWriter.java | 6 +- .../fr/inra/masc/model/ComputableCriteriaImpl.java | 2 +- .../main/java/fr/inra/masc/model/CriteriaImpl.java | 2 +- .../main/java/fr/inra/masc/model/Criterias.java | 2 +- .../fr/inra/masc/model/EditableCriteriaImpl.java | 2 +- .../main/java/fr/inra/masc/model/RScriptModel.java | 2 +- .../main/java/fr/inra/masc/model/ScaleImpl.java | 2 +- .../java/fr/inra/masc/model/ThresholdOperator.java | 2 +- .../fr/inra/masc/services/CommandLineUtils.java | 2 +- .../inra/masc/services/DexiEvalInvokerService.java | 2 +- .../fr/inra/masc/services/DexiInvokerService.java | 2 +- .../inra/masc/services/ImageGeneratorService.java | 44 +- .../fr/inra/masc/services/MascModelService.java | 2 +- .../java/fr/inra/masc/services/MascService.java | 2 +- .../fr/inra/masc/services/MascServiceContext.java | 2 +- .../fr/inra/masc/services/MascServiceFactory.java | 2 +- .../fr/inra/masc/services/MascUIModelService.java | 2 +- .../fr/inra/masc/services/RInvokerService.java | 2 +- .../inra/masc/services/ReportGeneratorService.java | 6 +- .../fr/inra/masc/services/ThresholdService.java | 48 +- .../inra/masc/synoptic/CriteriaGraphBuilder.java | 8 +- .../fr/inra/masc/synoptic/CriteriaGraphModel.java | 2 +- .../synoptic/DuplicatedLinkedCloneVisitor.java | 2 +- .../java/fr/inra/masc/synoptic/LegendItem.java | 6 +- .../java/fr/inra/masc/synoptic/SynopticModel.java | 6 +- .../java/fr/inra/masc/utils/CriteriaVisitor.java | 2 +- .../src/main/java/fr/inra/masc/utils/MascUtil.java | 6 +- .../imageio/AbstractImageIORegistryEntry.java | 167 + .../awt/image/codec/imageio/ImageIODebugUtil.java | 57 + .../image/codec/imageio/ImageIOImageWriter.java | 208 + .../codec/imageio/ImageIOJPEGImageWriter.java | 146 + .../codec/imageio/ImageIOJPEGRegistryEntry.java | 41 + .../image/codec/imageio/ImageIOPNGImageWriter.java | 35 + .../codec/imageio/ImageIOPNGRegistryEntry.java | 36 + .../codec/imageio/ImageIOTIFFImageWriter.java | 35 + .../codec/imageio/ImageIOTIFFRegistryEntry.java | 45 + .../imageio/PNGTranscoderImageIOWriteAdapter.java | 102 + .../imageio/TIFFTranscoderImageIOWriteAdapter.java | 103 + .../org.apache.batik.ext.awt.image.spi.ImageWriter | 31 + .../main/resources/i18n/masc-api_en_GB.properties | 2 +- .../main/resources/i18n/masc-api_fr_FR.properties | 2 +- masc-api/src/main/xmi/masc.zargo | Bin 11033 -> 11241 bytes .../inra/masc/services/AbstractDexiFilesTest.java | 3 +- .../fr/inra/masc/services/AbstractServiceTest.java | 2 +- .../masc/services/DexiEvalInvokerServiceTest.java | 2 +- .../inra/masc/services/DexiInvokerServiceTest.java | 2 +- .../inra/masc/services/MascModelServiceTest.java | 2 +- .../inra/masc/services/MascUIModelServiceTest.java | 2 +- .../fr/inra/masc/services/RInvokerServiceTest.java | 2 +- .../masc/services/ReportGeneratorServiceTest.java | 2 +- .../inra/masc/synoptic/CriteriaGraphModelTest.java | 2 +- masc-api/src/test/resources/dxi/dexi-model4.0.dxi | 7504 ++++++++++++++++++++ masc-ui/pom.xml | 30 +- masc-ui/src/license/THIRD-PARTY.properties | 18 +- .../src/main/assembly/bin/dexi/DEXi303en_setup.exe | Bin 1369134 -> 0 bytes .../src/main/assembly/bin/dexi/DEXi400en_setup.exe | Bin 0 -> 1618346 bytes masc-ui/src/main/assembly/bin/dexi/DEXiEval | Bin 214356 -> 215324 bytes masc-ui/src/main/assembly/bin/dexi/DEXiEval.exe | Bin 166400 -> 167424 bytes masc-ui/src/main/assembly/bin/dexi/DEXiEval.txt | 320 +- .../java/fr/inra/masc/MascApplicationContext.java | 2 +- masc-ui/src/main/java/fr/inra/masc/RunMasc.java | 2 +- .../fr/inra/masc/ui/MascDecoratorProvider.java | 2 +- .../src/main/java/fr/inra/masc/ui/MascHandler.java | 2 +- .../main/java/fr/inra/masc/ui/MascHelpBroker.java | 2 +- .../java/fr/inra/masc/ui/MascMainUIHandler.java | 66 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 55 +- .../masc/ui/content/MascTabSelectionModel.java | 2 +- .../editor/criteria/MascModelEditorHandler.java | 2 +- .../editor/ComputableCriteriaEditorHandler.java | 6 +- .../editor/criteria/editor/CriteriaUIModel.java | 2 +- .../editor/criteria/editor/ScaleUIModel.java | 2 +- .../editor/criteria/editor/WeightTableModel.java | 2 +- .../EvaluatedCriteriaEditorHandler.java | 5 +- .../evalutedCriteria/OptionValueCellRenderer.java | 2 +- .../factorValue/MascFactorValueEditorFactory.java | 6 +- .../editor/threshold/ExportThresholdModel.java | 2 +- .../editor/threshold/ImportThresholdModel.java | 2 +- .../editor/threshold/ThresholdEditorHandler.java | 40 +- .../editor/threshold/ThresholdTableModel.java | 6 +- .../content/render/CheckBoxListSelectionModel.java | 2 +- .../masc/ui/content/render/OptionsListModel.java | 2 +- .../ui/content/render/RootCriteriaListModel.java | 2 +- .../ui/content/render/SelectableOptionsModel.java | 2 +- .../ui/content/render/chart/ChartUIHandler.java | 4 +- .../r/OutputScriptFilesListCellRenderer.java | 4 +- .../content/render/r/OutputScriptFilesModel.java | 2 +- .../content/render/r/RScriptListCellRenderer.java | 2 +- .../masc/ui/content/render/r/RScriptUIHandler.java | 4 +- .../synoptic/SynopticCriteriaSelectionModel.java | 4 +- .../content/render/synoptic/SynopticUIHandler.java | 4 +- .../fr/inra/masc/ui/report/ReportUIHandler.java | 2 +- .../fr/inra/masc/ui/tree/CriteriaTreeRenderer.java | 2 +- .../ui/tree/SelectableCriteriaSelectionModel.java | 2 +- .../ui/tree/SelectableCriteriaTreeRenderer.java | 2 +- .../ui/tree/criteria/CriteriaDataProvider.java | 2 +- .../inra/masc/ui/tree/criteria/CriteriaNode.java | 8 +- .../masc/ui/tree/criteria/CriteriaNodeLoador.java | 2 +- .../masc/ui/tree/criteria/CriteriaTreeHelper.java | 6 +- .../inra/masc/ui/tree/eval/EvalCriteriaNode.java | 4 +- .../masc/ui/tree/eval/EvalCriteriaNodeLoador.java | 2 +- .../ui/tree/eval/EvalCriteriaTreeTableHelper.java | 2 +- .../fr/inra/masc/ui/widget/ImageComponent.java | 2 +- .../fr/inra/masc/ui/widget/ImageGenerator.java | 2 +- .../fr/inra/masc/ui/widget/ImagePanelHandler.java | 2 +- .../fr/inra/masc/ui/widget/ImagePanelModel.java | 2 +- .../inra/masc/ui/widget/SimpleImageGenerator.java | 4 +- .../masc/ui/widget/SimpleImagePanelHandler.java | 6 +- .../inra/masc/ui/widget/SvgImagePanelHandler.java | 32 +- .../main/resources/i18n/masc-ui_en_GB.properties | 17 +- .../main/resources/i18n/masc-ui_fr_FR.properties | 17 +- pom.xml | 237 +- 127 files changed, 9367 insertions(+), 618 deletions(-) diff --cc .gitignore index 1de5659,7219628..1a61c65 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,17 +1,21 @@@ - target ++<<<<<<< HEAD ++target ++======= + /target + /*/target + /*.ipr + /*/*.ipr + /.idea + /*.iws + /*/*.iws + /*.iml + /*/*.iml + /*~ + /*/*~ + *~ + .project + */.project + */.classpath + .settings + */.settings ++>>>>>>> refs/heads/release/2.1-beta-1 -- 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 25d9fd3a7e3354dcda164ab336b22fa079afeb1d Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- masc-api/pom.xml | 2 +- masc-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 7af6737..ad314dd 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-beta-2-SNAPSHOT</version> + <version>2.1-beta-1</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index c6abf19..95939db 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-beta-2-SNAPSHOT</version> + <version>2.1-beta-1</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/pom.xml b/pom.xml index 96ef59a..79aefa6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-beta-2-SNAPSHOT</version> + <version>2.1-beta-1</version> <packaging>pom</packaging> <name>Masc</name> -- 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 16b2b17a98272088ac095365fb38223b9b42e201 Merge: 25d9fd3 cae7dab Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .gitignore | 4 ++++ 1 file changed, 4 insertions(+) -- 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 e6a20e0af642b58c200239c2da1e23c42a15b43b Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 13:55:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- masc-api/pom.xml | 2 +- masc-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index ad314dd..7af6737 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-beta-1</version> + <version>2.1-beta-2-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 95939db..c6abf19 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-beta-1</version> + <version>2.1-beta-2-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/pom.xml b/pom.xml index 79aefa6..96ef59a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>2.1-beta-1</version> + <version>2.1-beta-2-SNAPSHOT</version> <packaging>pom</packaging> <name>Masc</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm