branch develop updated (12f2e29 -> 2a288cf)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from 12f2e29 [jgitflow-maven-plugin]updating poms for 1.5.7-SNAPSHOT development new 3543ce3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e7887f5 [jgitflow-maven-plugin]updating poms for 1.5.6 branch with snapshot versions new c32cb7f [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions new f23718c [jgitflow-maven-plugin]merging 'release/1.5.6' into 'master' new cb059c6 [jgitflow-maven-plugin]merging 'master' into 'develop' new 2a288cf [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 2a288cfc84b98de50029b8756f7fbe5e139a79e6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cb059c6ef98d0f581e85691a4805444712ea0e11 Merge: 3543ce3 f23718c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 3543ce36553bcb8f04e9a8b2ef156231bc08f304 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f23718c415e329cd20d59eb730f02b00498b19a2 Merge: 243d55b c32cb7f Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:27 2015 +0000 [jgitflow-maven-plugin]merging 'release/1.5.6' into 'master' commit c32cb7f139ccb635d4dc01c2863e1279340c6212 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:21:49 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions Summary of changes: -- 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 coser. See http://git.codelutin.com/coser.git commit c32cb7f139ccb635d4dc01c2863e1279340c6212 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:21:49 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 74a50ad..8886a8d 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index cab048b..7729576 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index dd1e232..7488575 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index c968692..dd053b8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit f23718c415e329cd20d59eb730f02b00498b19a2 Merge: 243d55b c32cb7f Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:27 2015 +0000 [jgitflow-maven-plugin]merging 'release/1.5.6' into 'master' coser-business/pom.xml | 2 +- .../fr/ifremer/coser/CoserApplicationContext.java | 2 +- .../java/fr/ifremer/coser/CoserBusinessConfig.java | 10 +- .../fr/ifremer/coser/CoserBusinessException.java | 15 +- .../java/fr/ifremer/coser/CoserClassLoader.java | 18 +- .../main/java/fr/ifremer/coser/CoserConstants.java | 35 +- .../java/fr/ifremer/coser/CoserServiceContext.java | 38 - .../fr/ifremer/coser/CoserTechnicalException.java | 3 +- .../src/main/java/fr/ifremer/coser/CoserUtils.java | 7 +- .../coser/DefaultCoserApplicationContext.java | 2 +- .../ifremer/coser/bean/AbstractDataContainer.java | 24 +- .../java/fr/ifremer/coser/bean/AbstractEntity.java | 12 +- .../main/java/fr/ifremer/coser/bean/Control.java | 10 +- .../fr/ifremer/coser/bean/EchoBaseProject.java | 4 +- .../java/fr/ifremer/coser/bean/GlobalResult.java | 2 +- .../java/fr/ifremer/coser/bean/IndicatorMap.java | 5 +- .../main/java/fr/ifremer/coser/bean/Project.java | 41 +- .../java/fr/ifremer/coser/bean/RSufiResult.java | 6 +- .../fr/ifremer/coser/bean/RSufiResultPath.java | 8 +- .../main/java/fr/ifremer/coser/bean/Selection.java | 37 +- .../fr/ifremer/coser/bean/SpeciesFieldType.java | 4 +- .../java/fr/ifremer/coser/bean/SpeciesListMap.java | 2 +- .../java/fr/ifremer/coser/bean/SpeciesMap.java | 2 +- .../main/java/fr/ifremer/coser/bean/ZoneMap.java | 10 +- .../ifremer/coser/command/CategoryLineCommand.java | 6 +- .../java/fr/ifremer/coser/command/Command.java | 42 +- .../ifremer/coser/command/DeleteLineCommand.java | 106 +- .../ifremer/coser/command/MergeSpeciesCommand.java | 122 +- .../ifremer/coser/command/ModifyFieldCommand.java | 159 ++- .../fr/ifremer/coser/control/ControlError.java | 54 +- .../ifremer/coser/control/ControlErrorGroup.java | 10 +- .../coser/control/DiffCatchLengthControlError.java | 6 +- .../ifremer/coser/control/SpeciesControlError.java | 12 +- .../coser/control/SpeciesLengthControlError.java | 6 +- .../fr/ifremer/coser/data/AbstractDataEntity.java | 14 +- .../src/main/java/fr/ifremer/coser/data/Catch.java | 37 +- .../src/main/java/fr/ifremer/coser/data/Haul.java | 56 +- .../main/java/fr/ifremer/coser/data/Length.java | 57 +- .../main/java/fr/ifremer/coser/data/Strata.java | 28 +- .../java/fr/ifremer/coser/result/CoserCommand.java | 4 +- .../ifremer/coser/result/CoserCommandFactory.java | 4 +- .../coser/result/CoserMainRepositoryProvider.java | 2 +- .../java/fr/ifremer/coser/result/CoserRequest.java | 4 +- .../ifremer/coser/result/CoserRequestBuilder.java | 6 +- .../ifremer/coser/result/CoserRequestContext.java | 4 +- .../ifremer/coser/result/CoserRequestExecutor.java | 14 +- .../java/fr/ifremer/coser/result/CoserResult.java | 4 +- .../coser/result/DefaultCoserRequestContext.java | 2 +- .../coser/result/DuplicatedResultException.java | 4 +- .../coser/result/NoResultFoundException.java | 4 +- .../result/NoResultRepositoryFoundException.java | 2 +- .../ResultRepositoryInitializationException.java | 5 +- .../java/fr/ifremer/coser/result/ResultType.java | 4 +- .../coser/result/repository/ResultRepository.java | 4 +- .../repository/ResultRepositoryProvider.java | 4 +- .../result/repository/ResultRepositoryType.java | 6 +- .../repository/echobase/EchoBasePredicates.java | 2 +- .../echobase/EchoBaseResultRepository.java | 2 +- .../echobase/EchoBaseResultRepositoryProvider.java | 2 +- .../echobase/EchoBaseResultRepositoryType.java | 2 +- .../echobase/command/AbstractEchoBaseCommand.java | 9 +- .../echobase/command/CopyRepositoryCommand.java | 4 +- .../echobase/command/DeleteResultsCommand.java | 2 +- .../command/ExtractRawDataAndResultsCommand.java | 3 +- .../echobase/command/ExtractRawDataCommand.java | 2 +- .../echobase/command/GetAllResultsCommand.java | 2 +- .../GetCommunityIndicatorResultDataCommand.java | 2 +- .../GetCommunityIndicatorResultGraphCommand.java | 2 +- ...dicatorsForCommunityIndicatorResultCommand.java | 2 +- ...dicatorsForExtractRawDataAndResultsCommand.java | 2 +- ...icatorsForPopulationIndicatorResultCommand.java | 2 +- .../echobase/command/GetMapResultCommand.java | 2 +- ...tMatchingRepositoryTypeForMapResultCommand.java | 2 +- .../GetPopulationIndicatorResultDataCommand.java | 2 +- .../GetPopulationIndicatorResultGraphCommand.java | 2 +- .../echobase/command/GetResultNameCommand.java | 2 +- ...tSpeciesForExtractRawDataAndResultsCommand.java | 2 +- .../command/GetSpeciesForMapResultCommand.java | 2 +- ...SpeciesForPopulationIndicatorResultCommand.java | 2 +- ...ciesListForCommunityIndicatorResultCommand.java | 2 +- ...GetZonesForCommunityIndicatorResultCommand.java | 2 +- ...GetZonesForExtractRawDataAndResultsCommand.java | 2 +- .../command/GetZonesForExtractRawDataCommand.java | 2 +- .../command/GetZonesForMapResultCommand.java | 2 +- ...etZonesForPopulationIndicatorResultCommand.java | 2 +- .../result/repository/legacy/LegacyPredicates.java | 2 +- .../repository/legacy/LegacyResultRepository.java | 2 +- .../legacy/LegacyResultRepositoryProvider.java | 4 +- .../legacy/LegacyResultRepositoryType.java | 2 +- .../legacy/command/AbstractLegacyCommand.java | 316 +----- .../legacy/command/DeleteResultsCommand.java | 2 +- .../command/ExtractRawDataAndResultsCommand.java | 3 +- .../legacy/command/ExtractRawDataCommand.java | 2 +- .../legacy/command/GetAllResultsCommand.java | 4 +- .../GetCommunityIndicatorResultDataCommand.java | 2 +- .../GetCommunityIndicatorResultGraphCommand.java | 2 +- ...dicatorsForCommunityIndicatorResultCommand.java | 4 +- ...dicatorsForExtractRawDataAndResultsCommand.java | 4 +- ...icatorsForPopulationIndicatorResultCommand.java | 4 +- .../legacy/command/GetMapResultCommand.java | 4 +- ...tMatchingRepositoryTypeForMapResultCommand.java | 2 +- .../GetPopulationIndicatorResultDataCommand.java | 2 +- .../GetPopulationIndicatorResultGraphCommand.java | 4 +- .../legacy/command/GetResultNameCommand.java | 2 +- ...tSpeciesForExtractRawDataAndResultsCommand.java | 2 +- .../command/GetSpeciesForMapResultCommand.java | 4 +- ...SpeciesForPopulationIndicatorResultCommand.java | 4 +- ...ciesListForCommunityIndicatorResultCommand.java | 3 +- ...GetZonesForCommunityIndicatorResultCommand.java | 4 +- ...GetZonesForExtractRawDataAndResultsCommand.java | 4 +- .../command/GetZonesForExtractRawDataCommand.java | 4 +- .../command/GetZonesForMapResultCommand.java | 4 +- ...etZonesForPopulationIndicatorResultCommand.java | 4 +- .../request/AbstractGetIndicatorResultRequest.java | 4 +- .../result/request/CopyRepositoryRequest.java | 2 +- .../request/CoserRequestExtractTypeListAware.java | 2 +- .../result/request/CoserRequestFacadeAware.java | 4 +- .../result/request/CoserRequestIndicatorAware.java | 4 +- .../CoserRequestRepositoryResultTypeAware.java | 2 +- .../request/CoserRequestRepositoryTypeAware.java | 2 +- .../result/request/CoserRequestSpeciesAware.java | 4 +- .../result/request/CoserRequestZoneAware.java | 4 +- .../result/request/CoserRequestZoneListAware.java | 4 +- .../coser/result/request/DeleteResultsRequest.java | 2 +- .../request/ExtractRawDataAndResultsRequest.java | 6 +- .../result/request/ExtractRawDataRequest.java | 4 +- .../coser/result/request/GetAllResultsRequest.java | 2 +- .../GetCommunityIndicatorResultDataRequest.java | 4 +- .../GetCommunityIndicatorResultGraphRequest.java | 4 +- ...dicatorsForCommunityIndicatorResultRequest.java | 4 +- ...dicatorsForExtractRawDataAndResultsRequest.java | 4 +- ...icatorsForPopulationIndicatorResultRequest.java | 4 +- .../coser/result/request/GetMapResultRequest.java | 4 +- ...tMatchingRepositoryTypeForMapResultRequest.java | 4 +- .../GetPopulationIndicatorResultDataRequest.java | 4 +- .../GetPopulationIndicatorResultGraphRequest.java | 4 +- .../coser/result/request/GetResultNameRequest.java | 2 +- ...tSpeciesForExtractRawDataAndResultsRequest.java | 4 +- .../request/GetSpeciesForMapResultRequest.java | 4 +- ...SpeciesForPopulationIndicatorResultRequest.java | 4 +- ...ciesListForCommunityIndicatorResultRequest.java | 4 +- ...GetZonesForCommunityIndicatorResultRequest.java | 4 +- ...GetZonesForExtractRawDataAndResultsRequest.java | 4 +- .../request/GetZonesForExtractRawDataRequest.java | 4 +- .../request/GetZonesForMapResultRequest.java | 4 +- ...etZonesForPopulationIndicatorResultRequest.java | 4 +- .../result/ExtractRawDataAndResultsResult.java | 2 +- .../fr/ifremer/coser/result/result/FileResult.java | 6 +- .../fr/ifremer/coser/result/result/MapResult.java | 2 +- .../fr/ifremer/coser/result/result/VoidResult.java | 2 +- .../java/fr/ifremer/coser/result/util/Charts.java | 10 +- .../fr/ifremer/coser/result/util/Extracts.java | 4 +- .../java/fr/ifremer/coser/result/util/Reports.java | 6 +- .../coser/services/ClientResultService.java | 8 +- .../fr/ifremer/coser/services/CommandService.java | 52 +- .../fr/ifremer/coser/services/CommonService.java | 245 ++-- .../fr/ifremer/coser/services/ControlService.java | 479 ++++---- .../fr/ifremer/coser/services/ProjectService.java | 1177 ++++++++++---------- .../ifremer/coser/services/PublicationService.java | 608 +++++----- .../ifremer/coser/services/WebResultService.java | 15 +- .../java/fr/ifremer/coser/services/WebService.java | 823 +++++++------- .../java/fr/ifremer/coser/storage/DataStorage.java | 32 +- .../ifremer/coser/storage/DataStorageWalker.java | 4 +- .../fr/ifremer/coser/storage/DataStorages.java | 13 +- .../ifremer/coser/storage/MemoryDataStorage.java | 81 +- .../java/fr/ifremer/coser/util/Coordinate.java | 10 +- .../main/java/fr/ifremer/coser/util/DataType.java | 9 +- .../coser/util/InputStreamKnownSizeBody.java | 18 +- .../fr/ifremer/coser/util/ProgressMonitor.java | 14 +- .../java/fr/ifremer/coser/util/ProgressReader.java | 8 +- .../java/fr/ifremer/coser/util/ProgressStream.java | 6 +- .../coser/util/io/OneEchobaseFileFilter.java | 2 +- .../coser/util/io/OneRSufiResultFileFilter.java | 2 +- .../coser/validators/AbstractFieldValidator.java | 6 +- .../validators/CoserCheckDoubleValidator.java | 21 +- .../coser/validators/CoserDoubleValidator.java | 18 +- .../coser/validators/CoserExpressionValidator.java | 13 +- .../coser/validators/RegexFieldValidator.java | 38 +- .../test/java/fr/ifremer/coser/CoserUtilsTest.java | 6 +- .../fr/ifremer/coser/bean/EchoBaseProjectTest.java | 2 +- .../fr/ifremer/coser/bean/IndicatorMapTest.java | 2 +- .../java/fr/ifremer/coser/bean/ZoneMapTest.java | 2 +- .../EchoBaseResultRepositoryProviderTest.java | 2 +- .../echobase/EchoBaseResultRepositoryTest.java | 2 +- .../legacy/LegacyResultRepositoryProviderTest.java | 2 +- .../ifremer/coser/services/CommandServiceTest.java | 6 +- .../ifremer/coser/services/CommonServiceTest.java | 6 +- .../ifremer/coser/services/ControlServiceTest.java | 6 +- .../ifremer/coser/services/CoserTestAbstract.java | 6 +- .../ifremer/coser/services/ProjectServiceTest.java | 6 +- .../coser/services/PublicationServiceTest.java | 6 +- .../fr/ifremer/coser/services/WebServiceTest.java | 6 +- .../coser/storage/MemoryDataStorageTest.java | 6 +- coser-ui/pom.xml | 2 +- coser-ui/src/main/java/fr/ifremer/coser/Coser.java | 110 +- .../main/java/fr/ifremer/coser/CoserConfig.java | 19 +- .../java/fr/ifremer/coser/CoserConfigProvider.java | 2 +- .../main/java/fr/ifremer/coser/CoserException.java | 16 +- .../fr/ifremer/coser/CoserExceptionHandler.java | 11 +- .../ifremer/coser/CoserUIApplicationContext.java | 4 +- .../fr/ifremer/coser/ui/ContainerRedoMenu.java | 40 +- .../fr/ifremer/coser/ui/ContainerUndoMenu.java | 35 +- .../main/java/fr/ifremer/coser/ui/CoserFrame.jaxx | 112 +- .../fr/ifremer/coser/ui/CoserFrameHandler.java | 94 +- .../main/java/fr/ifremer/coser/ui/HomeView.jaxx | 30 +- .../fr/ifremer/coser/ui/SelectionsListMenu.java | 45 +- .../fr/ifremer/coser/ui/common/CommonHandler.java | 32 +- .../fr/ifremer/coser/ui/common/DataHandler.java | 59 +- .../ui/common/LengthStructureMatrixFilter.java | 35 +- .../coser/ui/common/SpeciesListRenderer.java | 15 +- .../coser/ui/common/SpeciesTableCellRenderer.java | 15 +- .../coser/ui/control/ControlCategoryListModel.java | 15 +- .../ui/control/ControlCategoryListRenderer.java | 21 +- .../coser/ui/control/ControlDataTableModel.java | 38 +- .../control/ControlDuplicatedLineTableModel.java | 49 +- .../coser/ui/control/ControlErrorTreeRenderer.java | 105 +- .../coser/ui/control/ControlFindReplaceDialog.jaxx | 74 +- .../coser/ui/control/ControlGraphFrame.jaxx | 36 +- .../ifremer/coser/ui/control/ControlHandler.java | 598 +++++----- .../coser/ui/control/ControlTableModel.java | 20 +- .../fr/ifremer/coser/ui/control/ControlView.jaxx | 316 +++--- .../coser/ui/control/GlobalControlErrorModel.java | 81 +- .../ifremer/coser/ui/control/SpecyComboModel.java | 13 +- .../java/fr/ifremer/coser/ui/freize/Freize.jaxx | 162 +-- .../fr/ifremer/coser/ui/freize/FreizeHandler.java | 57 +- .../fr/ifremer/coser/ui/freize/FreizeModel.java | 22 +- .../java/fr/ifremer/coser/ui/maps/CoserMap.java | 55 +- .../ifremer/coser/ui/maps/HaulLocationHandler.java | 41 +- .../coser/ui/option/ConfigurationHandler.java | 40 +- .../ifremer/coser/ui/option/ConfigurationView.jaxx | 352 +++--- .../ifremer/coser/ui/option/NoCopiedLayerUI.java | 24 +- .../fr/ifremer/coser/ui/option/OptionHandler.java | 98 +- .../ifremer/coser/ui/option/ValidatorDialog.jaxx | 87 +- .../coser/ui/option/ValidatorsTreeModel.java | 37 +- .../coser/ui/option/ValidatorsTreeRenderer.java | 36 +- .../coser/ui/project/ProjectCreationView.jaxx | 437 ++++---- .../ifremer/coser/ui/project/ProjectEditView.jaxx | 232 ++-- .../ifremer/coser/ui/project/ProjectHandler.java | 117 +- .../coser/ui/project/ProjectMapsListModel.java | 18 +- .../coser/ui/project/ProjectNamesListModel.java | 15 +- .../ifremer/coser/ui/project/ProjectOpenView.jaxx | 59 +- .../coser/ui/project/ProjectSummaryView.jaxx | 210 ++-- .../ui/project/SpeciesFieldTypeListRenderer.java | 35 +- .../coser/ui/publication/GlobalResultHandler.java | 7 +- .../coser/ui/publication/GlobalResultRenderer.java | 2 +- .../ui/publication/GlobalResultTableModel.java | 2 +- .../ui/publication/GlobalResultZoneRenderer.java | 2 +- .../coser/ui/result/ExportUploadDialog.jaxx | 116 +- .../fr/ifremer/coser/ui/result/ResultHandler.java | 90 +- .../ifremer/coser/ui/result/ResultTableModel.java | 109 +- .../coser/ui/result/ResultTableRenderer.java | 8 +- .../coser/ui/result/RsufiResultRenderer.java | 23 +- .../coser/ui/result/RsufiResultTableModel.java | 154 ++- .../coser/ui/result/RsufiResultZoneRenderer.java | 23 +- .../coser/ui/result/SelectUploadResultView.jaxx | 168 +-- .../coser/ui/result/SelectionAddResultDialog.jaxx | 288 ++--- .../coser/ui/result/SelectionEditResultDialog.jaxx | 178 +-- .../ifremer/coser/ui/result/ZoneComboBoxModel.java | 8 +- .../coser/ui/result/ZoneComboBoxRenderer.java | 22 +- .../coser/ui/selection/SamplingEffortRenderer.java | 41 +- .../coser/ui/selection/SelectionDetailsView.jaxx | 607 +++++----- .../coser/ui/selection/SelectionFilesView.jaxx | 78 +- .../coser/ui/selection/SelectionHandler.java | 465 ++++---- .../coser/ui/selection/SelectionListsView.jaxx | 399 +++---- .../coser/ui/selection/SelectionRsufiView.jaxx | 150 +-- .../ifremer/coser/ui/selection/SelectionView.jaxx | 36 +- .../coser/ui/selection/SpeciesFusionDialog.jaxx | 68 +- .../ui/selection/SpeciesListOccDensRenderer.java | 28 +- .../coser/ui/selection/SpeciesTypesRenderer.java | 29 +- .../coser/ui/selection/model/FileListModel.java | 13 +- .../selection/model/MaturitySpeciesListModel.java | 23 +- .../model/OccurrenceDensitySpeciesListModel.java | 30 +- .../model/SizeAllYearSpeciesListModel.java | 23 +- .../coser/ui/selection/model/SpeciesListModel.java | 21 +- .../ui/selection/model/SpeciesTypesListModel.java | 23 +- .../coser/ui/selection/model/StrataListModel.java | 13 +- .../coser/ui/selection/model/YearListModel.java | 13 +- .../ui/selection/replay/CommandListModel.java | 15 +- .../ui/selection/replay/CommandListRenderer.java | 23 +- .../replay/SelectionByProjectTreeModel.java | 20 +- .../selection/replay/SelectionReplayHandler.java | 95 +- .../ui/selection/replay/SelectionReplayView.jaxx | 188 ++-- .../fr/ifremer/coser/ui/util/CoserListModel.java | 8 +- .../coser/ui/util/CoserListSelectionModel.java | 37 +- .../fr/ifremer/coser/ui/util/CoserProgressBar.java | 18 +- .../java/fr/ifremer/coser/ui/util/ErrorHelper.java | 54 +- .../ifremer/coser/ui/widgets/AccordionLayout.java | 20 +- .../fr/ifremer/coser/ui/widgets/AccordionPane.java | 77 +- .../coser/ui/widgets/AccordionPaneSubPanel.java | 17 +- .../coser/ui/widgets/ComponentTitledBorder.java | 25 +- .../coser/ui/widgets/LookAndFeelViewMenuItem.java | 23 +- coser-web/pom.xml | 2 +- .../coser/web/CoserApplicationListener.java | 6 +- .../coser/web/CoserWebApplicationContext.java | 2 +- .../java/fr/ifremer/coser/web/CoserWebConfig.java | 6 +- .../ifremer/coser/web/CoserWebConfigProvider.java | 2 +- .../fr/ifremer/coser/web/CoserWebException.java | 16 +- .../java/fr/ifremer/coser/web/ServiceHelper.java | 4 +- .../ifremer/coser/web/actions/DocumentsAction.java | 5 - .../fr/ifremer/coser/web/actions/IndexAction.java | 20 +- .../fr/ifremer/coser/web/actions/LocaleAction.java | 5 - .../ifremer/coser/web/actions/QualityAction.java | 5 - .../fr/ifremer/coser/web/actions/SurveyAction.java | 5 - .../coser/web/actions/UploadResultAction.java | 10 +- .../web/actions/admin/DeleteProjectsAction.java | 55 +- .../coser/web/actions/admin/IndexAction.java | 7 +- .../web/actions/admin/ListProjectsAction.java | 44 +- .../web/actions/admin/ReloadProjectsAction.java | 7 +- .../coser/web/actions/admin/package-info.java | 3 +- .../coser/web/actions/auth/LoginAction.java | 4 - .../coser/web/actions/auth/LoginInterceptor.java | 4 - .../coser/web/actions/auth/LogoutAction.java | 6 +- .../coser/web/actions/auth/PerformLoginAction.java | 8 +- .../coser/web/actions/com/FacadeAction.java | 5 - .../ifremer/coser/web/actions/com/GraphAction.java | 56 +- .../coser/web/actions/com/GraphDataAction.java | 26 +- .../coser/web/actions/com/GraphDownloadAction.java | 27 +- .../coser/web/actions/com/IndicatorAction.java | 5 - .../ifremer/coser/web/actions/com/ZoneAction.java | 5 - .../web/actions/common/AbstractCoserAction.java | 2 +- .../web/actions/common/AbstractCoserJspAction.java | 8 +- .../coser/web/actions/common/CommonFacade.java | 19 - .../coser/web/actions/common/CommonIndicator.java | 60 +- .../coser/web/actions/common/CommonZone.java | 35 - .../web/actions/json/AbstractCoserJsonAction.java | 6 +- .../coser/web/actions/json/GetFacadesAction.java | 4 +- .../web/actions/json/GetIndicatorsAction.java | 4 +- .../web/actions/json/GetZonesForFacadeAction.java | 4 +- .../coser/web/actions/map/FacadeAction.java | 5 - .../ifremer/coser/web/actions/map/MapAction.java | 37 - .../coser/web/actions/map/MapDataAction.java | 21 +- .../coser/web/actions/map/SpeciesAction.java | 48 - .../ifremer/coser/web/actions/map/ZoneAction.java | 23 - .../coser/web/actions/pop/FacadeAction.java | 5 - .../ifremer/coser/web/actions/pop/GraphAction.java | 53 +- .../coser/web/actions/pop/GraphDataAction.java | 11 +- .../coser/web/actions/pop/GraphDownloadAction.java | 9 +- .../coser/web/actions/pop/IndicatorAction.java | 5 - .../coser/web/actions/pop/SpeciesAction.java | 50 - .../ifremer/coser/web/actions/pop/ZoneAction.java | 5 - .../coser/web/actions/search/ExtractAction.java | 1 - .../coser/web/actions/source/FacadeAction.java | 5 - .../coser/web/actions/source/SourceAction.java | 42 - .../coser/web/actions/source/SourceDataAction.java | 7 +- .../web/actions/source/SourceQualityAction.java | 5 - .../coser/web/actions/source/ZoneAction.java | 23 - pom.xml | 6 +- 347 files changed, 6342 insertions(+), 8046 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 coser. See http://git.codelutin.com/coser.git commit 3543ce36553bcb8f04e9a8b2ef156231bc08f304 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 380c537..8886a8d 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.7-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index acb71c5..7729576 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.7-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 8a4bd79..7488575 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.7-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index d2b75e3..dd053b8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.7-SNAPSHOT</version> + <version>1.5.6</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit cb059c6ef98d0f581e85691a4805444712ea0e11 Merge: 3543ce3 f23718c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 coser. See http://git.codelutin.com/coser.git commit 2a288cfc84b98de50029b8756f7fbe5e139a79e6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 18 16:25:29 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8886a8d..380c537 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 7729576..acb71c5 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 7488575..8a4bd79 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6</version> + <version>1.5.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index dd053b8..d2b75e3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.6</version> + <version>1.5.7-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm