branch develop updated (d60a92a -> cb0cdf8)
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 d60a92a baisser le niveau de log pour les droits utilisateurs new 174cb8d A la copie du model de stockage le satut doit etre copier en dernier car les settters précédents le remmettent à zero new cb0cdf8 donner un nom aux deux listes du context de l'application pour eviter les comflits The 2 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 cb0cdf8c79fefefbbb27ad97bfbdf5c88fdff9e3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Nov 9 12:31:42 2015 +0100 donner un nom aux deux listes du context de l'application pour eviter les comflits commit 174cb8de5e1b18740dbb4912affc2f3be051b2fb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Nov 9 12:28:08 2015 +0100 A la copie du model de stockage le satut doit etre copier en dernier car les settters précédents le remmettent à zero Summary of changes: .../src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 4 ++-- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 3 ++- 2 files changed, 4 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 174cb8de5e1b18740dbb4912affc2f3be051b2fb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Nov 9 12:28:08 2015 +0100 A la copie du model de stockage le satut doit etre copier en dernier car les settters précédents le remmettent à zero --- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 9fe68b5..3b6657e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1635,7 +1635,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { dst.setSelectDataModel(getSelectDataModel()); dst.setSecurityModel(getSecurityModel()); dst.setAdminAction(getAdminAction()); - dst.setConnexionStatus(getConnexionStatus()); dst.setDataSourceInformation(getDataSourceInformation()); dst.updateEditConfig(); @@ -1646,6 +1645,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { dst.setRemotePassword(getRemotePassword()); dst.setServerDatabase(getServerDatabase()); + dst.setConnexionStatus(getConnexionStatus()); + } public void firePgConfigChanged(String propertyName, -- 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 cb0cdf8c79fefefbbb27ad97bfbdf5c88fdff9e3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Nov 9 12:31:42 2015 +0100 donner un nom aux deux listes du context de l'application pour eviter les comflits --- .../src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 6b67185..ef07bae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -173,13 +173,13 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im JAXXUtil.newContextEntryDef(ObserveSwingDataSource.class); public static final JAXXContextEntryDef<List<ObserveSwingDataSource>> SWING_DATA_SOURCE_LIST_ENTRY_DEF = - JAXXUtil.newListContextEntryDef(); + JAXXUtil.newListContextEntryDef("dataSources"); public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = JAXXUtil.newContextEntryDef(ValidationContext.class); public static final JAXXContextEntryDef<List<ValidatorDto>> VALIDATORS_ENTRY_DEF = - JAXXUtil.newListContextEntryDef(); + JAXXUtil.newListContextEntryDef("validators"); /** the jaxx context entry to store the main ui */ private static final JAXXContextEntryDef<ObserveMainUI> MAIN_UI_ENTRY_DEF = -- 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