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