branch develop updated (5324589 -> 4ae30e1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 5324589 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new bf4ef81 sélection des données à sauvegarder pour une base locale (refs #7207) new f1e96a5 fixes #7207: [PS/LL] Par défaut les marées de la base locale à sauver ne sont plus sélectionnées Merge branch 'feature/7207' into develop new 4fd2666 ajout d'une traduction manquante (refs #7209) new 4ae30e1 fixes #7209: [Référentiel] Petit défaut de libellé Merge branch 'feature/7209' into develop The 4 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 4ae30e1b3d90cd9adda6982b1b34a378458c9f57 Merge: f1e96a5 4fd2666 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:24:15 2015 +0200 fixes #7209: [Référentiel] Petit défaut de libellé Merge branch 'feature/7209' into develop commit 4fd26669c475266ba3b68a5327438dfa6d952e1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:24:13 2015 +0200 ajout d'une traduction manquante (refs #7209) commit f1e96a5657ee74d8d2d48a6144a258f5356efc7c Merge: 5324589 bf4ef81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:21:45 2015 +0200 fixes #7207: [PS/LL] Par défaut les marées de la base locale à sauver ne sont plus sélectionnées Merge branch 'feature/7207' into develop commit bf4ef815759788a7ff555c48434ad75c042065c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:21:26 2015 +0200 sélection des données à sauvegarder pour une base locale (refs #7207) Summary of changes: .../src/main/java/fr/ird/observe/DecoratorService.java | 1 + .../src/main/resources/i18n/observe-business_en_GB.properties | 1 + .../src/main/resources/i18n/observe-business_es_ES.properties | 1 + .../src/main/resources/i18n/observe-business_fr_FR.properties | 1 + .../fr/ird/observe/ui/storage/StorageBackupUILauncher.java | 5 ++++- .../main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 10 ++++++++-- 6 files changed, 16 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bf4ef815759788a7ff555c48434ad75c042065c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:21:26 2015 +0200 sélection des données à sauvegarder pour une base locale (refs #7207) --- .../fr/ird/observe/ui/storage/StorageBackupUILauncher.java | 5 ++++- .../main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java index 0993cf8..e2a7cfd 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java @@ -78,7 +78,10 @@ public class StorageBackupUILauncher extends StorageUILauncher { ui.setTitle(title); try { - getStorageUIHandler().initSelectData(ui, source); + // Selection des données uniquement pour une base locale + // Voir https://forge.codelutin.com/issues/7207 + boolean selectAllData = model.isLocal(); + getStorageUIHandler().initSelectData(ui, source, selectAllData); } catch (Exception e) { if (log.isErrorEnabled()) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 06ea88c..360f72f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -1175,7 +1175,7 @@ public class StorageUIHandler { sb.append("</").append(tag).append('>'); } - public void initSelectData(StorageUI ui, DataSource source) { + public void initSelectData(StorageUI ui, DataSource source, boolean selectAll) { StorageUIModel model = ui.getModel(); @@ -1190,6 +1190,12 @@ public class StorageUIHandler { DataSelectionModel.populate(dataModel, ObserveContext.get().getDataService(), source); + if (selectAll) { + + dataModel.addAllSelectedData(); + + } + // positionnement du model de selection de données // dans le model du wizard model.setSelectDataModel(dataModel); @@ -1236,7 +1242,7 @@ public class StorageUIHandler { model.checkImportDbVersion(source); - initSelectData(ui, source); + initSelectData(ui, source, false); } finally { source.doClose(false); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f1e96a5657ee74d8d2d48a6144a258f5356efc7c Merge: 5324589 bf4ef81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:21:45 2015 +0200 fixes #7207: [PS/LL] Par défaut les marées de la base locale à sauver ne sont plus sélectionnées Merge branch 'feature/7207' into develop .../fr/ird/observe/ui/storage/StorageBackupUILauncher.java | 5 ++++- .../main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4fd26669c475266ba3b68a5327438dfa6d952e1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:24:13 2015 +0200 ajout d'une traduction manquante (refs #7209) --- observe-business/src/main/java/fr/ird/observe/DecoratorService.java | 1 + .../src/main/resources/i18n/observe-business_en_GB.properties | 1 + .../src/main/resources/i18n/observe-business_es_ES.properties | 1 + .../src/main/resources/i18n/observe-business_fr_FR.properties | 1 + 4 files changed, 4 insertions(+) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index 31c2446..883457c 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -375,6 +375,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.gearCaracteristicType"); n("observe.common.gearCaracteristic"); n("observe.common.gear"); + n("observe.common.gender"); n("observe.common.floatline1Length"); n("observe.common.floatline2Length"); diff --git a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties index f20e907..117ebd0 100644 --- a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties +++ b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties @@ -15,6 +15,7 @@ observe.common.catchFateLongline= observe.common.catchLongline=Catches observe.common.catchWeight= observe.common.country=Country +observe.common.gender=Gender observe.common.detectionMode=Detection mode observe.common.encounter=Encounter observe.common.encounterType= diff --git a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties index ccd41e1..607b945 100644 --- a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties +++ b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties @@ -13,6 +13,7 @@ observe.common.branchlineLength= observe.common.branchlinesComposition= observe.common.catchFateLongline= observe.common.catchLongline= +observe.common.gender=Sexo observe.common.catchWeight=Peso estimado (en t) observe.common.country=País observe.common.detectionMode=Modo de detección diff --git a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties index 0fbe51b..24cb557 100644 --- a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties +++ b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties @@ -14,6 +14,7 @@ observe.common.branchlinesComposition=Composition des avançons observe.common.catchFateLongline=Devenir capture observe.common.catchLongline=Capture observe.common.catchWeight=Poids estimé (en t) +observe.common.gender=Sexe observe.common.country=Pays observe.common.detectionMode=Mode détection observe.common.encounter=Rencontre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4ae30e1b3d90cd9adda6982b1b34a378458c9f57 Merge: f1e96a5 4fd2666 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jun 10 18:24:15 2015 +0200 fixes #7209: [Référentiel] Petit défaut de libellé Merge branch 'feature/7209' into develop observe-business/src/main/java/fr/ird/observe/DecoratorService.java | 1 + .../src/main/resources/i18n/observe-business_en_GB.properties | 1 + .../src/main/resources/i18n/observe-business_es_ES.properties | 1 + .../src/main/resources/i18n/observe-business_fr_FR.properties | 1 + 4 files changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm