This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit f2f75b6d0eb90730ff833b979cad12a89a6832aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:13:12 2015 +0200 Nettoyage de code (See #7610) --- .../ref/ReferentialContentUIInitializer.java | 46 ++++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index a601fbb..5395e0a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.ref; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -39,6 +38,7 @@ import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; +import javax.swing.JComponent; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; @@ -69,14 +69,10 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } - @Override - protected <E1 extends IdDto> void updateData(BeanComboBox comboBox) { - ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); + protected void updateData(BeanComboBox comboBox) { - // init combobox - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(comboBox); Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); @@ -94,8 +90,7 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend data = new ArrayList<>(); // get complete data list from service - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); + ReferenceSetDto referentialReferenceSet = getReferentialService().getReferentialReferenceSet(dtoClass); LinkedHashSet<ReferenceDto> reference = referentialReferenceSet.getReference(); data.addAll(reference); @@ -110,18 +105,16 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(BeanListHeader list) { + protected void updateData(BeanListHeader list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); List<ReferenceDto> data = new ArrayList<>(referentialReferenceSet.getReference()); - Decorator<ReferenceDto> decorator = ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, - dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setData(data); @@ -129,14 +122,13 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(FilterableDoubleList list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + protected void updateData(FilterableDoubleList list) { + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); List<ReferenceDto> data; if (ReferentialDto.class.isAssignableFrom(dtoClass)) { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); data = new ArrayList<>(referentialReferenceSet.getReference()); @@ -148,11 +140,23 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } // sort data from first decorator context - ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setUniverse(data); list.putClientProperty("data", data); } + + protected ReferentialService getReferentialService() { + return ObserveSwingApplicationContext.get().newService(ReferentialService.class); + } + + protected Decorator<ReferenceDto> getDecorator(Class<? extends ReferentialDto> dtoClass) { + return ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + } + + protected Class<? extends ReferentialDto> getDtoClass(JComponent list) { + return (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.