- Izi-eval-commits - mailman.cloud.codelutin.com

branch develop updated (050595b -> fb387e7)
by codelutin.com scm 20 Jan '16

20 Jan '16

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 050595b fix config new fb387e7 fixes #7565: échelle dans les graphiques 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 fb387e778334071a5d7e4ebc317b8d2ed5631bd6 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jan 20 18:41:10 2016 +0100 fixes #7565: échelle dans les graphiques Summary of changes: .../inra/masc/services/ImageGeneratorService.java | 2 +- .../fr/inra/masc/services/MascSpiderWebPlot.java | 85 +++++++++++++--------- .../src/main/java/fr/inra/masc/utils/MascUtil.java | 2 +- 3 files changed, 51 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (8cf7fde -> 050595b)
by codelutin.com scm 13 Jan '16

13 Jan '16

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 8cf7fde fix build new 050595b fix config 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 050595b4a256d8abd35d24188512e86752159147 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jan 13 14:14:20 2016 +0100 fix config Summary of changes: masc-ui/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (e6a20e0 -> 8cf7fde)
by codelutin.com scm 13 Jan '16

13 Jan '16

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 e6a20e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 8cf7fde 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 8cf7fde09ee20b09874ba27817d3c746dc4d541b Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jan 13 14:10:13 2016 +0100 fix build Summary of changes: masc-ui/src/main/assembly/bin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (0ff5978 -> e6a20e0)
by codelutin.com scm 13 Jan '16

13 Jan '16

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(a)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(a)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(a)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(a)codelutin.com> Date: Wed Jan 13 13:55:02 2016 +0100 Fix release on master commit c5921bb27a1721af4e151f5917be3e9e3b34c175 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 13 12:22:48 2016 +0100 Add .gitignore commit be496358b5c93454f9efa7ea1bd5d0bd9e5d684c Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 13 12:19:57 2016 +0100 Fix pom version on master commit 3bda27fbe83b5efbe4904785fe1938ae395e9c5a Author: Maven Release <maven-release(a)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(a)codelutin.com>.

1 7

branch release/2.1-beta-1 deleted (was 3bda27f)
by codelutin.com scm 13 Jan '16

13 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.1-beta-1 in repository izi-eval. See http://git.codelutin.com/izi-eval.git was 3bda27f [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag izi-eval-2.1-beta-1 created (now 4ca9de2)
by codelutin.com scm 13 Jan '16

13 Jan '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag izi-eval-2.1-beta-1 in repository izi-eval. See http://git.codelutin.com/izi-eval.git at 4ca9de2 (tag) tagging cae7daba0e0ace238e607dbc7b4f1bda8d549412 (commit) replaces interfacemasc-2.0.1 tagged by Maven Release on Wed Jan 13 13:55:12 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.1-beta-1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/2.1-beta-1 updated (9389167 -> 3bda27f)
by codelutin.com scm 13 Jan '16

13 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.1-beta-1 in repository izi-eval. See http://git.codelutin.com/izi-eval.git from 9389167 Fix deploy for ui adds 3bda27f [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions No new revisions were added by this update. Summary of changes: masc-api/pom.xml | 2 +- masc-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (b60ecf9 -> cae7dab)
by codelutin.com scm 13 Jan '16

