branch develop updated (f0c7172 -> e49099e)
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 f0c7172 Passage sur la version 3.5 et fix du build pour release new e49099e 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 e49099e3ea76bb4bf34aa1ec9886e4a852c2ae54 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jan 4 18:24:15 2016 +0100 Fix build Summary of changes: .gitignore | 8 +++++-- masc-api/pom.xml | 2 +- .../main/java/fr/inra/masc/ExecutorException.java | 2 +- .../src/main/java/fr/inra/masc/MascConfig.java | 2 +- .../main/java/fr/inra/masc/MascConfigOption.java | 2 +- .../java/fr/inra/masc/MascTechnicalException.java | 2 +- .../src/main/java/fr/inra/masc/MascUIModel.java | 2 +- 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 | 2 +- .../fr/inra/masc/io/parser/DexiModelParser.java | 2 +- .../fr/inra/masc/io/parser/ThresholdsParser.java | 2 +- .../java/fr/inra/masc/io/writer/DexiXmlWriter.java | 2 +- .../fr/inra/masc/io/writer/ThresholdsWriter.java | 2 +- .../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 | 2 +- .../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 | 2 +- .../fr/inra/masc/services/ThresholdService.java | 2 +- .../inra/masc/synoptic/CriteriaGraphBuilder.java | 4 ++-- .../fr/inra/masc/synoptic/CriteriaGraphModel.java | 2 +- .../synoptic/DuplicatedLinkedCloneVisitor.java | 2 +- .../java/fr/inra/masc/synoptic/LegendItem.java | 2 +- .../java/fr/inra/masc/synoptic/SynopticModel.java | 2 +- .../java/fr/inra/masc/utils/CriteriaVisitor.java | 2 +- .../src/main/java/fr/inra/masc/utils/MascUtil.java | 2 +- .../inra/masc/services/AbstractDexiFilesTest.java | 2 +- .../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-ui/pom.xml | 2 +- .../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 | 2 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../masc/ui/content/MascTabSelectionModel.java | 2 +- .../editor/criteria/MascModelEditorHandler.java | 2 +- .../editor/ComputableCriteriaEditorHandler.java | 2 +- .../editor/criteria/editor/CriteriaUIModel.java | 2 +- .../editor/criteria/editor/ScaleUIModel.java | 2 +- .../editor/criteria/editor/WeightTableModel.java | 2 +- .../EvaluatedCriteriaEditorHandler.java | 2 +- .../evalutedCriteria/OptionValueCellRenderer.java | 2 +- .../factorValue/MascFactorValueEditorFactory.java | 2 +- .../editor/threshold/ExportThresholdModel.java | 2 +- .../editor/threshold/ImportThresholdModel.java | 2 +- .../editor/threshold/ThresholdEditorHandler.java | 4 ++-- .../editor/threshold/ThresholdTableModel.java | 2 +- .../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 | 2 +- .../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 | 2 +- .../inra/masc/ui/widget/SvgImagePanelHandler.java | 2 +- pom.xml | 27 ++++++++++++---------- 100 files changed, 132 insertions(+), 125 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 e49099e3ea76bb4bf34aa1ec9886e4a852c2ae54 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jan 4 18:24:15 2016 +0100 Fix build --- .gitignore | 8 +++++-- masc-api/pom.xml | 2 +- .../main/java/fr/inra/masc/ExecutorException.java | 2 +- .../src/main/java/fr/inra/masc/MascConfig.java | 2 +- .../main/java/fr/inra/masc/MascConfigOption.java | 2 +- .../java/fr/inra/masc/MascTechnicalException.java | 2 +- .../src/main/java/fr/inra/masc/MascUIModel.java | 2 +- 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 | 2 +- .../fr/inra/masc/io/parser/DexiModelParser.java | 2 +- .../fr/inra/masc/io/parser/ThresholdsParser.java | 2 +- .../java/fr/inra/masc/io/writer/DexiXmlWriter.java | 2 +- .../fr/inra/masc/io/writer/ThresholdsWriter.java | 2 +- .../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 | 2 +- .../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 | 2 +- .../fr/inra/masc/services/ThresholdService.java | 2 +- .../inra/masc/synoptic/CriteriaGraphBuilder.java | 4 ++-- .../fr/inra/masc/synoptic/CriteriaGraphModel.java | 2 +- .../synoptic/DuplicatedLinkedCloneVisitor.java | 2 +- .../java/fr/inra/masc/synoptic/LegendItem.java | 2 +- .../java/fr/inra/masc/synoptic/SynopticModel.java | 2 +- .../java/fr/inra/masc/utils/CriteriaVisitor.java | 2 +- .../src/main/java/fr/inra/masc/utils/MascUtil.java | 2 +- .../inra/masc/services/AbstractDexiFilesTest.java | 2 +- .../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-ui/pom.xml | 2 +- .../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 | 2 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../masc/ui/content/MascTabSelectionModel.java | 2 +- .../editor/criteria/MascModelEditorHandler.java | 2 +- .../editor/ComputableCriteriaEditorHandler.java | 2 +- .../editor/criteria/editor/CriteriaUIModel.java | 2 +- .../editor/criteria/editor/ScaleUIModel.java | 2 +- .../editor/criteria/editor/WeightTableModel.java | 2 +- .../EvaluatedCriteriaEditorHandler.java | 2 +- .../evalutedCriteria/OptionValueCellRenderer.java | 2 +- .../factorValue/MascFactorValueEditorFactory.java | 2 +- .../editor/threshold/ExportThresholdModel.java | 2 +- .../editor/threshold/ImportThresholdModel.java | 2 +- .../editor/threshold/ThresholdEditorHandler.java | 4 ++-- .../editor/threshold/ThresholdTableModel.java | 2 +- .../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 | 2 +- .../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 | 2 +- .../inra/masc/ui/widget/SvgImagePanelHandler.java | 2 +- pom.xml | 27 ++++++++++++---------- 100 files changed, 132 insertions(+), 125 deletions(-) diff --git a/.gitignore b/.gitignore index 5236b75..7219628 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,9 @@ /*/*.iml /*~ /*/*~ -D:* -*~ \ No newline at end of file +*~ +.project +*/.project +*/.classpath +.settings +*/.settings diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 8439b69..36d76ee 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>3.5</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-api/src/main/java/fr/inra/masc/ExecutorException.java b/masc-api/src/main/java/fr/inra/masc/ExecutorException.java index 5967987..d454f8b 100644 --- a/masc-api/src/main/java/fr/inra/masc/ExecutorException.java +++ b/masc-api/src/main/java/fr/inra/masc/ExecutorException.java @@ -27,7 +27,7 @@ package fr.inra.masc; /** * Throw if executor fail, return also executor logs * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class ExecutorException extends RuntimeException { diff --git a/masc-api/src/main/java/fr/inra/masc/MascConfig.java b/masc-api/src/main/java/fr/inra/masc/MascConfig.java index 91d25e7..586ee84 100644 --- a/masc-api/src/main/java/fr/inra/masc/MascConfig.java +++ b/masc-api/src/main/java/fr/inra/masc/MascConfig.java @@ -43,7 +43,7 @@ import static org.nuiton.i18n.I18n._; /** * Masc configuration. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascConfig { diff --git a/masc-api/src/main/java/fr/inra/masc/MascConfigOption.java b/masc-api/src/main/java/fr/inra/masc/MascConfigOption.java index 91c8782..e6dd6d3 100644 --- a/masc-api/src/main/java/fr/inra/masc/MascConfigOption.java +++ b/masc-api/src/main/java/fr/inra/masc/MascConfigOption.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.n_; /** * All Masc configuration options. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public enum MascConfigOption implements ConfigOptionDef { diff --git a/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java b/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java index 95f43ce..131a742 100644 --- a/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java +++ b/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java @@ -27,7 +27,7 @@ package fr.inra.masc; /** * Masc technical exception * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascTechnicalException extends RuntimeException { diff --git a/masc-api/src/main/java/fr/inra/masc/MascUIModel.java b/masc-api/src/main/java/fr/inra/masc/MascUIModel.java index e2e43a6..d2d07a2 100644 --- a/masc-api/src/main/java/fr/inra/masc/MascUIModel.java +++ b/masc-api/src/main/java/fr/inra/masc/MascUIModel.java @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n._; /** * Model for masc application * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascUIModel extends AbstractSerializableBean { diff --git a/masc-api/src/main/java/fr/inra/masc/R_SCRIPT.java b/masc-api/src/main/java/fr/inra/masc/R_SCRIPT.java index bf7d613..654d775 100644 --- a/masc-api/src/main/java/fr/inra/masc/R_SCRIPT.java +++ b/masc-api/src/main/java/fr/inra/masc/R_SCRIPT.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Regroup all MASC R scripts * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.5 */ public enum R_SCRIPT { diff --git a/masc-api/src/main/java/fr/inra/masc/charts/ChartModel.java b/masc-api/src/main/java/fr/inra/masc/charts/ChartModel.java index f7893b2..ee6d78f 100644 --- a/masc-api/src/main/java/fr/inra/masc/charts/ChartModel.java +++ b/masc-api/src/main/java/fr/inra/masc/charts/ChartModel.java @@ -33,7 +33,7 @@ import java.util.List; /** * Regroup all informations to generate chart * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.3 */ public class ChartModel extends AbstractSerializableBean { diff --git a/masc-api/src/main/java/fr/inra/masc/io/MascXmlConstant.java b/masc-api/src/main/java/fr/inra/masc/io/MascXmlConstant.java index 6230963..2aa3a83 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/MascXmlConstant.java +++ b/masc-api/src/main/java/fr/inra/masc/io/MascXmlConstant.java @@ -34,7 +34,7 @@ import fr.inra.masc.model.ScaleValue; /** * Regroup all masc xml constants tags * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public interface MascXmlConstant { diff --git a/masc-api/src/main/java/fr/inra/masc/io/parser/DexiModelParser.java b/masc-api/src/main/java/fr/inra/masc/io/parser/DexiModelParser.java index 5aeac03..1c3bc38 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/parser/DexiModelParser.java +++ b/masc-api/src/main/java/fr/inra/masc/io/parser/DexiModelParser.java @@ -64,7 +64,7 @@ import java.util.Map; /** * Parser for DEXi file, build a {@link MascModel} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiModelParser extends XmlParser<MascModel> implements MascXmlConstant { diff --git a/masc-api/src/main/java/fr/inra/masc/io/parser/ThresholdsParser.java b/masc-api/src/main/java/fr/inra/masc/io/parser/ThresholdsParser.java index ca0970d..d384189 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/parser/ThresholdsParser.java +++ b/masc-api/src/main/java/fr/inra/masc/io/parser/ThresholdsParser.java @@ -41,7 +41,7 @@ import org.apache.commons.io.IOUtils; /** * To load thresholds from a file. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ThresholdsParser { diff --git a/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java index 672024f..d9d056f 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java @@ -54,7 +54,7 @@ import fr.reseaumexico.model.writer.XmlWriter; /** * Writer to create DEXi file with {@link MascModel} model * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiXmlWriter extends XmlWriter<MascModel> implements MascXmlConstant { diff --git a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java index 6d50007..4f742cf 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java @@ -39,7 +39,7 @@ import org.apache.commons.lang3.StringUtils; /** * To export in a file thresholds. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ThresholdsWriter { diff --git a/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java b/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java index ad24aa7..9f26e5f 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java +++ b/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java @@ -25,7 +25,7 @@ package fr.inra.masc.model; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class ComputableCriteriaImpl extends ComputableCriteria { private static final long serialVersionUID = 1L; diff --git a/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java b/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java index 23a4f10..b387d20 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java +++ b/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.UUID; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public abstract class CriteriaImpl extends Criteria { diff --git a/masc-api/src/main/java/fr/inra/masc/model/Criterias.java b/masc-api/src/main/java/fr/inra/masc/model/Criterias.java index 60b4262..f0fbe06 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/Criterias.java +++ b/masc-api/src/main/java/fr/inra/masc/model/Criterias.java @@ -31,7 +31,7 @@ import com.google.common.collect.Multimaps; /** * Criteria utilisies * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class Criterias { diff --git a/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java b/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java index 68a2270..8ba4431 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java +++ b/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java @@ -28,7 +28,7 @@ import com.google.common.collect.Lists; import java.util.List; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class EditableCriteriaImpl extends EditableCriteria { private static final long serialVersionUID = 1L; diff --git a/masc-api/src/main/java/fr/inra/masc/model/RScriptModel.java b/masc-api/src/main/java/fr/inra/masc/model/RScriptModel.java index bea73f4..b508d30 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/RScriptModel.java +++ b/masc-api/src/main/java/fr/inra/masc/model/RScriptModel.java @@ -38,7 +38,7 @@ import java.util.List; /** * Represent all properties to launch a R script. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.5 */ public class RScriptModel extends AbstractSerializableBean { diff --git a/masc-api/src/main/java/fr/inra/masc/model/ScaleImpl.java b/masc-api/src/main/java/fr/inra/masc/model/ScaleImpl.java index 1c1298c..bb9eb14 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/ScaleImpl.java +++ b/masc-api/src/main/java/fr/inra/masc/model/ScaleImpl.java @@ -34,7 +34,7 @@ import java.util.List; /** * Object used to render {@link ScaleValue} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class ScaleImpl extends Scale { diff --git a/masc-api/src/main/java/fr/inra/masc/model/ThresholdOperator.java b/masc-api/src/main/java/fr/inra/masc/model/ThresholdOperator.java index 6247ecb..f6fa2ea 100644 --- a/masc-api/src/main/java/fr/inra/masc/model/ThresholdOperator.java +++ b/masc-api/src/main/java/fr/inra/masc/model/ThresholdOperator.java @@ -27,7 +27,7 @@ package fr.inra.masc.model; /** * Operator on a {@link ThresholdValue}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public enum ThresholdOperator { diff --git a/masc-api/src/main/java/fr/inra/masc/services/CommandLineUtils.java b/masc-api/src/main/java/fr/inra/masc/services/CommandLineUtils.java index 9efa39e..88c3dba 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/CommandLineUtils.java +++ b/masc-api/src/main/java/fr/inra/masc/services/CommandLineUtils.java @@ -37,7 +37,7 @@ import java.io.IOException; /** * Utils method around a command line execution. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class CommandLineUtils { diff --git a/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java b/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java index acc0200..718b4a4 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java @@ -54,7 +54,7 @@ import fr.inra.masc.utils.MascUtil; /** * Service used to invoke DEXi Eval * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiEvalInvokerService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java b/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java index e01d0a7..9e55a7f 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java @@ -34,7 +34,7 @@ import java.io.File; /** * Service used to invoke DEXi * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiInvokerService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java b/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java index f85867b..d70a75e 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java @@ -78,7 +78,7 @@ import org.w3c.dom.svg.SVGDocument; /** * Service used to generate {@link JFreeChart} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class ImageGeneratorService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/MascModelService.java b/masc-api/src/main/java/fr/inra/masc/services/MascModelService.java index fb4eec4..68718c5 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/MascModelService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/MascModelService.java @@ -84,7 +84,7 @@ import java.util.Map; /** * Service to import and export masc model. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class MascModelService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/MascService.java b/masc-api/src/main/java/fr/inra/masc/services/MascService.java index f161570..4ba352f 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/MascService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/MascService.java @@ -32,7 +32,7 @@ import java.io.File; * Contract to place on each Masc service to push the {@code serviceContext} * inside the service. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @see MascServiceContext * @since 0.1 */ diff --git a/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java b/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java index 641d520..73b5794 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java +++ b/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java @@ -31,7 +31,7 @@ import fr.inra.masc.MascConfig; * Objects provided may be injected in services returned by * {@link MascServiceFactory#newService(Class, MascServiceContext)} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascServiceContext { diff --git a/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java b/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java index e014252..9d666fc 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java +++ b/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java @@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException; /** * Factory of services. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascServiceFactory { diff --git a/masc-api/src/main/java/fr/inra/masc/services/MascUIModelService.java b/masc-api/src/main/java/fr/inra/masc/services/MascUIModelService.java index 956607c..e2bfefc 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/MascUIModelService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/MascUIModelService.java @@ -48,7 +48,7 @@ import org.w3c.dom.svg.SVGDocument; /** * Service to persist, load {@link MascUIModel}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class MascUIModelService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/RInvokerService.java b/masc-api/src/main/java/fr/inra/masc/services/RInvokerService.java index 07551a3..7c96ea0 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/RInvokerService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/RInvokerService.java @@ -50,7 +50,7 @@ import java.util.Collection; /** * Service used to execute R scripts * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.5 */ public class RInvokerService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java b/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java index 91903cc..7d0db89 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java @@ -70,7 +70,7 @@ import freemarker.template.TemplateModelException; /** * Service to generate PDF reports * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class ReportGeneratorService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java index 08b2ba7..af9e69d 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java @@ -50,7 +50,7 @@ import java.util.Set; /** * Service to import/export thresholds. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class ThresholdService extends MascService { diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java index dbe95d1..fce0d54 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java @@ -58,8 +58,8 @@ import fr.inra.masc.utils.MascUtil; /** * Used to build Masc {@link mxGraph} version 2. * - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class CriteriaGraphBuilder { diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphModel.java b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphModel.java index 542a9db..d46ad50 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphModel.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphModel.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Model of a criteria graph. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class CriteriaGraphModel { diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/DuplicatedLinkedCloneVisitor.java b/masc-api/src/main/java/fr/inra/masc/synoptic/DuplicatedLinkedCloneVisitor.java index f61ef21..a532c90 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/DuplicatedLinkedCloneVisitor.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/DuplicatedLinkedCloneVisitor.java @@ -40,7 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class DuplicatedLinkedCloneVisitor implements CriteriaVisitor { diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java index 19fb766..f716919 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java @@ -35,7 +35,7 @@ import java.util.List; /** * Represent a legend line * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.2 */ public class LegendItem extends AbstractSerializableBean { diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java index 9727a13..7410f20 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java @@ -36,7 +36,7 @@ import java.util.List; /** * Regroup all properties to generate a synaptic graph. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.2 */ public class SynopticModel extends AbstractSerializableBean { diff --git a/masc-api/src/main/java/fr/inra/masc/utils/CriteriaVisitor.java b/masc-api/src/main/java/fr/inra/masc/utils/CriteriaVisitor.java index b453ba7..24f5bbd 100644 --- a/masc-api/src/main/java/fr/inra/masc/utils/CriteriaVisitor.java +++ b/masc-api/src/main/java/fr/inra/masc/utils/CriteriaVisitor.java @@ -27,7 +27,7 @@ package fr.inra.masc.utils; import fr.inra.masc.model.Criteria; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public interface CriteriaVisitor { diff --git a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java index c74638b..380479c 100644 --- a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java +++ b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java @@ -68,7 +68,7 @@ import fr.reseaumexico.model.Scenario; /** * Regroup all masc utility methods * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascUtil { diff --git a/masc-api/src/test/java/fr/inra/masc/services/AbstractDexiFilesTest.java b/masc-api/src/test/java/fr/inra/masc/services/AbstractDexiFilesTest.java index 2faf41a..d13c1a8 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/AbstractDexiFilesTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/AbstractDexiFilesTest.java @@ -38,7 +38,7 @@ import java.util.List; /** * Tests over dexi files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ @RunWith(Parameterized.class) diff --git a/masc-api/src/test/java/fr/inra/masc/services/AbstractServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/AbstractServiceTest.java index e97d443..e9f5896 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/AbstractServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/AbstractServiceTest.java @@ -40,7 +40,7 @@ import java.io.File; import java.io.IOException; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public abstract class AbstractServiceTest extends Assert { diff --git a/masc-api/src/test/java/fr/inra/masc/services/DexiEvalInvokerServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/DexiEvalInvokerServiceTest.java index dc569dd..67f60f7 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/DexiEvalInvokerServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/DexiEvalInvokerServiceTest.java @@ -35,7 +35,7 @@ import java.io.File; import java.io.IOException; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiEvalInvokerServiceTest extends AbstractDexiFilesTest { diff --git a/masc-api/src/test/java/fr/inra/masc/services/DexiInvokerServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/DexiInvokerServiceTest.java index 5b0b6a3..58738fd 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/DexiInvokerServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/DexiInvokerServiceTest.java @@ -33,7 +33,7 @@ import java.io.File; import java.io.IOException; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class DexiInvokerServiceTest extends AbstractDexiFilesTest { diff --git a/masc-api/src/test/java/fr/inra/masc/services/MascModelServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/MascModelServiceTest.java index ed20164..c5781aa 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/MascModelServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/MascModelServiceTest.java @@ -41,7 +41,7 @@ import java.io.File; import java.util.Collection; import java.util.List; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class MascModelServiceTest extends AbstractDexiFilesTest { /** Logger. */ diff --git a/masc-api/src/test/java/fr/inra/masc/services/MascUIModelServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/MascUIModelServiceTest.java index 4dac3df..3fef58a 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/MascUIModelServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/MascUIModelServiceTest.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.3 */ public class MascUIModelServiceTest extends AbstractDexiFilesTest { diff --git a/masc-api/src/test/java/fr/inra/masc/services/RInvokerServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/RInvokerServiceTest.java index c1d5d78..bf22fa6 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/RInvokerServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/RInvokerServiceTest.java @@ -41,7 +41,7 @@ import java.util.Arrays; import java.util.List; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.5 */ public class RInvokerServiceTest extends AbstractDexiFilesTest { diff --git a/masc-api/src/test/java/fr/inra/masc/services/ReportGeneratorServiceTest.java b/masc-api/src/test/java/fr/inra/masc/services/ReportGeneratorServiceTest.java index 3ec5cb5..aaaa9c9 100644 --- a/masc-api/src/test/java/fr/inra/masc/services/ReportGeneratorServiceTest.java +++ b/masc-api/src/test/java/fr/inra/masc/services/ReportGeneratorServiceTest.java @@ -45,7 +45,7 @@ import org.junit.Test; import org.w3c.dom.svg.SVGDocument; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class ReportGeneratorServiceTest extends AbstractDexiFilesTest { diff --git a/masc-api/src/test/java/fr/inra/masc/synoptic/CriteriaGraphModelTest.java b/masc-api/src/test/java/fr/inra/masc/synoptic/CriteriaGraphModelTest.java index b125a58..c15a5ce 100644 --- a/masc-api/src/test/java/fr/inra/masc/synoptic/CriteriaGraphModelTest.java +++ b/masc-api/src/test/java/fr/inra/masc/synoptic/CriteriaGraphModelTest.java @@ -44,7 +44,7 @@ import org.nuiton.util.FileUtil; /** * To test the {@link CriteriaGraphModel}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class CriteriaGraphModelTest { diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 02988d8..3dec08a 100644 --- a/masc-ui/pom.xml +++ b/masc-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>3.5</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.inra.masc</groupId> diff --git a/masc-ui/src/main/java/fr/inra/masc/MascApplicationContext.java b/masc-ui/src/main/java/fr/inra/masc/MascApplicationContext.java index 25ffaa2..ddeb9cc 100644 --- a/masc-ui/src/main/java/fr/inra/masc/MascApplicationContext.java +++ b/masc-ui/src/main/java/fr/inra/masc/MascApplicationContext.java @@ -38,7 +38,7 @@ import java.util.Properties; /** * Context of masc application * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascApplicationContext { diff --git a/masc-ui/src/main/java/fr/inra/masc/RunMasc.java b/masc-ui/src/main/java/fr/inra/masc/RunMasc.java index 8f226f3..a490861 100644 --- a/masc-ui/src/main/java/fr/inra/masc/RunMasc.java +++ b/masc-ui/src/main/java/fr/inra/masc/RunMasc.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n_; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class RunMasc { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascDecoratorProvider.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascDecoratorProvider.java index dfa506f..e48da27 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascDecoratorProvider.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascDecoratorProvider.java @@ -30,7 +30,7 @@ import fr.inra.masc.model.ScaleValue; import org.nuiton.util.decorator.DecoratorProvider; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class MascDecoratorProvider extends DecoratorProvider { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascHandler.java index 32ec23d..7fe97fa 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascHandler.java @@ -44,7 +44,7 @@ import java.io.IOException; import static org.nuiton.i18n.I18n._; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public abstract class MascHandler { /** Logger. */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascHelpBroker.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascHelpBroker.java index 376f86f..ee17bf1 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascHelpBroker.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascHelpBroker.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class MascHelpBroker extends JAXXHelpBroker { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java index c17b961..e315e83 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java @@ -94,7 +94,7 @@ import fr.reseaumexico.model.event.InputDesignScenarioListener; /** * Handler of main UI * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class MascMainUIHandler extends MascHandler /*implements JAXXHelpUIHandler*/ { 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 6934826..9908b66 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 @@ -50,7 +50,7 @@ import org.nuiton.util.decorator.Decorator; import static org.nuiton.i18n.I18n._; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class MascUIHelper extends JAXXWidgetUtil { // TODO sletellier 20120208 : put selected directory in config @@ -157,7 +157,7 @@ public class MascUIHelper extends JAXXWidgetUtil { /** * Convinient method to process more than one binding on a JAXX ui. - * <p/> + * * TODO Move this to JAXXUtil * * @param src the ui to treate diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/MascTabSelectionModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/MascTabSelectionModel.java index ef6b781..e312173 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/MascTabSelectionModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/MascTabSelectionModel.java @@ -26,7 +26,7 @@ package fr.inra.masc.ui.content; import javax.swing.DefaultSingleSelectionModel; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class MascTabSelectionModel extends DefaultSingleSelectionModel { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/MascModelEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/MascModelEditorHandler.java index 97ad174..d5b64b2 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/MascModelEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/MascModelEditorHandler.java @@ -45,7 +45,7 @@ import javax.swing.tree.TreeSelectionModel; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class MascModelEditorHandler extends MascHandler { /** Logger */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java index b70f8cd..f4193ba 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java @@ -64,7 +64,7 @@ import fr.inra.masc.utils.MascUtil; /** * Handler of the {@link ComputableCriteriaEditor} ui. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.7 */ public class ComputableCriteriaEditorHandler extends MascHandler { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/CriteriaUIModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/CriteriaUIModel.java index 30d9c15..b86781a 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/CriteriaUIModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/CriteriaUIModel.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CriteriaUIModel<E extends Criteria> extends AbstractSerializableBean { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ScaleUIModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ScaleUIModel.java index 01cfa5a..8da7529 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ScaleUIModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ScaleUIModel.java @@ -37,7 +37,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class ScaleUIModel extends AbstractListModel implements MutableComboBoxModel { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/WeightTableModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/WeightTableModel.java index c7d68de..67cf5db 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/WeightTableModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/WeightTableModel.java @@ -38,7 +38,7 @@ import static org.nuiton.i18n.I18n._; /** * Model used to display child criteria weight * - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 1.3 */ public class WeightTableModel extends AbstractTableModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/EvaluatedCriteriaEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/EvaluatedCriteriaEditorHandler.java index d294b9a..236842d 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/EvaluatedCriteriaEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/EvaluatedCriteriaEditorHandler.java @@ -45,7 +45,7 @@ import org.jdesktop.swingx.JXTreeTable; import static org.nuiton.i18n.I18n._; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class EvaluatedCriteriaEditorHandler extends MascHandler { /** Logger. */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/OptionValueCellRenderer.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/OptionValueCellRenderer.java index 61e7577..d98c89c 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/OptionValueCellRenderer.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/evalutedCriteria/OptionValueCellRenderer.java @@ -42,7 +42,7 @@ import org.jdesktop.swingx.decorator.AbstractHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class OptionValueCellRenderer extends AbstractHighlighter implements TableCellRenderer { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java index 7c51d1a..85b95fc 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java @@ -47,7 +47,7 @@ import javax.swing.ListCellRenderer; import org.apache.commons.collections.CollectionUtils; import org.jdesktop.swingx.renderer.DefaultListRenderer; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class MascFactorValueEditorFactory extends FactorValueEditorFactory { protected Map<Factor, FactorValueCellRenderer> rendererCache = Maps.newHashMap(); diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ExportThresholdModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ExportThresholdModel.java index 7b2c9c0..e6337a9 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ExportThresholdModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ExportThresholdModel.java @@ -30,7 +30,7 @@ import java.io.File; /** * Exort threshold model. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ExportThresholdModel extends AbstractSerializableBean { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ImportThresholdModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ImportThresholdModel.java index 7d9c1ba..7cf2be9 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ImportThresholdModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ImportThresholdModel.java @@ -30,7 +30,7 @@ import java.io.File; /** * Exort threshold model. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ImportThresholdModel extends AbstractSerializableBean { 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 b876706..8e02e22 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 @@ -66,7 +66,7 @@ import fr.inra.masc.utils.MascUtil; /** * Handler of {@link ThresholdEditor}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public class ThresholdEditorHandler extends MascHandler { @@ -378,7 +378,7 @@ public class ThresholdEditorHandler extends MascHandler { } /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.3 */ public static class ThresholdTableCellRenderer extends JTextField implements TableCellRenderer { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java index 80e6141..82b7f07 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java @@ -50,7 +50,7 @@ import java.util.regex.Pattern; import static org.nuiton.i18n.I18n._; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.3 */ public class ThresholdTableModel extends AbstractTableModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/CheckBoxListSelectionModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/CheckBoxListSelectionModel.java index a182abd..644f958 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/CheckBoxListSelectionModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/CheckBoxListSelectionModel.java @@ -26,7 +26,7 @@ package fr.inra.masc.ui.content.render; import javax.swing.DefaultListSelectionModel; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CheckBoxListSelectionModel extends DefaultListSelectionModel { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/OptionsListModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/OptionsListModel.java index df07e7f..69aa598 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/OptionsListModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/OptionsListModel.java @@ -35,7 +35,7 @@ import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class OptionsListModel extends AbstractListModel implements ComboBoxModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/RootCriteriaListModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/RootCriteriaListModel.java index 59dfb48..4325aea 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/RootCriteriaListModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/RootCriteriaListModel.java @@ -32,7 +32,7 @@ import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 1.3 */ public class RootCriteriaListModel extends AbstractListModel implements ComboBoxModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/SelectableOptionsModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/SelectableOptionsModel.java index c72dca2..f36abdd 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/SelectableOptionsModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/SelectableOptionsModel.java @@ -31,7 +31,7 @@ import javax.swing.JList; import javax.swing.ListCellRenderer; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class SelectableOptionsModel extends OptionsListModel implements ListCellRenderer { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/chart/ChartUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/chart/ChartUIHandler.java index d5d441f..c1e0f9c 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/chart/ChartUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/chart/ChartUIHandler.java @@ -69,8 +69,8 @@ import fr.inra.masc.ui.widget.ImageGenerator; import fr.inra.masc.utils.MascUtil; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ public class ChartUIHandler extends MascHandler { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesListCellRenderer.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesListCellRenderer.java index 7b04be9..523e14f 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesListCellRenderer.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesListCellRenderer.java @@ -32,8 +32,8 @@ import java.awt.Component; import static org.nuiton.i18n.I18n._; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.5 */ public class OutputScriptFilesListCellRenderer implements ListCellRenderer { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesModel.java index 8b22043..6026ef2 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/OutputScriptFilesModel.java @@ -31,7 +31,7 @@ import javax.swing.AbstractListModel; import java.util.List; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.5 */ public class OutputScriptFilesModel extends AbstractListModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptListCellRenderer.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptListCellRenderer.java index 9620564..052e1e4 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptListCellRenderer.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptListCellRenderer.java @@ -33,7 +33,7 @@ import java.awt.Component; /** * @author sletellier - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class RScriptListCellRenderer extends DefaultListRenderer { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptUIHandler.java index 1132284..82b7875 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/r/RScriptUIHandler.java @@ -59,8 +59,8 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.5 */ public class RScriptUIHandler extends MascHandler { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticCriteriaSelectionModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticCriteriaSelectionModel.java index 830dd57..72c5c2d 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticCriteriaSelectionModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticCriteriaSelectionModel.java @@ -46,11 +46,11 @@ import fr.inra.masc.utils.MascUtil; /** * Selection model for criteria to display in synoptic graphic. - * <p/> + * * <strong>Note:</strong> this is revisited version of the * {@link SelectableCriteriaSelectionModel} which improve unselection. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.8 */ public class SynopticCriteriaSelectionModel extends DefaultTreeSelectionModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticUIHandler.java index 11f5710..011ba15 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/render/synoptic/SynopticUIHandler.java @@ -65,8 +65,8 @@ import org.w3c.dom.svg.SVGDocument; import static org.nuiton.i18n.I18n._; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ public class SynopticUIHandler extends MascHandler { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/report/ReportUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/report/ReportUIHandler.java index 86c834d..e752644 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/report/ReportUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/report/ReportUIHandler.java @@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFactory; /** * Handler of {@link ReportUI}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ReportUIHandler extends MascHandler { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/CriteriaTreeRenderer.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/CriteriaTreeRenderer.java index 363f3f2..a4eac64 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/CriteriaTreeRenderer.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/CriteriaTreeRenderer.java @@ -42,7 +42,7 @@ import java.awt.Component; import static org.nuiton.i18n.I18n._; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CriteriaTreeRenderer<N extends NavNode<DefaultTreeModel, N>> extends AbstractNavTreeCellRenderer<DefaultTreeModel, N> { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaSelectionModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaSelectionModel.java index d702318..3891262 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaSelectionModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaSelectionModel.java @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.List; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class SelectableCriteriaSelectionModel extends DefaultTreeSelectionModel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaTreeRenderer.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaTreeRenderer.java index 800ad73..2175842 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaTreeRenderer.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/SelectableCriteriaTreeRenderer.java @@ -33,7 +33,7 @@ import javax.swing.JPanel; import javax.swing.JTree; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class SelectableCriteriaTreeRenderer extends CriteriaTreeRenderer<CriteriaNode> { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaDataProvider.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaDataProvider.java index ae50243..84d8dd2 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaDataProvider.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaDataProvider.java @@ -39,7 +39,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CriteriaDataProvider extends AbstractSerializableBean implements NavDataProvider { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNode.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNode.java index 3ff6e1f..5701b9f 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNode.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNode.java @@ -32,7 +32,7 @@ import fr.inra.masc.ui.content.editor.criteria.editor.ReferenceCriteriaEditor; import fr.inra.masc.ui.content.editor.criteria.editor.ValuedCriteriaEditor; import jaxx.runtime.swing.nav.tree.NavTreeNode; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public abstract class CriteriaNode extends NavTreeNode<CriteriaNode> { private static final long serialVersionUID = 1L; @@ -47,7 +47,7 @@ public abstract class CriteriaNode extends NavTreeNode<CriteriaNode> { public abstract Class<?> getEditorClass(); - /** @author sletellier <letellier@codelutin.com> */ + /** @author sletellier <letellier@codelutin.com> */ public static class ComputableCriteriaNode extends CriteriaNode { private static final long serialVersionUID = 1L; @@ -62,7 +62,7 @@ public abstract class CriteriaNode extends NavTreeNode<CriteriaNode> { } } - /** @author sletellier <letellier@codelutin.com> */ + /** @author sletellier <letellier@codelutin.com> */ public static class ValuedCriteriaNode extends CriteriaNode { private static final long serialVersionUID = 1L; @@ -77,7 +77,7 @@ public abstract class CriteriaNode extends NavTreeNode<CriteriaNode> { } } - /** @author sletellier <letellier@codelutin.com> */ + /** @author sletellier <letellier@codelutin.com> */ public static class ReferenceCriteriaNode extends ValuedCriteriaNode { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNodeLoador.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNodeLoador.java index 5282faa..6ec99af 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNodeLoador.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaNodeLoador.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import java.util.List; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CriteriaNodeLoador extends NavTreeNodeChildLoador<Criteria, Criteria, CriteriaNode> { /** Logger. */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java index 9f8df28..3616555 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class CriteriaTreeHelper extends NavTreeHelper<CriteriaNode> { /** Logger */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNode.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNode.java index 6bc14e7..0939327 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNode.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNode.java @@ -28,7 +28,7 @@ import fr.inra.masc.model.Criteria; import jaxx.runtime.swing.nav.treetable.NavTreeTableNode; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class EvalCriteriaNode extends NavTreeTableNode<EvalCriteriaNode> { @@ -43,7 +43,7 @@ public class EvalCriteriaNode extends NavTreeTableNode<EvalCriteriaNode> { } /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public static class ReferenceEvalCriteriaNode extends EvalCriteriaNode { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNodeLoador.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNodeLoador.java index d309df3..f4b6810 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNodeLoador.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaNodeLoador.java @@ -31,7 +31,7 @@ import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; import java.util.List; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier <letellier@codelutin.com> */ public class EvalCriteriaNodeLoador extends NavTreeTableNodeChildLoador<Criteria, Criteria, EvalCriteriaNode> { private static final long serialVersionUID = 1L; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaTreeTableHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaTreeTableHelper.java index 2e7c415..cab3800 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaTreeTableHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/eval/EvalCriteriaTreeTableHelper.java @@ -35,7 +35,7 @@ import org.jdesktop.swingx.treetable.TreeTableModel; import java.util.Collection; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> * @since 0.1 */ public class EvalCriteriaTreeTableHelper extends NavTreeTableHelper<EvalCriteriaNode> { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageComponent.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageComponent.java index 3028534..b9132c0 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageComponent.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageComponent.java @@ -35,7 +35,7 @@ import java.beans.PropertyChangeListener; /** * Component to paint the image. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ImageComponent extends JPanel { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageGenerator.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageGenerator.java index 9264502..c600ad8 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageGenerator.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImageGenerator.java @@ -30,7 +30,7 @@ import java.awt.image.BufferedImage; /** * To generate an image. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public interface ImageGenerator { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelHandler.java index 8f1a53c..3c59d03 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelHandler.java @@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFactory; /** * Handler of ui {@link ImagePanel}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public abstract class ImagePanelHandler<U extends ImagePanel> { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelModel.java index c77fbbb..228f70f 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/ImagePanelModel.java @@ -32,7 +32,7 @@ import org.jdesktop.beans.AbstractSerializableBean; /** * Model of a {@link ImagePanel}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class ImagePanelModel extends AbstractSerializableBean { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImageGenerator.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImageGenerator.java index 1ec5b77..c8e7f34 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImageGenerator.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImageGenerator.java @@ -31,10 +31,10 @@ import java.awt.image.BufferedImage; /** * SImple image generator which used the original image given in constructor. - * <p/> + * * Only scale will be compute here but not the image itself. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class SimpleImageGenerator implements ImageGenerator { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImagePanelHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImagePanelHandler.java index bd49985..c6c198c 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImagePanelHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SimpleImagePanelHandler.java @@ -37,7 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class SimpleImagePanelHandler extends ImagePanelHandler<SimpleImagePanel> { diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java index 27157eb..e29a032 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java @@ -56,7 +56,7 @@ import org.w3c.dom.svg.SVGDocument; import fr.inra.masc.ui.MascUIHelper; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier <letellier@codelutin.com> */ public class SvgImagePanelHandler extends ImagePanelHandler<SvgImagePanel> { diff --git a/pom.xml b/pom.xml index c3996a9..4fcd755 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.inra</groupId> <artifactId>masc</artifactId> - <version>3.5</version> + <version>2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Masc</name> @@ -21,37 +21,40 @@ </description> <inceptionYear>2011</inceptionYear> - <url>http://maven-site.forge.codelutin.com/jmexico</url> + <url>https://forge.codelutin.com/projects/izi-eval/</url> <organization> <name>Code Lutin</name> </organization> <developers> + <developer> - <id>sletellier</id> - <name>Sylvain Letellier</name> - <email>letellier at codelutin dot com</email> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <roles> - <role>Lead</role> <role>Developer</role> </roles> <timezone>Europe/Paris</timezone> </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> + </developers> + + <contributors> + <contributor> + <name>Sylvain Letellier</name> + <email>letellier at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <roles> + <role>Lead</role> <role>Developer</role> </roles> <timezone>Europe/Paris</timezone> - </developer> - </developers> + </contributor> + </contributors> <properties> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm