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>.