13 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository izi-eval. See http://git.codelutin.com/izi-eval.git from b60ecf9 Tag release 2.0.1 adds be49635 Fix pom version on master adds c5921bb Add .gitignore adds cdd3bb2 Prepare next iteration adds 40ca88c Utilisation codelutinpom 3 adds d02f007 Ajout .gitignore adds f0c7172 Passage sur la version 3.5 et fix du build pour release adds e49099e Fix build adds f395be9 refs #7860: Update libs adds 2f44962 refs #7860: Update batik adds a525a3c refs #7860: Update codelutinpom adds 44584ee refs #7860: Update commons-collections4 adds cefddf1 Happy new year adds 96536af refs #7860: Update jgraphx adds 8a10ab5 fixes #7564: transformer .masc en .izi adds 81b3079 fixes #7732: update to dexi eval 4 adds 414ffe4 Add dexi eval path configuration adds 0595541 fixes #7560: décalage des colonnes vides adds 978274d fixes #7562: mise à jour de l'evaluation dexi eval lors de l'affichage des onglets evaluation, graphique et graphique synoptique adds 5b33e3b refs #7578: Format d'export des graphiques adds 082f99d fixes #7572 : Importer des valeurs seuils fixes #7563 : Importation de données qualitatives adds 044d8c0 fixes #7566: Conséquences suppression valeur d’un critère adds 47c9099 Fix build adds 9389167 Fix deploy for ui adds 3bda27f [jgitflow-maven-plugin]updating poms for branch'release/2.1-beta-1' with non-snapshot versions adds cae7dab Fix release on master No new revisions were added by this update. Summary of changes: .gitignore | 21 + 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 +- ....22c_DEXiPM_8-11-2010.dxi => dexi-model4.0.dxi} | 14968 ++++++++++--------- 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(+), 8081 deletions(-) create mode 100644 .gitignore copy masc-api/src/main/java/fr/inra/masc/io/parser/{ThresholdsParser.java => CsvThresholdsParser.java} (77%) copy masc-api/src/main/java/fr/inra/masc/io/writer/{ThresholdsWriter.java => CsvThresholdsWriter.java} (64%) create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java create mode 100644 masc-api/src/main/java/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java create mode 100644 masc-api/src/main/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter copy masc-api/src/test/resources/dxi/{DR2.22c_DEXiPM_8-11-2010.dxi => dexi-model4.0.dxi} (57%) delete mode 100644 masc-ui/src/main/assembly/bin/dexi/DEXi303en_setup.exe create mode 100644 masc-ui/src/main/assembly/bin/dexi/DEXi400en_setup.exe mode change 100755 => 100644 masc-ui/src/main/assembly/bin/dexi/DEXiEval -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Masc 2.1-beta-1 released
by codelutin.com Release Notification 13 Jan '16

13 Jan '16

The Masc team is pleased to announce the masc-2.1-beta-1 release! Codage de l'interface du modèle MASC d'évaluation multicritère de la durabilité de systèmes de culture innovants. Documentation of the project can be found here: https://forge.codelutin.com/projects/izi-eval/ Changes ------- Changes in this version include: New features: o décalage des colonnes vides Issue: 7560. Thanks to Frédérique Angevin. Resolved by echatellier. o Interface Izi-Eval Issue: 7559. Thanks to Frédérique Angevin. Resolved by echatellier. o transformer .masc en .izi Issue: 7564. Thanks to Frédérique Angevin. Resolved by echatellier. o Utilisation Ctrl pour sélectionner Issue: 7567. Thanks to Frédérique Angevin. Resolved by fangevin. o Recherche de critère dans l'arbre de décision Issue: 7571. Thanks to Frédérique Angevin. Resolved by fangevin. o Apparition définition critère Issue: 7573. Thanks to Frédérique Angevin. Resolved by fangevin. o Importer des valeurs seuils Issue: 7572. Thanks to Frédérique Angevin. Resolved by echatellier. o option "tout décocher" Issue: 7576. Thanks to Frédérique Angevin. Resolved by fangevin. o Format d'export des graphiques Issue: 7578. Thanks to Frédérique Angevin. Resolved by echatellier. o Mise à jour quand des modifications sont faites Issue: 7561. Thanks to Frédérique Angevin. Resolved by echatellier. Fixed Bugs: o Options non affichées sur les graphiques Issue: 7570. Thanks to Frédérique Angevin. Resolved by fangevin. o Simulations > problème d'actualisation Issue: 7568. Thanks to Frédérique Angevin. Resolved by echatellier. Changes: o Update libs Issue: 7860. Thanks to Eric Chatellier. Resolved by echatellier. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Masc team

1 0

branch release/2.1-beta-1 created (now 9389167)
by codelutin.com scm 13 Jan '16

13 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.1-beta-1 in repository izi-eval. See http://git.codelutin.com/izi-eval.git at 9389167 Fix deploy for ui No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0