branch feature/7553 updated (f534bee -> a79e2e3)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from f534bee fix error new a79e2e3 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) 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 a79e2e3548b3337be83832d587a0e656747e5482 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) Summary of changes: .../fr/ird/observe/business/db/constants/DataContextType.java | 9 ++++++++- .../java/fr/ird/observe/ui/content/ContentUIInitializer.java | 2 +- .../main/java/fr/ird/observe/ui/content/ContentUIManager.java | 3 +++ .../src/main/java/fr/ird/observe/ui/content/ContentUIModel.java | 9 +++++++++ .../observe/ui/content/list/impl/seine/TripSeinesUIHandler.java | 2 +- 5 files changed, 22 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 feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit a79e2e3548b3337be83832d587a0e656747e5482 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) --- .../fr/ird/observe/business/db/constants/DataContextType.java | 9 ++++++++- .../java/fr/ird/observe/ui/content/ContentUIInitializer.java | 2 +- .../main/java/fr/ird/observe/ui/content/ContentUIManager.java | 3 +++ .../src/main/java/fr/ird/observe/ui/content/ContentUIModel.java | 9 +++++++++ .../observe/ui/content/list/impl/seine/TripSeinesUIHandler.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java index 3c8b0dd..122b953 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java @@ -314,7 +314,14 @@ public enum DataContextType { public static DataContextType acceptId(String s) { DataContextType result = null; for (DataContextType type : DataContextType.values()) { - if (s.startsWith(type.getType().getName())) { + + //FIXME kmorin 20151005 comment checker que l'id topia match le DTO +// if (s.startsWith(type.getType().getName())) { +// result = type; +// break; +// } + String[] entityFullClass = s.split("#")[0].split("\\."); + if (type.getType().getSimpleName().startsWith(entityFullClass[entityFullClass.length - 1])) { result = type; break; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 58d00cb..3aa315d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -662,7 +662,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); // init list - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getName()); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); if (log.isDebugEnabled()) { log.debug("Will use decorator " + decorator); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index d9fcbd9..3e2a2e1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -328,6 +328,9 @@ public class ContentUIManager { content.open(); } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("", e); + } ErrorDialogUI.showError(e); } finally { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index f73eaf5..1c12d36 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -90,6 +90,15 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab public ContentUIModel(Class<E> beanType) { this.beanType = beanType; + try { + setBean(beanType.newInstance()); + + } catch (Exception e) { + // ne devrait jamain arrive + if (log.isErrorEnabled()) { + log.error(e); + } + } //FIXME // ObserveEntityEnum constant = ObserveEntityEnum.valueOf(beanType); // if (constant != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index ec61f50..062b87e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -110,7 +110,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + FormDto<ProgramDto> programDtoFormDto = service.loadToRead(ProgramDto.class, getSelectedParentId()); getModel().setFormDto(programDtoFormDto); ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); } -- 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