branch feature/7530 updated (c4a0cfd -> 82a809c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7530 in repository observe. See http://git.codelutin.com/observe.git from c4a0cfd population des combo et des double listes début de chargement des beans (refs #7530) new 82a809c init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) 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 82a809c26bc8d0853140c80471be7cb1dc977419 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 12:31:30 2015 +0200 init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) Summary of changes: .../observe/ui/content/ContentUIInitializer.java | 57 +++++----- .../fr/ird/observe/ui/content/ContentUIModel.java | 27 ----- .../ird/observe/ui/content/list/ContentListUI.css | 2 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 7 +- .../ui/content/list/ContentListUIHandler.java | 27 +++-- .../ui/content/list/ContentListUIModel.java | 15 +-- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 5 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 5 +- .../ref/ReferentialContentUIInitializer.java | 119 --------------------- .../content/table/ContentTableUIInitializer.java | 7 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- 17 files changed, 78 insertions(+), 218 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/7530 in repository observe. See http://git.codelutin.com/observe.git commit 82a809c26bc8d0853140c80471be7cb1dc977419 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 12:31:30 2015 +0200 init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) --- .../observe/ui/content/ContentUIInitializer.java | 57 +++++----- .../fr/ird/observe/ui/content/ContentUIModel.java | 27 ----- .../ird/observe/ui/content/list/ContentListUI.css | 2 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 7 +- .../ui/content/list/ContentListUIHandler.java | 27 +++-- .../ui/content/list/ContentListUIModel.java | 15 +-- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 5 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 5 +- .../ref/ReferentialContentUIInitializer.java | 119 --------------------- .../content/table/ContentTableUIInitializer.java | 7 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- 17 files changed, 78 insertions(+), 218 deletions(-) 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 950fe8c..af723d1 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 @@ -26,7 +26,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import fr.ird.observe.ObserveContext; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; @@ -300,7 +299,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E ); } - protected void init(ActionMap actionMap, AbstractButton editor) throws DataSourceException { + protected void init(ActionMap actionMap, AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { // le boutton n'est pas commun @@ -336,7 +335,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E action.initAction(null, editor); } - protected void init(NumberEditor editor) throws DataSourceException { + protected void init(NumberEditor editor) { if (log.isDebugEnabled()) { log.debug("init number editor " + editor.getName()); } @@ -344,7 +343,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } @SuppressWarnings("unchecked") - protected void init(BeanComboBox beanComboBox) throws DataSourceException { + protected void init(BeanComboBox beanComboBox) { Class<ReferentialDto> klass = (Class<ReferentialDto>) beanComboBox.getHandler().getBeanType(); if (log.isDebugEnabled()) { @@ -356,7 +355,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } @SuppressWarnings("unchecked") - protected void init(BeanListHeader beanList) throws DataSourceException { + protected void init(BeanListHeader beanList) { beanList.setI18nPrefix("observe.common."); @@ -364,7 +363,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E log.info("init list for " + beanList.getBeanType()); } - prepareEntityList(beanList.getBeanType(), beanList); + Class<E> dtoClass = (Class<E>) beanList.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + prepareEntityList(dtoClass, beanList); JList jlist = beanList.getList(); @@ -390,7 +390,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } @SuppressWarnings("unchecked") - protected void init(FilterableDoubleList beanList) throws DataSourceException { + protected void init(FilterableDoubleList beanList) { beanList.setI18nPrefix("observe.common."); @@ -471,7 +471,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } } - protected void init(BooleanEditor editor) throws DataSourceException { + protected void init(BooleanEditor editor) { if (log.isDebugEnabled()) { log.debug("init boolean editor " + editor.getName()); } @@ -490,7 +490,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } } - protected void init(JComponent editor, Set<String> notBlockingComponents) throws DataSourceException { + protected void init(JComponent editor, Set<String> notBlockingComponents) { final Boolean propertyName = (Boolean) editor.getClientProperty(CLIENT_PROPERTY_NOT_BLOCKING); if (propertyName != null) { @@ -507,7 +507,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } } - protected void init(JCheckBox editor) throws DataSourceException { + protected void init(JCheckBox editor) { if (log.isDebugEnabled()) { log.debug("init simple boolean editor " + editor.getName()); } @@ -591,7 +591,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * type donné sur un service de persistance donné. * * @param list le component graphique à initialiser - * @throws DataSourceException si un problème lors de la récupération + * @si un problème lors de la récupération * des entités * @since 1.5 */ @@ -648,41 +648,42 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. * - * @param entityClass le type de l'entité * @param list le component graphique à initialiser - * @throws DataSourceException si un problème lors de la récupération + * @si un problème lors de la récupération * des entités * @since 1.5 */ - protected <E extends IdDto> void prepareEntityList(Class<E> entityClass, - BeanListHeader<E> list) throws DataSourceException { + protected <E extends IdDto> void prepareEntityList(Class<E> dtoClass, + BeanListHeader<ReferenceDto> list) { ObserveContext tx = ObserveContext.get(); // init list - Decorator<E> decorator = tx.getDecorator(entityClass); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getName()); if (log.isDebugEnabled()) { log.debug("Will use decorator " + decorator); } list.putClientProperty("decorator", decorator); - List<E> data = null; - if (ReferentialDto.class.isAssignableFrom(entityClass)) { + List<ReferenceDto> data; - Predicate<E> predicate = (Predicate<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - //FIXME -// data = tx.getDataService().getList(storageService, entityClass, predicate); + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { + + Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); + + ReferenceSetDto<E> referenceSetDto = getFormDto().getReferenceSetDto(dtoClass); + data = new ArrayList<>(Collections2.filter(referenceSetDto.getReference(), predicate)); } else { - data = new ArrayList<E>(); + data = new ArrayList<>(); } // sort data from first decorator context - DecoratorUtil.sort((JXPathDecorator<E>) decorator, data, 0); + DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); // set datas to list and init renderer - list.init((JXPathDecorator<E>) decorator, data); + list.init((JXPathDecorator<ReferenceDto>) decorator, data); // get the renderer initialized ListCellRenderer renderer = list.getList().getCellRenderer(); @@ -692,10 +693,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.putClientProperty("data", data); - // listen on cache modification - EntityListPropertyChangeListener<E> listener = - new EntityListPropertyChangeListener<E>(entityClass, list); //FIXME + // listen on cache modification +// EntityListPropertyChangeListener<E> listener = +// new EntityListPropertyChangeListener<E>(dtoClass, list); // DataService service = ObserveContext.get().getDataService(); // service.addReferentielPropertyChangeListener(entityClass, listener); } @@ -706,7 +707,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * * @param <E> le type de l'entité * @param comboBox le component graphique à initialiser - * @throws DataSourceException si un pb pendant la récupération des + * @si un pb pendant la récupération des * entités */ protected <E extends IdDto> void prepareBeanComboBox(BeanComboBox<ReferenceDto> comboBox) { 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 163ae28..f73eaf5 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 @@ -122,33 +122,6 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } - //FIXME -// public final TopiaEntityBinder<E> getLoadBinder() { -// -// if (loadBinder == null) { -// BinderService binderService = ObserveServiceHelper.get().getBinderService(); -// -// String binderName = getClass().getName() + "-open"; -// TopiaEntityBinder<E> r = binderService.getTopiaBinder(beanType, binderName); -// if (r == null) { -// -// BinderModelBuilder<E, E> builder = createOpeningBinder(binderService, binderName); -// -// if (builder != null) { -// -// r = binderService.registerTopiaBinder(beanType, builder, binderName); -// -// } -// -// } -// loadBinder = r; -// -// } -// -// return loadBinder; -// -// } - protected abstract BinderModelBuilder<E, E> createOpeningBinder(BinderService binderService, String binderName); public E getBean() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css index 13fb07b..1799390 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css @@ -29,7 +29,7 @@ } #listHeader { - beanType:{model.getChildType()}; + beanType:{ReferenceDto.class}; _doInit:{getModel().getChildType()}; showReset:true; list:{list}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx index 6d78cdd..3327d09 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx @@ -29,6 +29,7 @@ fr.ird.observe.ui.actions.shared.ReOpenUIAction fr.ird.observe.ui.actions.shared.SelectNodeUIAction + fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.services.dto.IdDto jaxx.runtime.swing.editor.bean.BeanListHeader @@ -54,8 +55,8 @@ <script><![CDATA[ -public final C getSelectedData() { - return (C) getSelectedBean(list); +public final ReferenceDto getSelectedData() { + return (ReferenceDto) getSelectedBean(list); } ]]></script> @@ -68,7 +69,7 @@ public final C getSelectedData() { <JList id='list' onMouseClicked='getHandler().onDataSelected(event)'/> - <BeanListHeader id='listHeader' genericType='C'/> + <BeanListHeader id='listHeader' genericType='ReferenceDto' _entityClass="getModel().getChildType()"/> </JScrollPane> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index b5f7dfb..3872889 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -24,8 +24,9 @@ package fr.ird.observe.ui.content.list; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -36,14 +37,8 @@ import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import java.awt.Color; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseEvent; import java.util.List; @@ -72,7 +67,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext * @return the list of entities to display * @throws DataSourceException if a pb while grabbing data */ - protected abstract List<C> getChilds(E bean) throws DataSourceException; + protected abstract List<ReferenceDto> getChilds(E bean); @Override protected boolean computeCanWrite(DataSource source) { @@ -139,7 +134,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext //FIXME // getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); - List<C> data = getChilds(bean); + List<ReferenceDto> data = getChilds(bean); model.setData(data); @@ -197,6 +192,16 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext // rien par default } + @Override + protected FormDto<E> loadToEdit(String id) { + return null; + } + + @Override + protected FormDto<E> loadToReadDto(String id) { + return null; + } + /** * Un renderer de liste d'entité qui reprendre la cosmétique de l'arbre * de navigation. diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java index c7cf7a4..a52ea6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.list; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,10 +54,10 @@ public abstract class ContentListUIModel<E extends IdDto, C extends IdDto> exten protected final Class<C> childType; /** liste des entites */ - protected List<C> data; + protected List<ReferenceDto> data; /** entité sélectionnée dans la liste */ - protected C selectedData; + protected ReferenceDto selectedData; /** un drapeau pour savoir si on peut reouvrir l'un des données de la liste. */ protected boolean canReopen; @@ -70,11 +71,11 @@ public abstract class ContentListUIModel<E extends IdDto, C extends IdDto> exten return childType; } - public List<C> getData() { + public List<ReferenceDto> getData() { return data; } - public void setData(List<C> data) { + public void setData(List<ReferenceDto> data) { boolean wasEmpty = isEmpty(); this.data = data; // on force toujours la propagation de la liste @@ -83,12 +84,12 @@ public abstract class ContentListUIModel<E extends IdDto, C extends IdDto> exten setSelectedData(null); } - public C getSelectedData() { + public ReferenceDto getSelectedData() { return selectedData; } - public void setSelectedData(C selectedData) { - C old = getSelectedData(); + public void setSelectedData(ReferenceDto selectedData) { + ReferenceDto old = getSelectedData(); this.selectedData = selectedData; if (log.isDebugEnabled()) { log.debug("New selected data : " + selectedData); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index d3cb3c4..87ff3e9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -108,7 +108,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } @Override - protected List<ActivityLonglineDto> getChilds(TripLonglineDto bean) throws DataSourceException { + protected List<ReferenceDto> getChilds(TripLonglineDto bean) { DataSource source = getDataSource(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 1d641fc..ac6da70 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; @@ -91,7 +91,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri } @Override - protected List<TripLonglineDto> getChilds(ProgramDto bean) throws DataSourceException { + protected List<ReferenceDto> getChilds(ProgramDto bean) { DataSource source = getDataSource(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 8ad0360..b24fd39 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.ContentMode; @@ -106,7 +106,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti } @Override - protected List<ActivitySeineDto> getChilds(RouteDto bean) throws DataSourceException { + protected List<ReferenceDto> getChilds(RouteDto bean) { DataSource source = getDataSource(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index 5ecef54..fcd5f74 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -22,9 +22,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; @@ -103,7 +102,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto } @Override - protected List<RouteDto> getChilds(TripSeineDto bean) throws DataSourceException { + protected List<ReferenceDto> getChilds(TripSeineDto bean) { //FIXME // DataSource source = getDataSource(); 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 5d83840..388068d 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 @@ -22,9 +22,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; @@ -88,8 +87,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe } @Override - protected List<TripSeineDto> getChilds(ProgramDto bean) throws DataSourceException { - + protected List<ReferenceDto> getChilds(ProgramDto bean) { //FIXME // DataSource source = getDataSource(); // DataService dataService = getDataService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css index 8e94336..1774596 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css @@ -50,7 +50,7 @@ } #listHeader { - beanType:{model.getBeanType()}; + beanType:{ReferenceDto.class}; showReset:true; list:{list}; labelText:{getContentTitle()}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx index 6bf5ce3..a8b65ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx @@ -25,6 +25,7 @@ genericType='E extends ReferentialDto'> <import> + fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.services.dto.referential.ReferentialDto fr.ird.observe.ui.UIHelper @@ -86,7 +87,7 @@ viewLayout.addLayoutComponent(editView, DETAIL_VIEW); onValueChanged='getHandler().selectBean((E)getSelectedBean(list))' onMouseClicked='if (event.getClickCount() == 2) { getHandler().modifyUI(); }'/> - <BeanListHeader id='listHeader' genericType='E'/> + <BeanListHeader id='listHeader' genericType='ReferenceDto' _entityClass="getModel().getBeanType()"/> </JScrollPane> </JPanel> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 15a2cd8..ddfd2b5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -531,8 +532,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content @Override protected void prepareValidationContext() { super.prepareValidationContext(); - BeanListHeader<E> jList = getUi().getListHeader(); - List<E> data = jList.getData(); + BeanListHeader<ReferenceDto> jList = getUi().getListHeader(); + List<ReferenceDto> data = jList.getData(); ValidationContext validationContext = ObserveServiceHelper.get().getValidationContext(); if (log.isDebugEnabled()) { 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 12ed7df..e56f645 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 @@ -22,24 +22,10 @@ package fr.ird.observe.ui.content.ref; * #L% */ -import com.google.common.base.Predicate; -import fr.ird.observe.ObserveContext; -import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.content.ContentUIInitializer; -import fr.ird.observe.ui.content.ObserveContentUI; -import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; - -import javax.swing.*; -import java.util.ArrayList; -import java.util.List; /** * Created on 11/28/14. @@ -56,111 +42,6 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend super(ui); } - /** - * Remplit le modèle d'une liste graphique avec la liste des entités d'un - * type donné sur un service de persistance donné. - * - * @param entityClass le type de l'entité - * @param list le component graphique à initialiser - * @throws DataSourceException si un problème lors de la récupération - * des entités - * @since 1.5 - */ - public static <E extends AbstractObserveDto> void prepareEntityList(Class<E> entityClass, - BeanListHeader<E> list, - Object loador - //FIXME -// TopiaEntityBinder<E> loador - ) { - - ObserveContext tx = ObserveContext.get(); - - // init list - Decorator<E> decorator = tx.getDecorator(entityClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } - - list.putClientProperty("decorator", decorator); - List<E> data; - - if (ReferentialDto.class.isAssignableFrom(entityClass)) { - - Predicate<E> predicate = (Predicate<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - //FIXME -// data = tx.getDataService().getList(storageService, entityClass, predicate, loador); - data = null; - - } else { - data = new ArrayList<E>(); - } - - // sort data from first decorator context - DecoratorUtil.sort((JXPathDecorator<E>) decorator, data, 0); - - // set datas to list and init renderer - list.init((JXPathDecorator<E>) decorator, data); - - // get the renderer initialized - ListCellRenderer renderer = list.getList().getCellRenderer(); - - // add the specific renderer - list.getList().setCellRenderer(new ReferentielListCellRenderer(renderer)); - - list.putClientProperty("data", data); - - //FIXME - // listen on cache modification -// EntityListPropertyChangeListener<E> listener = -// new EntityListPropertyChangeListener<E>(entityClass, list); -// DataService service = ObserveContext.get().getDataService(); -// service.addReferentielPropertyChangeListener(entityClass, listener); - } - - @SuppressWarnings("unchecked") - protected void init(DecoratorService decoratorService, BeanListHeader beanList) { - - beanList.setI18nPrefix("observe.common."); - - if (log.isInfoEnabled()) { - log.info("init list for " + beanList.getBeanType()); - } - - if ("listHeader".equals(beanList.getName())) { - - // use the binder for loading - prepareEntityList(beanList.getBeanType(), beanList, null);//FIXME ui.getModel().getLoadBinder()); - - } else { - - prepareEntityList(beanList.getBeanType(), beanList, null); - - } - - JList jlist = beanList.getList(); - - Object init = jlist.getClientProperty("addDecorator"); - if (init != null) { - Class<AbstractObserveDto> klass = (Class<AbstractObserveDto>) init; - if (log.isDebugEnabled()) { - log.debug("addDecorator to list " + - jlist.getName()); - } - Decorator<AbstractObserveDto> decorator; - decorator = decoratorService.getDecoratorByType(klass); - jlist.putClientProperty("decorator", decorator); - } - - init = jlist.getClientProperty("addToogleListSelectionModel"); - if (init != null && init instanceof Boolean && (Boolean) init) { - if (log.isDebugEnabled()) { - log.debug("addToogleListSelectionModel to list " + - jlist.getName()); - } - prepareToogleListSelectionModel(jlist); - } - } - @Override protected void initBlockLayerUI(String... doNotBlockComponentIds) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java index df69529..e36dd30 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table; * #L% */ -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.util.BooleanEditor; @@ -177,7 +176,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte @Override protected void init(ActionMap actionMap, - AbstractButton editor) throws DataSourceException { + AbstractButton editor) { super.init(actionMap, editor); @@ -239,7 +238,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte } @Override - protected void init(final JCheckBox editor) throws DataSourceException { + protected void init(final JCheckBox editor) { super.init(editor); @@ -257,7 +256,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte } @Override - protected void init(BooleanEditor editor) throws DataSourceException { + protected void init(BooleanEditor editor) { super.init(editor); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java index 16d1519..1209507 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java @@ -50,7 +50,7 @@ public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitia } @Override - protected void init(JCheckBox editor) throws DataSourceException { + protected void init(JCheckBox editor) { if (log.isDebugEnabled()) { log.debug("init simple boolean editor " + editor.getName()); } -- 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