branch feature/7553 created (now cf10568)
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 at cf10568 chargement des programmes dans l'arbre (refs #7553) This branch includes the following new commits: new cf10568 chargement des programmes dans l'arbre (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 cf105684fb1e05c8bafb1df377e2ad1d8c1d7ec3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 11:32:02 2015 +0200 chargement des programmes dans l'arbre (refs #7553) -- 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 cf105684fb1e05c8bafb1df377e2ad1d8c1d7ec3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 11:32:02 2015 +0200 chargement des programmes dans l'arbre (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 17 +++-- .../ird/observe/ui/content/ContentUIHandler.java | 18 ++--- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../LonglineDetailCompositionUIHandler.java | 8 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 9 +-- .../impl/seine/FloatingObjectUIHandler.java | 7 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 7 +- .../ui/content/list/ContentListUIHandler.java | 14 +--- .../impl/longline/ActivityLonglinesUIHandler.java | 3 +- .../list/impl/longline/TripLonglinesUIHandler.java | 3 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 3 +- .../ui/content/open/ContentOpenableUIHandler.java | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 +- .../open/impl/longline/TripLonglineUIHandler.java | 3 +- .../open/impl/seine/ActivitySeineUIHandler.java | 3 +- .../open/impl/seine/TripSeineUIHandler.java | 9 +-- .../ui/content/ref/ContentReferenceUIHandler.java | 24 ++---- .../ui/content/ref/ReferenceHomeUIHandler.java | 6 +- .../ui/content/table/ContentTableUIHandler.java | 10 +-- .../ui/tree/AbstractObserveTreeCellRenderer.java | 3 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 3 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 3 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 38 ++++------ .../observe/ui/tree/FloatingObjectSeineNode.java | 3 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 85 ++++++++++------------ .../ird/observe/ui/tree/ProgramLonglineNode.java | 9 ++- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 35 +++++++-- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 3 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 3 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 3 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 3 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 3 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 7 +- .../loadors/ActivityLonglineNodeChildLoador.java | 29 ++++---- .../loadors/ActivityLonglinesNodeChildLoador.java | 5 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +-- .../loadors/ActivitySeinesNodeChildLoador.java | 5 +- .../loadors/FloatingObjectNodeChildLoador.java | 34 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 5 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 5 +- .../loadors/ReferenceCommonNodeChildLoador.java | 43 ++++++----- .../loadors/ReferenceLonglineNodeChildLoador.java | 27 ++++--- .../loadors/ReferenceSeineNodeChildLoador.java | 30 ++++---- .../ui/tree/loadors/RootNodeChildLoador.java | 41 ++++++----- .../ui/tree/loadors/RoutesNodeChildLoador.java | 5 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 32 ++++---- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 19 ++--- .../ui/util/decorator/ReferenceDecorator.java | 56 ++++++-------- .../decorator/ReferenceReferentialDecorator.java | 33 --------- .../observe-application-swing_fr_FR.properties | 2 +- 53 files changed, 372 insertions(+), 389 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index a778813..9a76434 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -26,7 +26,6 @@ import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; import fr.ird.observe.ui.util.decorator.ReferenceDecorator; -import fr.ird.observe.ui.util.decorator.ReferenceReferentialDecorator; import fr.ird.observe.ui.util.decorator.SpeciesDecorator; import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; import fr.ird.observe.ui.util.decorator.TripSeineDecorator; @@ -221,6 +220,10 @@ public class DecoratorService extends DecoratorProvider { } public String decorate(Object o) { + //FIXME + if (o == null) { + return null; + } Decorator<Object> decorator = getDecorator(o); String result = ""; if (decorator != null) { @@ -230,6 +233,10 @@ public class DecoratorService extends DecoratorProvider { } public String decorate(String context, Object o) { + //FIXME + if (o == null) { + return null; + } Decorator<Object> decorator = getDecorator(o, context); String result = ""; if (decorator != null) { @@ -397,6 +404,7 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + " ${" + libelle + "}$s"); + registerReferentialDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( @@ -561,15 +569,10 @@ public class DecoratorService extends DecoratorProvider { protected <T extends ReferentialDto> void registerDefaultReferentialDtoDecorator(Class<T> referenceType, String libelle) { registerReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); - registerReferenceReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); } protected <T extends ReferentialDto> void registerReferentialDtoDecorator(Class<T> referenceType, String expression) { - registerDecorator(new ReferenceDecorator<T>(referenceType, expression)); - } - - protected <T extends ReferentialDto> void registerReferenceReferentialDtoDecorator(Class<T> referenceType, String expression) { - registerDecorator(referenceType.getSimpleName(), new ReferenceReferentialDecorator(expression)); + registerDecorator(referenceType.getSimpleName(), new ReferenceDecorator(expression)); } //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index ed5acc4..7b37c9b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -26,8 +26,8 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -53,14 +53,8 @@ import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JToolBar; -import javax.swing.UIManager; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -302,7 +296,7 @@ public abstract class ContentUIHandler<E extends IdDto> { * @param source la base source de l'ui * @return {@code true} si on peut écrire (donc éditer), {@code false} autrement. */ - protected abstract boolean computeCanWrite(DataSource source); + protected abstract boolean computeCanWrite(ObserveSwingDataSource source); protected final String getSelectedParentId() { String s = null; @@ -353,8 +347,8 @@ public abstract class ContentUIHandler<E extends IdDto> { return ObserveSwingApplicationContext.get().getBinderService(); } - protected DataSource getDataSource() { - return ui.getDataSource(); + protected ObserveSwingDataSource getDataSource() { + return ObserveSwingApplicationContext.get().getDataSource(); } public void initUI() throws Exception { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index 568475e..bce857d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.UIHelper; @@ -40,7 +40,7 @@ import org.nuiton.decorator.Decorator; import org.nuiton.i18n.I18n; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import java.util.HashSet; @@ -122,7 +122,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 56da8e2..43f4ffa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; @@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; @@ -273,7 +273,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -392,7 +392,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong //FIXME // DataService dataService = getDataService(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); // update mode //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index c9d1708..3f3d0b8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -60,7 +60,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -134,7 +134,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong //FIXME // DataService dataService = getDataService(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); // update mode //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 0ed76f6..4b03115 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -125,7 +125,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -462,7 +462,8 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { // remove old node and recreate new node ObserveNode parentNode = treeHelper.removeNode(node); - node = treeHelper.addSet(parentNode, bean); + //FIXME +// node = treeHelper.addSet(parentNode, bean); stopEditUI(); treeHelper.selectNode(node); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index fa39ae2..0a2a217 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -51,7 +51,7 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 1d7d3f0..738dc1c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; @@ -38,9 +38,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; -import java.awt.GridLayout; +import javax.swing.*; +import java.awt.*; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -69,7 +68,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 165703c..f038dbc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentMode; @@ -56,7 +56,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -207,7 +207,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> // remove old node and recreate new node ObserveNode parentNode = treeHelper.removeNode(node); - node = treeHelper.addFloatingObject(parentNode, bean); + //FIXME +// node = treeHelper.addFloatingObject(parentNode, bean); stopEditUI(); if (refresh) { treeHelper.selectNode(node); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 7c0201b..8eab89f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -99,7 +99,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -343,7 +343,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { // remove old node and recreate new node ObserveNode parentNode = treeHelper.removeNode(node); - node = treeHelper.addSet(parentNode, bean); + //FIXME +// node = treeHelper.addSetSeine(parentNode, bean); stopEditUI(); treeHelper.selectNode(node); 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 b9aa0c0..dbcec09 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 @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.content.list; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; @@ -35,14 +35,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; @@ -73,7 +67,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext protected abstract List<ReferenceDto> getChilds(E bean); @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } 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 87ff3e9..115c531 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 @@ -25,6 +25,7 @@ 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.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -110,7 +111,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected List<ReferenceDto> getChilds(TripLonglineDto bean) { - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); //FIXME // DataService dataService = getDataService(); // 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 ac6da70..1234c9e 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 @@ -25,6 +25,7 @@ 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.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -93,7 +94,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected List<ReferenceDto> getChilds(ProgramDto bean) { - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); //FIXME // DataService dataService = getDataService(); // 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 b24fd39..c858661 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 @@ -24,6 +24,7 @@ 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.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -108,7 +109,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); //FIXME // DataService dataService = getDataService(); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index 3ccdb75..a7ed6e6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.content.open; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -69,7 +69,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -202,7 +202,8 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co treeHelper.removeNode(node); // on crée le noeud final de la marée - node = treeHelper.addOpenable(parentNode, bean); + //FIXME +// node = treeHelper.addOpenable(parentNode, bean); // arrêt de l'édition de l'écran courant stopEditUI(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 4af6b58..75c2a3b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -27,6 +27,7 @@ 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.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -161,7 +162,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity //FIXME // Loador<ActivityLongline> binder = getLoadBinder(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index c50b765..38cee65 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -26,6 +26,7 @@ import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -152,7 +153,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline TripLonglineDto bean = getBean(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); boolean create = tripId == null; if (create) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 60ff366..4c97d8b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -25,6 +25,7 @@ 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.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -185,7 +186,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei //FIXME // Loador<ActivitySeine> binder = getLoadBinder(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); //FIXME // if (create) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 9b4e2d7..5f1a206 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -21,10 +21,10 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -34,8 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.util.Date; @@ -152,7 +151,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { TripSeineDto bean = getBean(); - DataSource source = getDataSource(); + ObserveSwingDataSource source = getDataSource(); boolean create = tripId == null; //FIXME // if (create) { 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 f71bc47..11758ed 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 @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.validation.ValidationContext; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; @@ -45,24 +45,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.JToolBar; -import javax.swing.ListModel; -import javax.swing.SpringLayout; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.border.TitledBorder; import javax.swing.table.TableCellRenderer; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Font; +import java.awt.*; import java.beans.Introspector; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -198,8 +184,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } @Override - protected boolean computeCanWrite(DataSource source) { - return source.canWriteReferentiel(); + protected boolean computeCanWrite(ObserveSwingDataSource source) { + return source.canWriteReferential(); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java index 381f935..372a8b8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -46,8 +46,8 @@ public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto> { } @Override - protected boolean computeCanWrite(DataSource source) { - return source.canWriteReferentiel(); + protected boolean computeCanWrite(ObserveSwingDataSource source) { + return source.canWriteReferential(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index b3249d7..ab9c77d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.table; import com.google.common.collect.Collections2; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -39,12 +39,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Rectangle; +import java.awt.*; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -78,7 +76,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex protected abstract void onSelectedRowChanged(int editingRow, D bean, boolean create); @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index 12b682b..eefe5e3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.services.dto.IdDto; @@ -295,7 +296,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Preconditions.checkNotNull(entity, "L'entité doit être chargée dans le noeud: " + node); - Decorator<?> decorator = getDecoratorService().getDecoratorByType(beanType); + Decorator<?> decorator = getDecoratorService().getDecoratorByType(ReferenceDto.class, beanType.getSimpleName()); String text = decorator.toString(entity); return text; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 1acd85c..fa83798 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; @@ -35,7 +36,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { private static final long serialVersionUID = 1L; - public ActivityLonglineNode(ActivityLonglineDto entity) { + public ActivityLonglineNode(ReferenceDto<ActivityLonglineDto> entity) { super(ActivityLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivityLonglineNodeChildLoador.class)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index 8b25e44..c8332da 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; @@ -35,7 +36,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { private static final long serialVersionUID = 1L; - public ActivitySeineNode(ActivitySeineDto entity) { + public ActivitySeineNode(ReferenceDto<ActivitySeineDto> entity) { super(ActivitySeineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivitySeineNodeChildLoador.class)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index 2a47d48..24189b2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; @@ -51,25 +52,24 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { * * @since 4.0 */ - protected transient E entity; - - //FIXME -// protected transient DataService dataService; + protected transient ReferenceDto<E> entity; private boolean reloadEntity; - //FIXME -// protected abstract E getEntity(DataService dataService, DataSource source) throws DataSourceException; + //FIXME makle abstratc + protected ReferenceDto<E> fetchEntity() { + return null; + } - protected DtoNodeSupport(Class<E> internalClass, E entity) { + protected DtoNodeSupport(Class<E> internalClass, ReferenceDto<E> entity) { this(internalClass, entity, null); } - protected DtoNodeSupport(Class<E> type, E entity, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?> childLoador) { this(type, entity, null, childLoador); } - protected DtoNodeSupport(Class<E> type, E entity, String context, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, String context, AbstractNodeChildLoador<?> childLoador) { super(type, entity.getId(), context, childLoador, false); setEntity(entity); } @@ -95,7 +95,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } if (OpenableDto.class.isAssignableFrom(entity.getClass())) { - open = ((OpenableDto) entity).isOpen(); + open = (Boolean) entity.getPropertyValue(OpenableDto.PROPERTY_OPEN); if (log.isDebugEnabled()) { log.debug("Set open: " + open + " for entity: " + id); @@ -117,11 +117,11 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } - public E getEntity() { + public ReferenceDto<E> getEntity() { return entity; } - public void setEntity(E entity) { + public void setEntity(ReferenceDto<E> entity) { this.entity = entity; } @@ -145,24 +145,12 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } //FIXME -// try { -// entity = getEntity(getDataService(), oProvider.getDataSource()); -// } catch (DataSourceException e) { -// throw new RuntimeException(e); -// } + entity = fetchEntity(); } } - //FIXME -// private DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - public void setReloadEntity(boolean reloadEntity) { this.reloadEntity = reloadEntity; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 500c008..1067ca8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.tree.loadors.FloatingObjectNodeChildLoador; @@ -35,7 +36,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { private static final long serialVersionUID = 1L; - public FloatingObjectSeineNode(FloatingObjectDto entity) { + public FloatingObjectSeineNode(ReferenceDto<FloatingObjectDto> entity) { super(FloatingObjectDto.class, entity, ObserveTreeHelper.getChildLoador(FloatingObjectNodeChildLoador.class)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index ed629d5..671fb09 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -23,10 +23,10 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -36,6 +36,8 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; @@ -54,13 +56,14 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTree; +import javax.swing.*; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.util.Arrays; +import java.util.Collection; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -78,10 +81,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { /** Logger. */ static private final Log log = LogFactory.getLog(ObserveTreeHelper.class); - /** le service de récupération de données. */ - //FIXME -// protected DataService dataService; - private boolean createUnsaved; public ObserveTreeHelper() { @@ -109,24 +108,15 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } - //FIXME -// protected DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - @Override protected ObserveDataProvider getDataProvider() { ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider(); if (provider == null) { - // FIXME -// DataSource source = ObserveSwingApplicationContext.get().getDataSource(); -// if (source != null) { -// provider = new ObserveDataProvider(source); -// setDataProvider(provider); -// } + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSource(); + if (source != null) { + provider = new ObserveDataProvider(source); + setDataProvider(provider); + } } return provider; } @@ -415,22 +405,22 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addOpenable(ObserveNode parentNode, OpenableDto bean) { - if (bean instanceof TripSeineDto) { - return addTrip(parentNode, (TripSeineDto) bean); - } else if (bean instanceof TripLonglineDto) { - return addTrip(parentNode, (TripLonglineDto) bean); - } else if (bean instanceof RouteDto) { - return addRoute(parentNode, (RouteDto) bean); - } else if (bean instanceof ActivitySeineDto) { - return addActivity(parentNode, (ActivitySeineDto) bean); - } else if (bean instanceof ActivityLonglineDto) { - return addActivity(parentNode, (ActivityLonglineDto) bean); + public ObserveNode addOpenable(ObserveNode parentNode, ReferenceDto bean) { + if (TripSeineDto.class.equals(bean.getType())) { + return addTripSeine(parentNode, (ReferenceDto<TripSeineDto>) bean); + } else if (TripLonglineDto.class.equals(bean.getType())) { + return addTripLongline(parentNode, (ReferenceDto<TripLonglineDto>) bean); + } else if (RouteDto.class.equals(bean.getType())) { + return addRoute(parentNode, (ReferenceDto<RouteDto>) bean); + } else if (ActivitySeineDto.class.equals(bean.getType())) { + return addActivitySeine(parentNode, (ReferenceDto<ActivitySeineDto>) bean); + } else if (ActivityLonglineDto.class.equals(bean.getType())) { + return addActivityLongline(parentNode, (ReferenceDto<ActivityLonglineDto>) bean); } throw new IllegalStateException("Can not come here!"); } - public ObserveNode addTrip(ObserveNode parentNode, TripSeineDto bean) { + public ObserveNode addTripSeine(ObserveNode parentNode, ReferenceDto<TripSeineDto> bean) { ProgramSeineNodeChildLoador loador = getChildLoador(ProgramSeineNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -438,7 +428,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addTrip(ObserveNode parentNode, TripLonglineDto bean) { + public ObserveNode addTripLongline(ObserveNode parentNode, ReferenceDto<TripLonglineDto> bean) { ProgramLonglineNodeChildLoador loador = getChildLoador(ProgramLonglineNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -446,7 +436,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addRoute(ObserveNode parentNode, RouteDto bean) { + public ObserveNode addRoute(ObserveNode parentNode, ReferenceDto<RouteDto> bean) { RoutesNodeChildLoador loador = getChildLoador(RoutesNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -454,7 +444,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addActivity(ObserveNode parentNode, ActivitySeineDto bean) { + public ObserveNode addActivitySeine(ObserveNode parentNode, ReferenceDto<ActivitySeineDto> bean) { ActivitySeinesNodeChildLoador loador = getChildLoador(ActivitySeinesNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -462,7 +452,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addActivity(ObserveNode parentNode, ActivityLonglineDto bean) { + public ObserveNode addActivityLongline(ObserveNode parentNode, ReferenceDto<ActivityLonglineDto> bean) { ActivityLonglinesNodeChildLoador loador = getChildLoador(ActivityLonglinesNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -470,7 +460,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addFloatingObject(ObserveNode parentNode, FloatingObjectDto bean) { + public ObserveNode addFloatingObject(ObserveNode parentNode, ReferenceDto<FloatingObjectDto> bean) { ActivitySeineNodeChildLoador loador = getChildLoador(ActivitySeineNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); @@ -478,7 +468,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addSet(ObserveNode parentNode, SetSeineDto bean) { + public ObserveNode addSetSeine(ObserveNode parentNode, ReferenceDto<SetSeineDto> bean) { ActivitySeineNodeChildLoador loador = getChildLoador(ActivitySeineNodeChildLoador.class); ObserveNode result = loador.createSetNode(bean); @@ -486,7 +476,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addSet(ObserveNode parentNode, SetLonglineDto bean) { + public ObserveNode addSetLongline(ObserveNode parentNode, ReferenceDto<SetLonglineDto> bean) { ActivityLonglineNodeChildLoador loador = getChildLoador(ActivityLonglineNodeChildLoador.class); ObserveNode result = loador.createSetNode(bean); @@ -494,17 +484,18 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addProgram(ProgramDto bean) throws Exception { + public ObserveNode addProgram(ReferenceDto<ProgramDto> bean) throws Exception { - //FIXME -// List<ProgramDto> data = getDataService().getList( -// getDataProvider().getDataSource(), Program.class); + ReferentialService referentialService = + ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferenceSetDto<ProgramDto> programs = referentialService.getReferentialReferenceSet(ProgramDto.class); + Collection<ReferenceDto> data = programs.getReference(); int newIndex = 0; //FIXME -// if (CollectionUtils.isNotEmpty(data)) { + if (CollectionUtils.isNotEmpty(data)) { // Programs.sort(data); // newIndex = data.indexOf(bean); -// } + } RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class); ObserveNode result = loador.createNode(bean, dataProvider); insertNode(getRootNode(), result, newIndex); @@ -523,7 +514,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { ObserveNode result = rootNode.getChild(bean.getId(), getBridge(), dataProvider); Preconditions.checkNotNull(result, "Could not find program node with id: " + bean.getId()); reloadNode(result, false); -// refreshNode(result, false); + refreshNode(result, false); } public void reloadSelectedNode(boolean refreshFromParent, boolean refreshChilds) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index 28ae6ca..3ee6500 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; @@ -35,8 +37,11 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { private static final long serialVersionUID = 1L; - public ProgramLonglineNode(ProgramDto entity) { - super(ProgramDto.class, entity, entity.getGearType().name(), ObserveTreeHelper.getChildLoador(ProgramLonglineNodeChildLoador.class)); + public ProgramLonglineNode(ReferenceDto<ProgramDto> entity) { + super(ProgramDto.class, + entity, + ((GearType) entity.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE)).name(), + ObserveTreeHelper.getChildLoador(ProgramLonglineNodeChildLoador.class)); setEntity(entity); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index d3c2a83..7ca4370 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -22,7 +22,15 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.loadors.ProgramSeineNodeChildLoador; /** @@ -35,14 +43,27 @@ public class ProgramSeineNode extends DtoNodeSupport<ProgramDto> { private static final long serialVersionUID = 1L; - public ProgramSeineNode(ProgramDto entity) { - super(ProgramDto.class, entity, entity.getGearType().name(), ObserveTreeHelper.getChildLoador(ProgramSeineNodeChildLoador.class)); + public ProgramSeineNode(ReferenceDto<ProgramDto> entity) { + super(ProgramDto.class, + entity, + ((GearType) entity.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE)).name(), + ObserveTreeHelper.getChildLoador(ProgramSeineNodeChildLoador.class)); } - //FIXME -// @Override -// protected Program getEntity(DataService dataService, DataSource source) throws DataSourceException { -// return dataService.getProgramStub(source, id); -// } + @Override + protected ReferenceDto<ProgramDto> fetchEntity() { + FormDto<ProgramDto> formDto = ObserveSwingApplicationContext.get().newService(ReferentialService.class).loadToRead(ProgramDto.class, id); + ReferenceDto<ProgramDto> referenceDto = + ReferenceDtos.newReferenceDto(ProgramDto.class, Lists.newArrayList(ProgramDto.PROPERTY_ID, + ProgramDto.PROPERTY_CODE, + ProgramDto.PROPERTY_GEAR_TYPE, + ReferentialReferenceDto.PROPERTY_LABEL)); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); + referenceDto.setPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL, formDto.getForm().getLabel2()); + + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index a68a5cf..ecc7df7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.RouteDto; /** @@ -34,7 +35,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { private static final long serialVersionUID = 1L; - public RouteSeineNode(RouteDto entity) { + public RouteSeineNode(ReferenceDto<RouteDto> entity) { super(RouteDto.class, entity); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index fd240cd..a881387 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.loadors.SetLonglineNodeChildLoador; @@ -35,7 +36,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { private static final long serialVersionUID = 1L; - public SetLonglineNode(SetLonglineDto entity) { + public SetLonglineNode(ReferenceDto<SetLonglineDto> entity) { super(SetLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(SetLonglineNodeChildLoador.class)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 8929d48..7c97b8e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.tree.loadors.SetSeineNodeChildLoador; @@ -35,7 +36,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { private static final long serialVersionUID = 1L; - public SetSeineNode(SetSeineDto entity) { + public SetSeineNode(ReferenceDto<SetSeineDto> entity) { super(SetSeineDto.class, entity, ObserveTreeHelper.getChildLoador(SetSeineNodeChildLoador.class)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index 0b1bdfd..2297ba1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; /** @@ -34,7 +35,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { private static final long serialVersionUID = 1L; - public TripLonglineNode(TripLonglineDto entity) { + public TripLonglineNode(ReferenceDto<TripLonglineDto> entity) { super(TripLonglineDto.class, entity); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 1b359cb..0a508af 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.TripSeineDto; /** @@ -34,7 +35,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { private static final long serialVersionUID = 1L; - public TripSeineNode(TripSeineDto entity) { + public TripSeineNode(ReferenceDto<TripSeineDto> entity) { super(TripSeineDto.class, entity); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java index 19afb2a..cd8338e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -33,13 +35,10 @@ import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class AbstractNodeChildLoador<O> extends NavTreeNodeChildLoador<O, O, ObserveNode> { +public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNodeChildLoador<ReferenceDto<O>, O, ObserveNode> { private static final long serialVersionUID = 1L; - //FIXME -// protected transient DataService dataService; - protected AbstractNodeChildLoador(Class<O> beanType) { super(beanType); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 14568cc..c3e45f0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; @@ -32,7 +32,6 @@ import fr.ird.observe.ui.tree.SetLonglineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -43,7 +42,8 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String> { +//FIXME +public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//AbstractNodeChildLoador<String> { private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str } public ActivityLonglineNodeChildLoador() { - super(String.class); + super(IdDto.class); } @Override @@ -89,26 +89,29 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str } @Override - public List<String> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) throws DataSourceException { - List<String> result = new ArrayList<String>(); - result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); - result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); - return result; + //FIXME +// List<String> result = new ArrayList<String>(); +// result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); +// result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); +// return result; + + return null; } @Override - public ObserveNode createNode(String data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(data); + ObserveNode result = ObserveTreeHelper.createStringNode(null); return result; } - public ObserveNode createSetNode(SetLonglineDto data) { + public ObserveNode createSetNode(ReferenceDto<SetLonglineDto> data) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index 40b27c8..a58c40f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.ui.tree.ActivityLonglineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; @@ -46,7 +47,7 @@ public class ActivityLonglinesNodeChildLoador extends AbstractNodeChildLoador<Ac } @Override - public List<ActivityLonglineDto> getData(Class<?> parentClass, + public List<ReferenceDto<ActivityLonglineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -60,7 +61,7 @@ public class ActivityLonglinesNodeChildLoador extends AbstractNodeChildLoador<Ac } @Override - public ObserveNode createNode(ActivityLonglineDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<ActivityLonglineDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 65c335d..a6f8dfe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -22,11 +22,10 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.ui.tree.ActivitySeineNode; import fr.ird.observe.ui.tree.FloatingObjectSeineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; @@ -75,7 +74,8 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati parentNode.add(child); - ActivitySeineDto activitySeine = ((ActivitySeineNode) parentNode).getEntity(); + //FIXME +// ActivitySeineDto activitySeine = ((ActivitySeineNode) parentNode).getEntity(); // SetSeine set = activitySeine.getSetSeine(); // if (set != null) { @@ -89,7 +89,7 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati super.loadChilds(model, parentNode, dataProvider); } - public ObserveNode createSetNode(SetSeineDto data) { + public ObserveNode createSetNode(ReferenceDto<SetSeineDto> data) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); } @@ -100,7 +100,7 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati } @Override - public ObserveNode createNode(FloatingObjectDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<FloatingObjectDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); } @@ -111,7 +111,7 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati } @Override - public List<FloatingObjectDto> getData(Class<?> parentClass, + public List<ReferenceDto<FloatingObjectDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index 0eb1b9e..81720b3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.tree.ActivitySeineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; @@ -45,7 +46,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<Activ } @Override - public List<ActivitySeineDto> getData(Class<?> parentClass, + public List<ReferenceDto<ActivitySeineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -58,7 +59,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<Activ } @Override - public ObserveNode createNode(ActivitySeineDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<ActivitySeineDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index c15c5c0..e90bab7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -22,14 +22,11 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; -import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; -import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -40,12 +37,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<String> { +public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXMEString> { private static final long serialVersionUID = 1L; public FloatingObjectNodeChildLoador() { - super(String.class); + super(IdDto.class); } static { @@ -55,23 +52,26 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin } @Override - public List<String> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) throws DataSourceException { - List<String> result = new ArrayList<String>(); - result.add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION); - result.add(FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE); - result.add(FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES); - return result; - + //FIXME +// List<String> result = new ArrayList<String>(); +// result.add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION); +// result.add(FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE); +// result.add(FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES); +// return result; +return null; } @Override - public ObserveNode createNode(String data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(data); - return result; + //FIXME +// ObserveNode result = ObserveTreeHelper.createStringNode(data); +// return result; + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index da2efb0..8b2b865 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.TripLonglineNode; @@ -72,7 +73,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip } @Override - public List<TripLonglineDto> getData(Class<?> parentClass, + public List<ReferenceDto<TripLonglineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -107,7 +108,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip } @Override - public ObserveNode createNode(TripLonglineDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<TripLonglineDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 46a0b57..a9190c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.TripSeineNode; @@ -69,7 +70,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei } @Override - public List<TripSeineDto> getData(Class<?> parentClass, + public List<ReferenceDto<TripSeineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -101,7 +102,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei } @Override - public ObserveNode createNode(TripSeineDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<TripSeineDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index a9cff4b..d4395cc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -22,11 +22,11 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; -import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -37,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Class> { +public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { private static final long serialVersionUID = 1L; @@ -65,32 +65,37 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas } public ReferenceCommonNodeChildLoador() { - super(Class.class); + super(IdDto.class); } @Override - public List<Class> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws DataSourceException { - List<Class> result = new ArrayList<Class>(); //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { -// result.add(anEnum.getContract()); -// } - UIHelper.sortReferentiel(result); - return result; +// List<Class> result = new ArrayList<Class>(); +// //FIXME +//// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { +//// result.add(anEnum.getContract()); +//// } +// UIHelper.sortReferentiel(result); +// return result; + return null; } @Override - public ObserveNode createNode(Class data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - data, - data.getSimpleName(), - null, - true - ); - return result; + //FIXME +// ObserveNode result = new ObserveNode( +// data, +// data.getSimpleName(), +// null, +// true +// ); +// return result; + + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 118c239..244aa7e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -37,7 +39,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Class> { +public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { private static final long serialVersionUID = 1L; @@ -71,11 +73,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl } public ReferenceLonglineNodeChildLoador() { - super(Class.class); + super(IdDto.class); } @Override - public List<Class> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws DataSourceException { @@ -85,18 +87,19 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl // result.add(anEnum.getContract()); // } UIHelper.sortReferentiel(result); - return result; + return null; } @Override - public ObserveNode createNode(Class data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - data, - data.getSimpleName(), - null, - true - ); - return result; +// ObserveNode result = new ObserveNode( +// data, +// data.getSimpleName(), +// null, +// true +// ); +// return result; + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index 8a74ef5..09c1e67 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -37,7 +39,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class> { +public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { private static final long serialVersionUID = 1L; @@ -63,11 +65,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class } public ReferenceSeineNodeChildLoador() { - super(Class.class); + super(IdDto.class); } @Override - public List<Class> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws DataSourceException { @@ -77,18 +79,20 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class // result.add(anEnum.getContract()); // } UIHelper.sortReferentiel(result); - return result; + //FIXME + return null; } @Override - public ObserveNode createNode(Class data, NavDataProvider dataProvider) { - - ObserveNode result = new ObserveNode( - data, - data.getSimpleName(), - null, - true - ); - return result; + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { +//FIXME +// ObserveNode result = new ObserveNode( +// data, +// data.getSimpleName(), +// null, +// true +// ); +// return result; + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index 7f3e9be..98da3e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -21,15 +21,22 @@ */ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.ProgramLonglineNode; import fr.ird.observe.ui.tree.ProgramSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -67,7 +74,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { } @Override - public List<ProgramDto> getData(Class<?> parentClass, + public List<ReferenceDto<ProgramDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -76,10 +83,9 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { // DataService service = getDataService(); // DataSelectionModel selectionModel = getSelectionModel(dataProvider); - List<ProgramDto> data; - //FIXME -// if (addData) { -// + List<ReferenceDto<ProgramDto>> data; + if (addData) { + // if (selectionModel != null) { // data = new ArrayList<Program>(); // for (String programId : selectionModel.getDatas().keySet()) { @@ -88,21 +94,22 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { // } else { // data = service.getAllProgramStub(dataSource); // } -// -// } else { -// -// data = Collections.emptyList(); -// -// } -// -// return data; + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferenceSetDto<ProgramDto> referentialReferenceSet = service.getReferentialReferenceSet(ProgramDto.class); + data = new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(referentialReferenceSet.getReference())); + + } else { + + data = Collections.emptyList(); + + } - return null; + return data; } @Override - public void addChildNodes(ObserveNode parentNode, List<ProgramDto> datas, NavDataProvider dataProvider) { + public void addChildNodes(ObserveNode parentNode, List<ReferenceDto<ProgramDto>> datas, NavDataProvider dataProvider) { super.addChildNodes(parentNode, datas, dataProvider); if (addReferentiel) { @@ -138,9 +145,9 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { } @Override - public ObserveNode createNode(ProgramDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<ProgramDto> data, NavDataProvider dataProvider) { - GearType gearType = data.getGearType(); + GearType gearType = (GearType) data.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE); ObserveNode result; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index ba4d6f3..d1f8582 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; @@ -51,7 +52,7 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { } @Override - public List<RouteDto> getData(Class<?> parentClass, + public List<ReferenceDto<RouteDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { @@ -64,7 +65,7 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { } @Override - public ObserveNode createNode(RouteDto data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<RouteDto> data, NavDataProvider dataProvider) { if (data == null) { throw new NullPointerException("Ne peut pas ajouter un objet null"); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index bfb500c..b418489 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -23,13 +23,12 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; -import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -40,7 +39,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> { +public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { private static final long serialVersionUID = 1L; @@ -52,28 +51,29 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> } public SetLonglineNodeChildLoador() { - super(String.class); + super(IdDto.class); } @Override - public List<String> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws DataSourceException { - List<String> result = new ArrayList<String>(); - result.add("longlineGlobalComposition"); - result.add("longlineDetailComposition"); - result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); - result.add(SetLonglineTdrDto.PROPERTY_TDR); - - return result; - +// FIXME +// List<String> result = new ArrayList<String>(); +// result.add("longlineGlobalComposition"); +// result.add("longlineDetailComposition"); +// result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); +// result.add(SetLonglineTdrDto.PROPERTY_TDR); +// +// return result; +return null; } @Override - public ObserveNode createNode(String data, NavDataProvider dataProvider) { + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(data); + ObserveNode result = ObserveTreeHelper.createStringNode(null); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index fe7f5ab..5a3a559 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -22,12 +22,13 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.ui.tree.ObserveNode; -import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; @@ -41,7 +42,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { +public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { private static final long serialVersionUID = 1L; @@ -56,11 +57,11 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { } public SetSeineNodeChildLoador() { - super(String.class); + super(IdDto.class); } @Override - public List<String> getData(Class<?> parentClass, + public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws DataSourceException { @@ -74,15 +75,15 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { result.add(SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); //FIXME // result.add(SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return result; + return null; } @Override - public ObserveNode createNode(String data, NavDataProvider dataProvider) { - - ObserveNode result = ObserveTreeHelper.createStringNode(data); - return result; + public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { +// ObserveNode result = ObserveTreeHelper.createStringNode(data); +// return result; +return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceDecorator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceDecorator.java index ca34d39..480a2e8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceDecorator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceDecorator.java @@ -1,48 +1,40 @@ package fr.ird.observe.ui.util.decorator; -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - +import com.google.common.collect.ImmutableList; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import java.util.HashMap; +import java.util.Map; + import static org.nuiton.i18n.I18n.t; /** - * Created on 7/26/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.6 + * @author Kevin Morin (Code Lutin) */ -public class ReferenceDecorator<R extends ReferentialDto> extends ObserveDecorator<R> { +public class ReferenceDecorator extends ObserveDecorator<ReferenceDto> implements Cloneable { - private static final long serialVersionUID = 1L; + public ReferenceDecorator(String expression) { + super(ReferenceDto.class, expression); + } - public ReferenceDecorator(Class<R> type, String expression) { - super(type, expression); + @Override + public String toString(Object bean) { + if (bean instanceof ReferenceDto) { + ReferenceDto ref = (ReferenceDto) bean; + Map map = new HashMap<>(); + ImmutableList<String> propertyNames = ref.getPropertyNames(); + for (String propertyName : propertyNames) { + Object value = ((ReferenceDto) bean).getPropertyValue(propertyName); + map.put(propertyName, value); + } + bean = map; + } + return super.toString(bean); } @Override protected Comparable<?> getDefaultNullValue(String token) { return ReferentialDto.PROPERTY_CODE.equals(token) ? t("observe.common.nocode") : super.getDefaultNullValue(token); } - -} \ No newline at end of file +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java deleted file mode 100644 index 7c308c7..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java +++ /dev/null @@ -1,33 +0,0 @@ -package fr.ird.observe.ui.util.decorator; - -import com.google.common.collect.ImmutableList; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author Kevin Morin (Code Lutin) - */ -public class ReferenceReferentialDecorator extends ObserveDecorator<ReferentialReferenceDto> implements Cloneable { - - public ReferenceReferentialDecorator(String expression) { - super(ReferentialReferenceDto.class, expression); - } - - @Override - public String toString(Object bean) { - if (bean instanceof ReferentialReferenceDto) { - ReferentialReferenceDto ref = (ReferentialReferenceDto) bean; - Map map = new HashMap<>(); - ImmutableList<String> propertyNames = ref.getPropertyNames(); - for (String propertyName : propertyNames) { - Object value = ((ReferentialReferenceDto) bean).getPropertyValue(propertyName); - map.put(propertyName, value); - } - bean = map; - } - return super.toString(bean); - } - -} diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 1ca4299..d6b7712 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -910,7 +910,7 @@ observe.common.person= observe.common.picturesReferences=Référence Photo observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone FPA quitée -observe.common.program= +observe.common.program=Programme observe.common.program.observation.value.0=non observé observe.common.program.observation.value.1=observé observe.common.program.observation.value.2=valeur 2 non définie -- 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